diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json index a41ee12e516..866350f8ac0 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json @@ -3,7 +3,7 @@ "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject" ], "id": "U.QtQuickApplicationEmpty", "category": "D.ApplicationQt", - "trDescription": "Creates a Qt Quick application that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms.\n\nYou can select an option to create a project that you can open in Qt Design Studio, which has a visual editor for Qt Quick UIs.", + "trDescription": "Creates a Qt Quick application that can have both QML and C++ code. You can build the application and deploy it to desktop, embedded, and mobile target platforms.", "trDisplayName": "Qt Quick Application", "trDisplayCategory": "Application (Qt)", "icon": "icon.png", @@ -21,23 +21,7 @@ { "key": "HasFailureSignal", "value": "%{JS: value('MinimumSupportedQtVersion') > '6.3' }"}, { "key": "UsesAutoResourcePrefix", "value": "%{JS: value('MinimumSupportedQtVersion') > '6.4' }"}, { "key": "HasLoadFromModule", "value": "%{JS: value('MinimumSupportedQtVersion') > '6.4' && value('UsesAutoResourcePrefix') }"}, - { "key": "FeatureQt", "value": "QtSupport.Wizards.FeatureQt.%{MinimumSupportedQtVersion}"}, - { "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')}" } + { "key": "FeatureQt", "value": "QtSupport.Wizards.FeatureQt.%{MinimumSupportedQtVersion}"} ], "pages": @@ -53,18 +37,6 @@ "typeId": "Fields", "data": [ - { - "name": "QdsProjectStyle", - "trDisplayName": "Creates a project that you can open in Qt Design Studio", - "trToolTip": "Creates 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", @@ -116,151 +88,21 @@ [ { "source": "CMakeLists.txt", - "openAsProject": true, - "condition": "%{NoQdsProjectStyle}" + "openAsProject": true }, { "source": "main.cpp", - "target": "%{MainCppFileName}", - "condition": "%{NoQdsProjectStyle}" + "target": "%{MainCppFileName}" }, { "source": "Main.qml.tpl", "target": "Main.qml", - "openInEditor": true, - "condition": "%{NoQdsProjectStyle}" + "openInEditor": true }, { "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/insight.tpl", - "target": "%{ProjectDirectory}/insight", - "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}" + "condition": "%{JS: !value('IsSubproject') && value('VersionControl') === 'G.Git' }" } ] }