From c2f620c0dafbefe821e484ce44348ff41f660e6f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 6 Mar 2017 14:45:57 +0200 Subject: emulator: correctly append qtsimulator configuration Append configuration without overriding the defaults. Change-Id: Id8ceefb1a04f0ad825349cab549ac77b68c0de94 Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtlocation_git.bbappend | 4 ++-- recipes-qt/qt5/qtsensors_git.bbappend | 4 ++-- recipes-qt/qt5/qtsystems_git.bbappend | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 2fed196..7ee2382 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -29,5 +29,5 @@ PACKAGECONFIG += "gypsy" -EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" +DEPENDS_append_emulator = " qtsimulator" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 890656c..655364b 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " SENSORS_PLUGINS=simulator" +DEPENDS_append_emulator = " qtsimulator" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index f199937..2a949eb 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -27,5 +27,5 @@ ## ############################################################################ -EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" -DEPENDS_emulator += "qtsimulator" +EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator" +DEPENDS_append_emulator = " qtsimulator" -- cgit v1.2.3-54-g00ecf