[oe] [meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally
Samuli Piippo
samuli.piippo at theqtcompany.com
Mon Nov 2 14:03:41 UTC 2015
configure parses through the mkspec, but does not handle conditions
at all, so oe-device-extra.pri was not included at configure phase.
For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
include() is conditional and won't break build even when
oe-device-extra.pri does not exist.
Signed-off-by: Samuli Piippo <samuli.piippo at theqtcompany.com>
---
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a9c448d..d377921 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -240,7 +240,7 @@ index 0000000..d0a4166
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
+
-+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
++include(../oe-device-extra.pri)
+
+load(qt_config)
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
--
1.9.1
More information about the Openembedded-devel
mailing list