diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.6.x.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.6.x.txt
deleted file mode 100644
index 9d2fc4a82cc..00000000000
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.6.x.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-
-project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-find_package(Qt6 6.2 COMPONENTS Quick REQUIRED)
-
-qt_add_executable(%{TargetName}
- main.cpp
-)
-
-qt_add_qml_module(%{TargetName}
- URI %{ProjectName}
- VERSION 1.0
- QML_FILES main.qml %{AdditionalQmlFiles}
-)
-
-set_target_properties(%{TargetName} PROPERTIES
- MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
- MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
- MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
- MACOSX_BUNDLE TRUE
- WIN32_EXECUTABLE TRUE
-)
-
-target_link_libraries(%{TargetName}
- PRIVATE Qt6::Quick)
-
-install(TARGETS %{TargetName}
- BUNDLE DESTINATION .
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
index 3b5806eb093..d5725099e15 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/CMakeLists.txt
@@ -1,67 +1,23 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.16)
project(%{ProjectName} VERSION 0.1 LANGUAGES CXX)
-set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-@if %{HasTranslation}
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick LinguistTools)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick LinguistTools)
+find_package(Qt6 6.2 REQUIRED COMPONENTS Quick)
-set(TS_FILES %{TsFileName})
-@else
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
-@endif
-
-set(PROJECT_SOURCES
- %{MainCppFileName}
- qml.qrc
- @if %{HasTranslation}
- ${TS_FILES}
- @endif
+qt_add_executable(%{TargetName}
+ main.cpp
)
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
- qt_add_executable(%{ProjectName}
- MANUAL_FINALIZATION
- ${PROJECT_SOURCES}
- )
-# Define target properties for Android with Qt 6 as:
-# set_property(TARGET %{ProjectName} APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
-# ${CMAKE_CURRENT_SOURCE_DIR}/android)
-# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
-@if %{HasTranslation}
+qt_add_qml_module(%{TargetName}
+ URI %{ProjectName}
+ VERSION 1.0
+ QML_FILES main.qml
+)
- qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-@endif
-else()
- if(ANDROID)
- add_library(%{ProjectName} SHARED
- ${PROJECT_SOURCES}
- )
-# Define properties for Android with Qt 5 after find_package() calls as:
-# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
- else()
- add_executable(%{ProjectName}
- ${PROJECT_SOURCES}
- )
- endif()
-@if %{HasTranslation}
-
- qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
-@endif
-endif()
-
-target_link_libraries(%{ProjectName}
- PRIVATE Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick)
-
-set_target_properties(%{ProjectName} PROPERTIES
+set_target_properties(%{TargetName} PROPERTIES
MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
@@ -69,11 +25,10 @@ set_target_properties(%{ProjectName} PROPERTIES
WIN32_EXECUTABLE TRUE
)
-install(TARGETS %{ProjectName}
+target_link_libraries(%{TargetName}
+ PRIVATE Qt6::Quick
+)
+
+install(TARGETS %{TargetName}
BUNDLE DESTINATION .
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-if(QT_VERSION_MAJOR EQUAL 6)
- qt_import_qml_plugins(%{ProjectName})
- qt_finalize_executable(%{ProjectName})
-endif()
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
deleted file mode 100644
index 1e0811386ab..00000000000
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro
+++ /dev/null
@@ -1,40 +0,0 @@
-@if "%{UseVirtualKeyboard}" == "true"
-QT += quick virtualkeyboard
-@else
-QT += quick
-@endif
-@if !%{IsQt6}
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-@endif
-
-SOURCES += \\
- %{MainCppFileName}
-
-@if %{IsQt6}
-resources.files = main.qml %{AdditionalQmlFiles}
-resources.prefix = /$${TARGET}
-RESOURCES += resources
-@else
-RESOURCES += qml.qrc
-@endif
-@if %{HasTranslation}
-
-TRANSLATIONS += \\
- %{TsFileName}
-CONFIG += lrelease
-CONFIG += embed_translations
-@endif
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
deleted file mode 100644
index 14025b37b82..00000000000
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs
+++ /dev/null
@@ -1,48 +0,0 @@
-import qbs
-
-CppApplication {
-@if "%{UseVirtualKeyboard}" == "true"
- Depends { name: "Qt"; submodules: ["quick", "virtualkeyboard"] }
-@else
- Depends { name: "Qt.quick" }
-@endif
-
- install: true
-
- // Additional import path used to resolve QML modules in Qt Creator's code model
- property pathList qmlImportPaths: []
-@if !%{IsQt6}
-
- cpp.defines: [
- // You can make your code fail to compile if it uses deprecated APIs.
- // In order to do so, uncomment the following line.
- //"QT_DISABLE_DEPRECATED_BEFORE=0x060000" // disables all the APIs deprecated before Qt 6.0.0
- ]
-@endif
-
- files: [
- "%{MainCppFileName}",
-@if !%{IsQt6}
- "main.qml",
- "qml.qrc",
-@endif
-@if %{HasTranslation}
- "%{TsFileName}",
-@endif
- ]
- @if %{HasTranslation}
-
- Group {
- fileTagsFilter: "qm"
- Qt.core.resourcePrefix: "/i18n"
- fileTags: "qt.core.resource_data"
- }
-@endif
-@if %{IsQt6}
- Group {
- files: ["main.qml"%{AdditionalQmlFilesQbs}]
- Qt.core.resourcePrefix: "%{ProjectName}/"
- fileTags: ["qt.qml.qml", "qt.core.resource_data"]
- }
-@endif
-}
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/qml.qrc b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/qml.qrc
deleted file mode 100644
index 5f6483ac33f..00000000000
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/qml.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- main.qml
-
-
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
deleted file mode 100644
index ca2eb44b280..00000000000
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
- "version": 1,
- "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ],
- "id": "U.QtQuickApplicationEmpty",
- "category": "D.ApplicationQt",
- "trDescription": "Creates a Qt Quick application that contains an empty window.",
- "trDisplayName": "Qt Quick Application",
- "trDisplayCategory": "Application (Qt)",
- "icon": "icon.png",
- "iconKind": "Themed",
- "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.6" ],
- "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}",
-
- "options":
- [
- { "key": "ProjectFile", "value": "%{JS: value('BuildSystem') === 'qmake' ? value('ProFile') : (value('BuildSystem') === 'cmake' ? value('CMakeFile') : value('QbsFile'))}" },
- { "key": "ProFile", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'pro')}" },
- { "key": "QbsFile", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'qbs')}" },
- { "key": "CMakeFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
- { "key": "IsQt6", "value": "%{JS: value('QtVersion').IsQt6}" },
- { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" },
- { "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" },
- { "key": "QtQuickWindowVersion", "value": "%{JS: value('QtVersion').QtQuickWindowVersion}" },
- { "key": "QtQuickVirtualKeyboardImport", "value": "%{JS: value('QtVersion').QtQuickVirtualKeyboardImport}" },
- { "key": "QtQuickFeature", "value": "%{JS: (value('QtQuickVersion')=='') ? 'QtSupport.Wizards.FeatureQt.6.2' : 'QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}'}" },
- { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" },
- { "key": "HasTranslation", "value": "%{JS: value('TsFileName') !== ''}" },
- { "key": "SetQPAPhysicalSize", "value": "%{UseVirtualKeyboardByDefault}" },
- { "key": "AdditionalQmlFiles", "value": "" },
- { "key": "AdditionalQmlFilesQbs", "value": "" },
- { "key": "TargetName", "value": "%{JS: 'app' + value('ProjectName')}" }
- ],
-
- "pages":
- [
- {
- "trDisplayName": "Project Location",
- "trShortTitle": "Location",
- "typeId": "Project"
- },
- {
- "trDisplayName": "Define Build System",
- "trShortTitle": "Build System",
- "typeId": "Fields",
- "enabled": "%{JS: !value('IsSubproject')}",
- "data":
- [
- {
- "name": "BuildSystem",
- "trDisplayName": "Build system:",
- "type": "ComboBox",
- "persistenceKey": "BuildSystemType",
- "data":
- {
- "index": 1,
- "items":
- [
- {
- "trKey": "qmake",
- "value": "qmake",
- "condition": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0}"
- },
- {
- "trKey": "CMake",
- "value": "cmake",
- "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}"
- },
- {
- "trKey": "Qbs",
- "value": "qbs",
- "condition": "%{JS: value('Plugins').indexOf('QbsProjectManager') >= 0}"
- }
- ]
- }
- }
- ]
- },
- {
- "trDisplayName": "Define Project Details",
- "trShortTitle": "Details",
- "typeId": "Fields",
- "data":
- [
- {
- "name": "QtVersion",
- "trDisplayName": "Minimum required Qt version:",
- "type": "ComboBox",
- "persistenceKey": "QtQuick.minimumQtVersion",
- "data":
- {
- "index": 1,
- "items":
- [
- {
- "trKey": "Qt 6.2",
- "value":
- {
- "QtQuickVersion": "",
- "QtQuickWindowVersion": "",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard",
- "IsQt6": true
- }
- },
- {
- "trKey": "Qt 5.15",
- "value":
- {
- "QtQuickVersion": "2.15",
- "QtQuickWindowVersion": "2.15",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15",
- "IsQt6": false
- }
- },
- {
- "trKey": "Qt 5.14",
- "value":
- {
- "QtQuickVersion": "2.14",
- "QtQuickWindowVersion": "2.14",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14",
- "IsQt6": false
- }
- },
- {
- "trKey": "Qt 5.13",
- "value":
- {
- "QtQuickVersion": "2.13",
- "QtQuickWindowVersion": "2.13",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
- "IsQt6": false
- }
- },
- {
- "trKey": "Qt 5.12",
- "value":
- {
- "QtQuickVersion": "2.12",
- "QtQuickWindowVersion": "2.12",
- "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4",
- "IsQt6": false
- }
- }
- ]
- }
- },
- {
- "name": "UseVirtualKeyboard",
- "trDisplayName": "Use Qt Virtual Keyboard",
- "type": "CheckBox",
- "persistenceKey": "QtQuick.UseVirtualKeyboard.%{UseVirtualKeyboardByDefault}",
- "data":
- {
- "checked": "%{UseVirtualKeyboardByDefault}"
- }
- }
- ]
- },
- {
- "trDisplayName": "Translation File",
- "trShortTitle": "Translation",
- "typeId": "QtTranslation"
- },
- {
- "trDisplayName": "Kit Selection",
- "trShortTitle": "Kits",
- "typeId": "Kits",
- "enabled": "%{JS: !value('IsSubproject')}",
- "data": {
- "projectFilePath": "%{ProjectFile}",
- "requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
- }
- },
- {
- "trDisplayName": "Project Management",
- "trShortTitle": "Summary",
- "typeId": "Summary"
- }
- ],
- "generators":
- [
- {
- "typeId": "File",
- "data":
- [
- {
- "source": "../app.pro",
- "target": "%{ProFile}",
- "openAsProject": true,
- "condition": "%{JS: value('BuildSystem') === 'qmake'}"
- },
- {
- "source": "%{JS: value('QtVersion').IsQt6 ? '../CMakeLists.6.x.txt' : '../CMakeLists.txt'}",
- "target": "CMakeLists.txt",
- "openAsProject": true,
- "condition": "%{JS: value('BuildSystem') === 'cmake'}"
- },
- {
- "source": "../app.qbs",
- "target": "%{QbsFile}",
- "openAsProject": true,
- "condition": "%{JS: value('BuildSystem') === 'qbs'}"
- },
- {
- "source": "../main.cpp",
- "target": "%{MainCppFileName}"
- },
- {
- "source": "main.qml.tpl",
- "target": "main.qml",
- "openInEditor": true
- },
- {
- "source": "qml.qrc",
- "condition": "%{JS: !value('QtVersion').IsQt6}"
- },
- {
- "source": "../../translation.ts",
- "target": "%{TsFileName}",
- "condition": "%{HasTranslation}"
- },
- {
- "source": "../../git.ignore",
- "target": ".gitignore",
- "condition": "%{JS: !value('IsSubproject') && value('VersionControl') === 'G.Git'}"
- }
- ]
- }
- ]
-}
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/icon.png
similarity index 100%
rename from share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon.png
rename to share/qtcreator/templates/wizards/projects/qtquickapplication/icon.png
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/icon@2x.png
similarity index 100%
rename from share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon@2x.png
rename to share/qtcreator/templates/wizards/projects/qtquickapplication/icon@2x.png
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp
index 08698bb6bea..bdfd80e1c35 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp
@@ -1,52 +1,16 @@
%{Cpp:LicenseTemplate}\
%{JS: QtSupport.qtIncludes([], ["QtGui/QGuiApplication", "QtQml/QQmlApplicationEngine"])}
-@if %{HasTranslation}
-#include
-#include
-@endif
int main(int argc, char *argv[])
{
@if %{UseVirtualKeyboard}
qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
-@endif
-@if !%{IsQt6}
-@if %{SetQPAPhysicalSize}
- if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) {
- qputenv("QT_QPA_EGLFS_PHYSICAL_WIDTH", QByteArray("213"));
- qputenv("QT_QPA_EGLFS_PHYSICAL_HEIGHT", QByteArray("120"));
-
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
- }
-@else
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
- QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-@endif
@endif
QGuiApplication app(argc, argv);
-@if %{HasTranslation}
-
- QTranslator translator;
- const QStringList uiLanguages = QLocale::system().uiLanguages();
- for (const QString &locale : uiLanguages) {
- const QString baseName = "%{JS: value('ProjectName') + '_'}" + QLocale(locale).name();
- if (translator.load(":/i18n/" + baseName)) {
- app.installTranslator(&translator);
- break;
- }
- }
-@endif
QQmlApplicationEngine engine;
-@if %{IsQt6}
const QUrl url(u"qrc:/%{JS: value('ProjectName')}/main.qml"_qs);
-@else
- const QUrl url(QStringLiteral("qrc:/main.qml"));
-@endif
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
&app, [url](QObject *obj, const QUrl &objUrl) {
if (!obj && url == objUrl)
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/main.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.qml.tpl
similarity index 86%
rename from share/qtcreator/templates/wizards/projects/qtquickapplication/empty/main.qml.tpl
rename to share/qtcreator/templates/wizards/projects/qtquickapplication/main.qml.tpl
index 36607ad82e9..e1a6ccc8c31 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/main.qml.tpl
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.qml.tpl
@@ -1,9 +1,7 @@
-import QtQuick %{QtQuickVersion}
-@if !%{IsQt6}
-import QtQuick.Window %{QtQuickWindowVersion}
-@endif
+import QtQuick
+import QtQuick.Window
@if %{UseVirtualKeyboard}
-import %{QtQuickVirtualKeyboardImport}
+import QtQuick.VirtualKeyboard
@endif
Window {
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
new file mode 100644
index 00000000000..47022ff578a
--- /dev/null
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
@@ -0,0 +1,244 @@
+{
+ "version": 1,
+ "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject" ],
+ "id": "U.QtQuickApplicationEmpty",
+ "category": "D.ApplicationQt",
+ "trDescription": "Creates a Qt Quick application that contains an empty window. Optionally, you can create a Qt Design Studio project.",
+ "trDisplayName": "Qt Quick Application",
+ "trDisplayCategory": "Application (Qt)",
+ "icon": "icon.png",
+ "iconKind": "Themed",
+ "featuresRequired": [ "QtSupport.Wizards.FeatureQtQmlCMakeApi" ],
+ "enabled": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0 }",
+
+ "options":
+ [
+ { "key": "ProjectFile", "value": "%{ProjectDirectory}/CMakeLists.txt" },
+ { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src') }" },
+ { "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0 }" },
+ { "key": "TargetName", "value": "%{JS: 'app' + value('ProjectName') }" },
+ { "key": "QdsWizardPath", "value": "%{IDE:ResourcePath}/qmldesigner/studio_templates/projects" },
+ { "key": "NoQdsProjectStyle", "value": "%{JS: !%{QdsProjectStyle} }" },
+
+ { "key": "ImportModuleName", "value": "%{ProjectName}" },
+ { "key": "ImportModuleVersion", "value": "" },
+ { "key": "IsQt6Project", "value": true },
+ { "key": "ProjectPluginClassName", "value": "%{ProjectName}Plugin" },
+ { "key": "ProjectPluginName", "value": "%{ProjectName}plugin" },
+ { "key": "QmlProjectFileName", "value": "%{JS: Util.fileName('%{ProjectName}', 'qmlproject')}" },
+ { "key": "QtQuickControlsStyle", "value": "Material" },
+ { "key": "QtQuickControlsStyleTheme", "value": "Light" },
+ { "key": "QtQuickVersion", "value": "6.2" },
+ { "key": "ScreenHeight", "value": 1080 },
+ { "key": "ScreenWidth", "value": 1920 },
+ { "key": "UIClassName", "value": "Screen01" },
+ { "key": "UIClassFileName", "value": "%{JS: Util.fileName('%{UIClassName}', 'ui.qml')}" }
+ ],
+
+ "pages":
+ [
+ {
+ "trDisplayName": "Project Location",
+ "trShortTitle": "Location",
+ "typeId": "Project"
+ },
+ {
+ "trDisplayName": "Define Project Details",
+ "trShortTitle": "Details",
+ "typeId": "Fields",
+ "data":
+ [
+ {
+ "name": "QdsProjectStyle",
+ "trDisplayName": "Create a project that you can open in Qt Design Studio",
+ "trToolTip": "Create a project with a structure that is compatible both with Qt Design Studio (via .qmlproject) and with Qt Creator (via CMakeLists.txt). It contains a .ui.qml form that you can visually edit in Qt Design Studio.",
+ "type": "CheckBox",
+ "span": true,
+ "persistenceKey": "QtQuick.QdsProjectStyle",
+ "data":
+ {
+ "checked": false
+ }
+ },
+ {
+ "name": "UseVirtualKeyboard",
+ "trDisplayName": "Use Qt Virtual Keyboard",
+ "type": "CheckBox",
+ "span": true,
+ "persistenceKey": "QtQuick.UseVirtualKeyboard",
+ "data":
+ {
+ "checked": "%{UseVirtualKeyboardByDefault}"
+ }
+ }
+ ]
+ },
+ {
+ "trDisplayName": "Kit Selection",
+ "trShortTitle": "Kits",
+ "typeId": "Kits",
+ "enabled": "%{JS: !value('IsSubproject')}",
+ "data": {
+ "projectFilePath": "%{ProjectFile}",
+ "requiredFeatures": [ "QtSupport.Wizards.FeatureQtQmlCMakeApi" ]
+ }
+ },
+ {
+ "trDisplayName": "Project Management",
+ "trShortTitle": "Summary",
+ "typeId": "Summary"
+ }
+ ],
+ "generators":
+ [
+ {
+ "typeId": "File",
+ "data":
+ [
+ {
+ "source": "CMakeLists.txt",
+ "openAsProject": true,
+ "condition": "%{NoQdsProjectStyle}"
+ },
+ {
+ "source": "main.cpp",
+ "target": "%{MainCppFileName}",
+ "condition": "%{NoQdsProjectStyle}"
+ },
+ {
+ "source": "main.qml.tpl",
+ "target": "main.qml",
+ "openInEditor": true,
+ "condition": "%{NoQdsProjectStyle}"
+ },
+ {
+ "source": "../git.ignore",
+ "target": ".gitignore",
+ "condition": "%{JS: %{NoQdsProjectStyle} && !value('IsSubproject') && value('VersionControl') === 'G.Git' }"
+ }
+ ]
+ },
+ {
+ "typeId": "File",
+ "data":
+ [
+ {
+ "source": "%{QdsWizardPath}/common/app.qmlproject.tpl",
+ "target": "%{ProjectDirectory}/%{QmlProjectFileName}",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/CMakeLists.main.txt.tpl",
+ "target": "%{ProjectDirectory}/CMakeLists.txt",
+ "openAsProject": true,
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/qmlmodules.tpl",
+ "target": "%{ProjectDirectory}/qmlmodules",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/qmlcomponents.tpl",
+ "target": "%{ProjectDirectory}/qmlcomponents",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/main.qml",
+ "target": "%{ProjectDirectory}/main.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/qtquickcontrols2.conf.tpl",
+ "target": "%{ProjectDirectory}/qtquickcontrols2.conf",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/main.cpp.tpl",
+ "target": "%{ProjectDirectory}/src/main.cpp",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/app_environment.h.tpl",
+ "target": "%{ProjectDirectory}/src/app_environment.h",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/import_qml_plugins.h.tpl",
+ "target": "%{ProjectDirectory}/src/import_qml_plugins.h",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/import_qml_components_plugins.h.tpl",
+ "target": "%{ProjectDirectory}/src/import_qml_components_plugins.h",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/CMakeLists.content.txt.tpl",
+ "target": "%{ProjectDirectory}/content/CMakeLists.txt",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/App.qml.tpl",
+ "target": "%{ProjectDirectory}/content/App.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/application/Screen01.ui.qml.tpl",
+ "target": "%{ProjectDirectory}/content/Screen01.ui.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/fonts.txt",
+ "target": "%{ProjectDirectory}/content/fonts/fonts.txt",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/asset_imports.txt",
+ "target": "%{ProjectDirectory}/asset_imports/asset_imports.txt",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/common/CMakeLists.imports.txt.tpl",
+ "target": "%{ProjectDirectory}/imports/CMakeLists.txt",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/CMakeLists.importmodule.txt.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/CMakeLists.txt",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/importmodule.qmldir.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/qmldir",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/Constants.qml.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/Constants.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/DirectoryFontLoader.qml.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/DirectoryFontLoader.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/EventListModel.qml.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListModel.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/EventListSimulator.qml.tpl",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/EventListSimulator.qml",
+ "condition": "%{QdsProjectStyle}"
+ },
+ {
+ "source": "%{QdsWizardPath}/shared-plugin/name/designer/plugin.metainfo",
+ "target": "%{ProjectDirectory}/imports/%{ImportModuleName}/designer/plugin.metainfo",
+ "condition": "%{QdsProjectStyle}"
+ }
+ ]
+ }
+ ]
+}
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 8a53934c836..9dad77df0dd 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -419,6 +419,11 @@ QSet QtVersion::availableFeatures() const
features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 6, -1));
features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 6, -1));
+ if (QVersionNumber(6, 1).isPrefixOf(qtVersion()))
+ return features;
+
+ features.insert(Constants::FEATURE_QT_QML_CMAKE_API);
+
return features;
}
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index 1beacf4b1e2..66a7c8978c9 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -29,6 +29,7 @@ const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFil
const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";
const char FEATURE_QT_3D[] = "QtSupport.Wizards.FeatureQt3d";
const char FEATURE_QT_CANVAS3D_PREFIX[] = "QtSupport.Wizards.FeatureQtCanvas3d";
+const char FEATURE_QT_QML_CMAKE_API[] = "QtSupport.Wizards.FeatureQtQmlCMakeApi";
const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile";
const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop";
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 9cf158938b6..8e6a6baa2d9 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -2181,7 +2181,7 @@
inkscape:connector-curvature="0" />