From bca5326e4561960c09a238d01e33ce4794b01d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 20 Sep 2020 17:02:14 +0200 Subject: qttools: Remove unused variables/configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- recipes-qt/qt5/qttools_git.bb | 10 ---------- 1 file changed, 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" 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)} \ -" SRCREV = "9d5d92a49256af65a85fa69b58e6744c2722321b" -- cgit v1.2.3