diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2016-05-11 15:53:14 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-18 21:29:51 +0200 |
commit | 05103827d50ec218954dee3866ec40bee9ec59af (patch) | |
tree | bf48876ff246cbab26847f0548efe97a5e2914dd /recipes-qt/qt5/qtbase_git.bb | |
parent | cbd9331b7acc9b1b53043077993f94bcb9e3f38a (diff) |
qtbase: add patch to make Qt5Config modules behave better with cmake builds
Currently if a project if using the cmake bbclass and the CMakeLists.txt file
uses find_package to find Qt5 and error like this is produced:
| The imported target "Qt5::Core" references the file
|
| "/qmake"
|
| but this file does not exist. Possible reasons include:
This is because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only set in the cmake_qt5 bblcass.
To make it work better in that case the Qt5Config files check if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
is defined and bail out if not. For CMake this is the same as Qt5 wasn't found.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ee926f8f..72ef3ae7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -21,6 +21,7 @@ SRC_URI += "\ file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \ file://0008-configure-paths-for-target-qmake-properly.patch \ file://0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ + file://0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " DEPENDS += "qtbase-native" |