diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:48:12 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:52:10 +0200 |
| commit | a358108b09762390ec951f560540bb99aaf9f2a2 (patch) | |
| tree | 6d9e6c078f46403bb2e76a25f4aa56c990c23083 /recipes-qt/qt5/qtbase_git.bb | |
| parent | c32de2f746d944f515e9e47dd330dfb64b3ca280 (diff) | |
| parent | ce766374432309b85fdcfe8ef287dbb2ef11b337 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtmqtt: add recipe
qtbase: fix a regression
qtbase: introduce QT_EDITION
packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtserialbus_git.bb
Task-number: QTBUG-65164
Change-Id: Ifdb2bba80e68de28ec818fff2b2716645eb4d9c5
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 86cd7ff2..42de707b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = " \ " # common for qtbase-native, qtbase-nativesdk and qtbase -# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared -# 5.9.meta-qt5-shared.2 +# Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-shared +# 5.10.meta-qt5-shared.1 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -26,9 +26,9 @@ SRC_URI += "\ file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0007-Delete-qlonglong-and-qulonglong.patch \ file://0008-Replace-pthread_yield-with-sched_yield.patch \ - file://0010-Add-OE-specific-specs-for-clang-compiler.patch \ - file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ - file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ + file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ + file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ + file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://run-ptest \ " @@ -167,11 +167,16 @@ XPLATFORM_toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" do_configure() { + # Regenerate header files when they are included in source tarball + # Otherwise cmake files don't set PRIVATE_HEADERS correctly + rm -rf ${S}/include + mkdir -p ${S}/.git || true + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration touch ${S}/mkspecs/oe-device-extra.pri ${S}/configure -v \ - -opensource -confirm-license \ + -${QT_EDITION} -confirm-license \ -sysroot ${STAGING_DIR_TARGET} \ -prefix ${OE_QMAKE_PATH_PREFIX} \ -bindir ${OE_QMAKE_PATH_BINS} \ |