summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-08-15 11:14:55 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-09-02 15:16:33 +0200
commit3ed820535438a47cf65d5f2015512d4ee99b27b4 (patch)
tree1dc3219dc14eaef7d49148187e7d8de18e35f339
parent1a97beaa7c5fcd6d3dd1af7f81ecf1538fc34b53 (diff)
downloadmeta-qt5-3ed820535438a47cf65d5f2015512d4ee99b27b4.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 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r--recipes-qt/qt5/qttools_git.bb11
1 files changed, 0 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 913a0f8d..2943db97 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -34,21 +34,10 @@ COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
34 34
35export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config" 35export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
36 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
42EXTRA_QMAKEVARS_PRE += " \ 37EXTRA_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"
46EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang"
47EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang"
48EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
50"
51
52SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400" 41SRCREV = "6a85b6150554111f7d473d56addfe5a8b5da4400"
53 42
54BBCLASSEXTEND = "native nativesdk" 43BBCLASSEXTEND = "native nativesdk"