diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-25 15:38:29 +0200 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2020-12-04 09:43:52 +0200 |
| commit | 19d99b10df41b7875b3c788bc7a9d1a88734e644 (patch) | |
| tree | dc987a79b9ad1810bedfa8221533b550cf1662cc /recipes-qt/qt5/qttools_git.bb | |
| parent | 545be38961a2e287c64f2ae607569e88da4bfa8b (diff) | |
| parent | 7a9f639fbd632dbe23af95c7b8123a0b907c6179 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into 5.15
Task-number: QTBUG-88755
Change-Id: I7adf9d6bb5fb8a2b0893d1c4b142db73996f20b9
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 0c8b3e26..63566035 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -19,6 +19,7 @@ SRC_URI += " \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \ " +SRC_URI_append_class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'file://0004-Force-native-build-of-qt-help-tools-as-qhelpgenerato.patch', '', d)}" FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" @@ -34,21 +35,10 @@ COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" -TOOLSTOBUILD += "linguist/lconvert linguist/lrelease linguist/lupdate pixeltool qtdiag qtpaths qtplugininfo" -TOOLSTOBUILD += "${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" -TOOLSFORTARGET = "pixeltool qtdiag qtpaths qtplugininfo" -TOOLSFORHOST = "linguist ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" - EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \ -" -EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" -EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" -EXTRA_QMAKEVARS_PRE_append_class-target = "\ - ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " - SRCREV = "cc52debd905e0ed061290d6fd00a5f1ab67478a5" BBCLASSEXTEND = "native nativesdk" |