diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-22 13:06:30 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-22 19:48:27 +0000 |
| commit | 29eec9e5acfd711572bb74863f4588a9be4a0ecc (patch) | |
| tree | b1647e8b265e98a0ee0388396fa9318d518a9118 | |
| parent | 776168a540665784b575e66a9d806b4dd5e33942 (diff) | |
| download | meta-boot2qt-29eec9e5acfd711572bb74863f4588a9be4a0ecc.tar.gz | |
Use correct env for QCC1 Style
QT_QUICK_CONTROLS_STYLE env is used also with Qt QuickControls2,
while QCC1 has its own env.
Task-number: QTBUG-53074
Task-number: QTBUG-60957
Change-Id: I2bde6894e86116413258391b5789f07a02c0ccd1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
9 files changed, 9 insertions, 9 deletions
diff --git a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf index 97aaa5e..2b4919d 100644 --- a/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf +++ b/meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf | |||
| @@ -2,7 +2,7 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | |||
| 2 | env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf | 2 | env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf |
| 3 | env=QT_IM_MODULE=qtvirtualkeyboard | 3 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 4 | env=QT_QPA_EGLFS_FORCE888=0 | 4 | env=QT_QPA_EGLFS_FORCE888=0 |
| 5 | env=QT_QUICK_CONTROLS_STYLE=Flat | 5 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 6 | env=XDG_RUNTIME_DIR=/tmp | 6 | env=XDG_RUNTIME_DIR=/tmp |
| 7 | env=QSG_RENDER_LOOP=basic | 7 | env=QSG_RENDER_LOOP=basic |
| 8 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf index 05d666d..61818b8 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
| 4 | env=QT_QUICK_CONTROLS_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/tmp |
| 6 | base=linux | 6 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf index 89e6cd4..db9fe89 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf | |||
| @@ -3,6 +3,6 @@ env=QT_QPA_PLATFORM=linuxfb | |||
| 3 | env=QSG_RENDER_LOOP=basic | 3 | env=QSG_RENDER_LOOP=basic |
| 4 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 4 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 5 | env=QT_IM_MODULE=qtvirtualkeyboard | 5 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 6 | env=QT_QUICK_CONTROLS_STYLE=Flat | 6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 7 | env=XDG_RUNTIME_DIR=/tmp | 7 | env=XDG_RUNTIME_DIR=/tmp |
| 8 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf index 29d8b6a..83f3876 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf | |||
| @@ -3,6 +3,6 @@ env=QT_QPA_EGLFS_HIDECURSOR=1 | |||
| 3 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 3 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 4 | env=QT_IM_MODULE=qtvirtualkeyboard | 4 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 | 5 | env=QTGLESSTREAM_DISPLAY=192.168.56.1 |
| 6 | env=QT_QUICK_CONTROLS_STYLE=Flat | 6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 7 | env=XDG_RUNTIME_DIR=/tmp | 7 | env=XDG_RUNTIME_DIR=/tmp |
| 8 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf index 1056ea0..4608bfe 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf | |||
| @@ -4,6 +4,6 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | |||
| 4 | env=QT_IM_MODULE=qtvirtualkeyboard | 4 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 5 | env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 | 5 | env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 |
| 6 | env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src | 6 | env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src |
| 7 | env=QT_QUICK_CONTROLS_STYLE=Flat | 7 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 8 | env=XDG_RUNTIME_DIR=/tmp | 8 | env=XDG_RUNTIME_DIR=/tmp |
| 9 | base=linux | 9 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf index 1fe8f14..71a4f4f 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf | |||
| @@ -3,6 +3,6 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | |||
| 3 | env=QT_QPA_PLATFORM=linuxfb | 3 | env=QT_QPA_PLATFORM=linuxfb |
| 4 | env=QSG_RENDER_LOOP=basic | 4 | env=QSG_RENDER_LOOP=basic |
| 5 | env=QT_IM_MODULE=qtvirtualkeyboard | 5 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 6 | env=QT_QUICK_CONTROLS_STYLE=Flat | 6 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 7 | env=XDG_RUNTIME_DIR=/tmp | 7 | env=XDG_RUNTIME_DIR=/tmp |
| 8 | base=linux | 8 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf index 200aa90..aad2161 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 3 | env=QT_QPA_EGLFS_FORCE888=1 | 3 | env=QT_QPA_EGLFS_FORCE888=1 |
| 4 | env=QT_QUICK_CONTROLS_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/tmp |
| 6 | base=linux | 6 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf index 7236378..0b7ae16 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
| 4 | env=QT_QUICK_CONTROLS_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 5 | env=XDG_RUNTIME_DIR=/tmp | 5 | env=XDG_RUNTIME_DIR=/tmp |
| 6 | env=QSG_RENDER_LOOP=basic | 6 | env=QSG_RENDER_LOOP=basic |
| 7 | base=linux | 7 | base=linux |
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf index 1314481..4935581 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins | 1 | env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins |
| 2 | env=QT_IM_MODULE=qtvirtualkeyboard | 2 | env=QT_IM_MODULE=qtvirtualkeyboard |
| 3 | env=QT_QPA_EGLFS_FORCE888=0 | 3 | env=QT_QPA_EGLFS_FORCE888=0 |
| 4 | env=QT_QUICK_CONTROLS_STYLE=Flat | 4 | env=QT_QUICK_CONTROLS_1_STYLE=Flat |
| 5 | env=QT_QPA_EGLFS_INTEGRATION=none | 5 | env=QT_QPA_EGLFS_INTEGRATION=none |
| 6 | env=XDG_RUNTIME_DIR=/tmp | 6 | env=XDG_RUNTIME_DIR=/tmp |
| 7 | base=linux | 7 | base=linux |