From ab60f32d6fb554db4ddffe3367bca09b73028830 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 19 Mar 2020 12:42:04 +0100 Subject: [PATCH] CMake: Don't use GUI for tests that use QT += testlib-private MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I90cac19928d6e6e30214a6480a5855479a8d4d77 Reviewed-by: Leander Beernaert Reviewed-by: Tor Arne Vestbø --- util/cmake/pro2cmake.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 76302aa01d..238f903bcc 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -3678,9 +3678,9 @@ def handle_app_or_lib( is_plugin = "plugin" in config is_qt_plugin = any("qt_plugin" == s for s in scope.get("_LOADED")) or is_qml_plugin target = "" - gui = all( - val not in config for val in ["console", "cmdline", "-app_bundle"] - ) and "testlib" not in scope.expand("QT") + gui = all(val not in config for val in ["console", "cmdline", "-app_bundle"]) and all( + val not in scope.expand("QT") for val in ["testlib", "testlib-private"] + ) if is_jar: write_jar(cm_fh, scope, indent=indent)