diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-02 16:03:41 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-11-11 13:24:53 +0100 |
| commit | a5f8cb00ffe7f8ddaafd031bc29b126000a73690 (patch) | |
| tree | 8d5c85208a610905dbc992341c3aa0943b785619 /recipes-qt/qt5/qtbase | |
| parent | 178a817e6f4604e0f4b24a416d5e83b428cbabe7 (diff) | |
| download | meta-qt5-a5f8cb00ffe7f8ddaafd031bc29b126000a73690.tar.gz | |
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 <samuli.piippo@theqtcompany.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 252 | +# for the SDK | 252 | +# for the SDK |
| 253 | +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) | 253 | +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) |
| 254 | + | 254 | + |
| 255 | +exists(../oe-device-extra.pri):include(../oe-device-extra.pri) | 255 | +include(../oe-device-extra.pri) |
| 256 | + | 256 | + |
| 257 | +load(qt_config) | 257 | +load(qt_config) |
| 258 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h | 258 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h |