summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qttools_git.bb
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
-rw-r--r--recipes-qt/qt5/qttools_git.bb16
1 files changed, 11 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 6252ae4e..16ccb78e 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = " \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12" 12"
13 13
14DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native" 14DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
15EXTRANATIVEPATH += "chrpath-native"
16# Patches from https://github.com/meta-qt5/qttools/commits/b5.13 15# Patches from https://github.com/meta-qt5/qttools/commits/b5.13
17# 5.13.meta-qt5.1 16# 5.13.meta-qt5.1
18SRC_URI += " \ 17SRC_URI += " \
19 file://0001-add-noqtwebkit-configuration.patch \ 18 file://0001-add-noqtwebkit-configuration.patch \
20 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ 19 file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
20 file://0003-src.pro-Add-option-noqdoc-to-disable-qdoc-builds.patch \
21" 21"
22 22
23FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" 23FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
@@ -29,10 +29,19 @@ PACKAGECONFIG_append_toolchain-clang = " clang"
29PACKAGECONFIG[qtwebkit] = ",,qtwebkit" 29PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
30PACKAGECONFIG[clang] = ",,clang" 30PACKAGECONFIG[clang] = ",,clang"
31 31
32COMPATIBLE_HOST_toolchain-clang_riscv32 = "null"
33COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
34
32export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" 35export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
33 36
37TOOLSTOBUILD += "linguist/lconvert linguist/lrelease linguist/lupdate pixeltool qtdiag qtpaths qtplugininfo"
38TOOLSTOBUILD += "${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}"
39TOOLSFORTARGET = "pixeltool qtdiag qtpaths qtplugininfo"
40TOOLSFORHOST = "linguist ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}"
41
34EXTRA_QMAKEVARS_PRE += " \ 42EXTRA_QMAKEVARS_PRE += " \
35 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 43 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
44 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \
36" 45"
37EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" 46EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang"
38EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" 47EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang"
@@ -44,6 +53,3 @@ SRCREV = "4dcc7a3d10a223ddd111eaaac6665609add7c46f"
44 53
45BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
46 55
47do_install_append_toolchain-clang() {
48 chrpath --delete ${D}${bindir}/qdoc
49}