diff options
author | Robert Griebl <robert.griebl@qt.io> | 2024-02-16 12:44:44 +0100 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2024-02-19 08:56:20 +0100 |
commit | 95efd2c9e734f8778b62d7bb00af5604aa14ff48 (patch) | |
tree | 26d6ad3991aff937362358eb9198d372b3f34104 | |
parent | dcd849c8da8d3f757fe26198c110243eb6f11af8 (diff) |
Re-enable console/terminal output on Windows
This was accidentally disabled due to a bug in the Qt6 porting tool,
which didn't take the "config *= console" qmake setting into account.
Change-Id: I2d255b03e0ac52255423fc612c5afc411d6d6a17
Pick-to: 6.7 6.6 6.5
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
-rw-r--r-- | src/tools/appman/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/controller/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/package-server/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/testrunner/CMakeLists.txt | 4 |
4 files changed, 9 insertions, 1 deletions
diff --git a/src/tools/appman/CMakeLists.txt b/src/tools/appman/CMakeLists.txt index e52ae26d..63944f16 100644 --- a/src/tools/appman/CMakeLists.txt +++ b/src/tools/appman/CMakeLists.txt @@ -9,6 +9,8 @@ qt_internal_add_app(appman AM_COMPILING_APPMAN ) +set_target_properties(appman PROPERTIES WIN32_EXECUTABLE FALSE) + include(QtAppManBuildConfig) qtam_internal_add_build_config(appman) diff --git a/src/tools/controller/CMakeLists.txt b/src/tools/controller/CMakeLists.txt index 70977347..dba800e3 100644 --- a/src/tools/controller/CMakeLists.txt +++ b/src/tools/controller/CMakeLists.txt @@ -12,6 +12,8 @@ qt_internal_add_app(appman-controller AM_COMPILING_APPMAN ) +set_target_properties(appman-controller PROPERTIES WIN32_EXECUTABLE FALSE) + qt_internal_extend_target(appman-controller DBUS_INTERFACE_SOURCES ${CMAKE_SOURCE_DIR}/src/dbus-interfaces/io.qt.packagemanager.xml diff --git a/src/tools/package-server/CMakeLists.txt b/src/tools/package-server/CMakeLists.txt index cfab7b4c..af396512 100644 --- a/src/tools/package-server/CMakeLists.txt +++ b/src/tools/package-server/CMakeLists.txt @@ -16,3 +16,5 @@ qt_internal_add_app(appman-package-server DEFINES AM_COMPILING_APPMAN ) + +set_target_properties(appman-package-server PROPERTIES WIN32_EXECUTABLE FALSE) diff --git a/src/tools/testrunner/CMakeLists.txt b/src/tools/testrunner/CMakeLists.txt index 7c03231e..28411453 100644 --- a/src/tools/testrunner/CMakeLists.txt +++ b/src/tools/testrunner/CMakeLists.txt @@ -13,7 +13,9 @@ qt_internal_add_app(appman-qmltestrunner Qt::QuickTestPrivate Qt::TestPrivate Qt::AppManMainPrivate - ) +) + +set_target_properties(appman-qmltestrunner PROPERTIES WIN32_EXECUTABLE FALSE) include(QtAppManBuildConfig) |