diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2020-09-20 17:02:14 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-11-03 17:01:34 +0100 |
commit | bca5326e4561960c09a238d01e33ce4794b01d2b (patch) | |
tree | 08d474a81684f16ecafe31e80fa61b2b4089fc0e | |
parent | 0e7015f7a86dda995a39662edbb5c26da647c496 (diff) | |
download | meta-qt5-bca5326e4561960c09a238d01e33ce4794b01d2b.tar.gz |
qttools: Remove unused variables/configurations
Grepped around in sources of qttools and qtbase: there is not a single hint
that these settings cause any effect.
For the clang_config.. variables [1] was found: Seems the variables set were
removed a while back.
[1] https://code.qt.io/cgit/qt/qttools.git/commit/?id=e181ec2c20ede6b878187f3123d190e8b952deb1
Backport of 3ed820535438a47cf65d5f2015512d4ee99b27b4
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index fa42d227..52e2f3c0 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -34,20 +34,10 @@ COMPATIBLE_HOST_toolchain-clang_riscv64 = "null" | |||
34 | 34 | ||
35 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" | 35 | export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" |
36 | 36 | ||
37 | TOOLSTOBUILD += "linguist/lconvert linguist/lrelease linguist/lupdate pixeltool qtdiag qtpaths qtplugininfo" | ||
38 | TOOLSTOBUILD += "${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" | ||
39 | TOOLSFORTARGET = "pixeltool qtdiag qtpaths qtplugininfo" | ||
40 | TOOLSFORHOST = "linguist ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'qdoc', '', d)}" | ||
41 | |||
42 | EXTRA_QMAKEVARS_PRE += " \ | 37 | EXTRA_QMAKEVARS_PRE += " \ |
43 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 38 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
44 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \ | 39 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath', 'CONFIG+=noqdoc', d)} \ |
45 | " | 40 | " |
46 | EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang" | ||
47 | EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang" | ||
48 | EXTRA_QMAKEVARS_PRE_append_class-target = "\ | ||
49 | ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ | ||
50 | " | ||
51 | 41 | ||
52 | SRCREV = "9d5d92a49256af65a85fa69b58e6744c2722321b" | 42 | SRCREV = "9d5d92a49256af65a85fa69b58e6744c2722321b" |
53 | 43 | ||