diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt index 3b479a595c4..95426d9498c 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt @@ -34,22 +34,28 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick REQUIRED) @endif -if(ANDROID) - add_library(%{ProjectName} SHARED - %{MainCppFileName} - qml.qrc -@if %{HasTranslation} - ${TS_FILES} -@endif +set(PROJECT_SOURCES + %{MainCppFileName} + qml.qrc + @if %{HasTranslation} + ${TS_FILES} + @endif +) + +if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) + qt_add_executable(%{ProjectName} + ${PROJECT_SOURCES} ) else() - add_executable(%{ProjectName} - %{MainCppFileName} - qml.qrc -@if %{HasTranslation} - ${TS_FILES} -@endif - ) + if(ANDROID) + add_library(%{ProjectName} SHARED + ${PROJECT_SOURCES} + ) + else() + add_executable(%{ProjectName} + ${PROJECT_SOURCES} + ) + endif() endif() target_compile_definitions(%{ProjectName} diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt index 21fec5e47b8..391da140528 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists.txt @@ -34,30 +34,32 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets REQUIRED) @endif -if(ANDROID) - add_library(%{ProjectName} SHARED - %{MainFileName} - %{SrcFileName} - %{HdrFileName} - @if %{GenerateForm} - %{FormFileName} - @endif - @if %{HasTranslation} - ${TS_FILES} - @endif - ) +set(PROJECT_SOURCES + %{MainFileName} + %{SrcFileName} + %{HdrFileName} + @if %{GenerateForm} + %{FormFileName} + @endif + @if %{HasTranslation} + ${TS_FILES} + @endif +) + +if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) + qt_add_executable(%{ProjectName} + ${PROJECT_SOURCES} + ) else() - add_executable(%{ProjectName} - %{MainFileName} - %{SrcFileName} - %{HdrFileName} - @if %{GenerateForm} - %{FormFileName} - @endif - @if %{HasTranslation} - ${TS_FILES} - @endif - ) + if(ANDROID) + add_library(%{ProjectName} SHARED + ${PROJECT_SOURCES} + ) + else() + add_executable(%{ProjectName} + ${PROJECT_SOURCES} + ) + endif() endif() target_link_libraries(%{ProjectName} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)