diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-14 15:06:28 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-15 10:10:47 +0300 |
| commit | 63dec9bbd826a4afafa7177aaa3439467f25d80a (patch) | |
| tree | afcff4f6d8c72cb4a51f1e27cda2a65aeb55d712 /recipes-qt/qt5/qttools_git.bb | |
| parent | 79791026ff20539180027de0d796f8acd55bc7bf (diff) | |
| parent | 53500ade778bac6e1733db43fc41c290d7b9d16b (diff) | |
Merge remote-tracking branch 'origin/upstream/master' into 5.13
* origin/upstream/master:
qtdeclarative: Use qmlcachegen provided by OE instead of system one.
qtbase-native: Always use qt provided doubleconversion library.
qttools: Enable clang support when using clang
qt5-creator: update to v4.9.2
maliit-framework-qt5: Fix build when ptest is enabled
qtwebengine: Fix build on aarch64
qtwebengine: refresh the patches to apply
qtremoteobjects: Use OE_PATH_EXTERNAL_HOST_BINS to enable cmake to find repc
qt5: Upgrade to Qt 5.13.0
Allow enabling gui for native and nativesdk
qt5everywheredemo: update HOMEPAGE
qtconnectivity,qtsystems: Account for bluez4 from oe-core
gdb_%.bbappend: Avoid PAK archive (application/x-pak)
Change-Id: I24e0b7b95920df3722f84a1f3a2e74546dc74810
Diffstat (limited to 'recipes-qt/qt5/qttools_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 833c997d..eedbc5b5 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -DEPENDS += "qtbase qtdeclarative qtxmlpatterns" - +DEPENDS += "qtbase qtdeclarative qtxmlpatterns chrpath-replacement-native" +EXTRANATIVEPATH += "chrpath-native" # Patches from https://github.com/meta-qt5/qttools/commits/b5.12 # 5.12.meta-qt5.2 SRC_URI += " \ @@ -25,12 +25,19 @@ FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" PACKAGECONFIG ??= "" +PACKAGECONFIG_append_toolchain-clang = " clang" + PACKAGECONFIG[qtwebkit] = ",,qtwebkit" +PACKAGECONFIG[clang] = ",,clang" EXTRA_QMAKEVARS_PRE += " \ - CONFIG-=config_clang \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " +EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG-=config_clang" +EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG-=config_clang" +EXTRA_QMAKEVARS_PRE_append_class-target = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \ +" SRCREV = "f4a51baca04fdaa0fc6a1106db9f7dd91b5a3b2a" @@ -41,3 +48,6 @@ do_install_ptest() { t=${D}${PTEST_PATH} cp ${B}/tests/auto/qtdiag/tst_tdiag $t } +do_install_append_toolchain-clang() { + chrpath --delete ${D}${bindir}/qdoc +} |