summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-05-17 17:24:15 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-05-20 09:23:14 +0000
commit846adfe079fd57410fbb8e9c96eae010cf81dd26 (patch)
tree2cc253c2a905bfc11d1ac4ed2c3082ae65c46fff /util
parent826821658df16b18a51ec0c0a6e54f7e3e31795c (diff)
Handle the new cmdline config feature in pro2cmake
cmdline implies console, so use that also to determine if a binary should get a GUI flag. Change-Id: I084e0a45785df96a7dc2c101af5305fbb39efbc3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/pro2cmake.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 5c5569ae30..ba77e0e51f 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -1624,7 +1624,8 @@ def handle_app_or_lib(scope: Scope, cm_fh: typing.IO[str], *,
assert not is_example
write_test(cm_fh, scope, indent=indent)
else:
- gui = 'console' not in scope.get('CONFIG')
+ config = scope.get('CONFIG')
+ gui = all(val not in config for val in ['console', 'cmdline'])
if is_example:
write_example(cm_fh, scope, gui, indent=indent)
else: