From e755ce99d97be26f11c4b49d2a354c464d15dcab Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 30 Jul 2020 15:48:28 +0200 Subject: [PATCH] CMake: Regenerate load(qt_app) projects To use the new qt_internal_add_app function. Change-Id: I9776ce18c3a8b01f1a42e8da346cfd0a98374ef8 Reviewed-by: Cristian Adam --- src/tools/androiddeployqt/.prev_CMakeLists.txt | 7 +++++-- src/tools/androiddeployqt/CMakeLists.txt | 7 +++++-- src/tools/androidtestrunner/CMakeLists.txt | 7 +++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/tools/androiddeployqt/.prev_CMakeLists.txt b/src/tools/androiddeployqt/.prev_CMakeLists.txt index e445201b824..bb644c6fc1c 100644 --- a/src/tools/androiddeployqt/.prev_CMakeLists.txt +++ b/src/tools/androiddeployqt/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from androiddeployqt.pro. ##################################################################### -## androiddeployqt Binary: +## androiddeployqt App: ##################################################################### -qt_add_executable(androiddeployqt +qt_internal_add_app(androiddeployqt SOURCES main.cpp DEFINES @@ -14,6 +14,9 @@ qt_add_executable(androiddeployqt PUBLIC_LIBRARIES Qt::Gui ) +set_target_properties(androiddeployqt PROPERTIES + WIN32_EXECUTABLE FALSE +) #### Keys ignored in scope 1:.:.:androiddeployqt.pro:: # _OPTION = "host_build" diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index d47e10efd21..0a0886fc752 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from androiddeployqt.pro. ##################################################################### -## androiddeployqt Binary: +## androiddeployqt App: ##################################################################### -qt_add_executable(androiddeployqt +qt_internal_add_app(androiddeployqt SOURCES main.cpp DEFINES @@ -14,6 +14,9 @@ qt_add_executable(androiddeployqt PUBLIC_LIBRARIES Qt::Core # special case ) +set_target_properties(androiddeployqt PROPERTIES + WIN32_EXECUTABLE FALSE +) #### Keys ignored in scope 1:.:.:androiddeployqt.pro:: # _OPTION = "host_build" diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index d7ec4a66fa9..17cf8258697 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from androidtestrunner.pro. ##################################################################### -## androidtestrunner Binary: +## androidtestrunner App: ##################################################################### -qt_add_executable(androidtestrunner +qt_internal_add_app(androidtestrunner SOURCES main.cpp DEFINES @@ -14,6 +14,9 @@ qt_add_executable(androidtestrunner PUBLIC_LIBRARIES Qt::Gui ) +set_target_properties(androidtestrunner PROPERTIES + WIN32_EXECUTABLE FALSE +) #### Keys ignored in scope 1:.:.:androidtestrunner.pro:: # _OPTION = "host_build"