From a5f8cb00ffe7f8ddaafd031bc29b126000a73690 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 2 Nov 2015 16:03:41 +0200 Subject: qtbase: include oe-device-extra.pri unconditionally 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 Signed-off-by: Martin Jansa --- 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 2b8c9d3c..9f5bb639 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 @@ -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 -- cgit v1.2.3-54-g00ecf