t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-08 23:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: include oe-device-extra.pri unconditionally

Browse Source 
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@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Samuli Piippo
2015-11-02 16:03:41 +02:00
committed by Martin Jansa
parent 178a817e6f
commit a5f8cb00ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
View File

@@ -252,7 +252,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