diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-19 12:42:04 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-19 12:47:50 +0100 |
| commit | ab60f32d6fb554db4ddffe3367bca09b73028830 (patch) | |
| tree | 5a26141b86e6372fdf81ce230a46d39f578e359b /util/cmake | |
| parent | edf5fe49b34225932a7752f2bac0e43f7410f46b (diff) | |
CMake: Don't use GUI for tests that use QT += testlib-private
Change-Id: I90cac19928d6e6e30214a6480a5855479a8d4d77
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'util/cmake')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 6 |
1 files 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) |