diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-18 16:43:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-19 11:17:41 +0300 |
| commit | c433b617de5e5363b252a80240f053b103e35e01 (patch) | |
| tree | b85b0504d707cfb17ba6ce9989f4270e4f718010 /classes | |
| parent | ce9a8d9537e3baa7d485128a3f41451d7dca7770 (diff) | |
| parent | ccae79be69c5268df3b47e4e14cea0591c39a531 (diff) | |
| download | meta-qt5-c433b617de5e5363b252a80240f053b103e35e01.tar.gz | |
Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingw
* meta-qt5/krogoth:
qtquick1: fix qtwebkit support
qtbase: fix drm dependency for eglfs PACKAGECONFIG
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qt5: upgrade to latest revisions in 5.6 branch
qtbase: add patch to make Qt5Config modules behave better with cmake builds
cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE
Change dependency from virtual/mesa to drm in the kms packageconfig.
replace base_contains by bb.utils.contains
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtenginio_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebkit_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: I1da3a7689e16e5ffaa6e31030729a4f2f29c501d
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cmake_qt5.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 813ea0c9..3180fd6d 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass | |||
| @@ -3,7 +3,7 @@ inherit qmake5_paths | |||
| 3 | 3 | ||
| 4 | DEPENDS_prepend = "qtbase " | 4 | DEPENDS_prepend = "qtbase " |
| 5 | 5 | ||
| 6 | EXTRA_OECMAKE += " \ | 6 | EXTRA_OECMAKE_prepend = " \ |
| 7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ | 7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ |
| 8 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ | 8 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ |
| 9 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ | 9 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ |
| @@ -32,4 +32,5 @@ EXTRA_OECMAKE += " \ | |||
| 32 | -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \ | 32 | -DOE_QMAKE_PATH_QT_DOCS=${OE_QMAKE_PATH_QT_DOCS} \ |
| 33 | -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \ | 33 | -DOE_QMAKE_PATH_QT_SETTINGS=${OE_QMAKE_PATH_QT_SETTINGS} \ |
| 34 | -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \ | 34 | -DOE_QMAKE_PATH_QT_EXAMPLES=${OE_QMAKE_PATH_QT_EXAMPLES} \ |
| 35 | -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS}" | 35 | -DOE_QMAKE_PATH_QT_TESTS=${OE_QMAKE_PATH_QT_TESTS} \ |
| 36 | " | ||