From 29eec9e5acfd711572bb74863f4588a9be4a0ecc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 May 2017 13:06:30 +0300 Subject: 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 --- meta-renesas-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/emulator/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/mx7/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf | 2 +- recipes-qt/b2qt-addons/b2qt-appcontroller/ti33x/appcontroller.conf | 2 +- 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 env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp env=QSG_RENDER_LOOP=basic 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 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 env=QSG_RENDER_LOOP=basic env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QTGLESSTREAM_DISPLAY=192.168.56.1 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0 env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 env=QT_QPA_PLATFORM=linuxfb env=QSG_RENDER_LOOP=basic env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=1 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp 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 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=XDG_RUNTIME_DIR=/tmp env=QSG_RENDER_LOOP=basic 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 @@ env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins env=QT_IM_MODULE=qtvirtualkeyboard env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_STYLE=Flat +env=QT_QUICK_CONTROLS_1_STYLE=Flat env=QT_QPA_EGLFS_INTEGRATION=none env=XDG_RUNTIME_DIR=/tmp base=linux -- cgit v1.2.3-54-g00ecf