diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json index 162c0397ead..4e4936a77af 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json @@ -2,10 +2,10 @@ "version": 1, "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], "id": "U.QtQuickApplicationEmpty", - "category": "E.ApplicationQtQuick", + "category": "D.ApplicationQt", "trDescription": "Creates a Qt Quick application that contains an empty window.", - "trDisplayName": "Qt Quick Application - Empty", - "trDisplayCategory": "Application (Qt Quick)", + "trDisplayName": "Qt Quick Application", + "trDisplayCategory": "Application (Qt)", "icon": "icon.png", "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.6" ], "enabled": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0}", diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon.png deleted file mode 100644 index 7d0267a6037..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon@2x.png deleted file mode 100644 index 27004e64689..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon@2x.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl deleted file mode 100644 index 88f3909590c..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl +++ /dev/null @@ -1,60 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} -@if %{UseVirtualKeyboard} -import %{QtQuickVirtualKeyboardImport} -@endif - -ApplicationWindow { -@if %{UseVirtualKeyboard} - id: window -@endif - width: 640 - height: 480 - visible: true - title: qsTr("Scroll") - - ScrollView { - anchors.fill: parent - - ListView { - id: listView - width: parent.width - model: 20 - delegate: ItemDelegate { - text: "Item " + (index + 1) - width: listView.width - } - } - } -@if %{UseVirtualKeyboard} - - InputPanel { - id: inputPanel - z: 99 - x: 0 - y: window.height - width: window.width - - states: State { - name: "visible" - when: inputPanel.active - PropertyChanges { - target: inputPanel - y: window.height - inputPanel.height - } - } - transitions: Transition { - from: "" - to: "visible" - reversible: true - ParallelAnimation { - NumberAnimation { - properties: "y" - duration: 250 - easing.type: Easing.InOutQuad - } - } - } - } -@endif -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/qml.qrc b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/qml.qrc deleted file mode 100644 index af1cc9bc020..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/qml.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - main.qml - qtquickcontrols2.conf - - diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json deleted file mode 100644 index 158ca338642..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json +++ /dev/null @@ -1,302 +0,0 @@ -{ - "version": 1, - "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], - "id": "V.QtQuickApplicationScroll", - "category": "E.ApplicationQtQuick", - "trDescription": "Creates a Qt Quick Controls application with a ScrollView.", - "trDisplayName": "Qt Quick Application - Scroll", - "trDisplayCategory": "Application (Qt Quick)", - "icon": "icon.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.9" ], - "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": "QtQuickControlsVersion", "value": "%{JS: value('QtVersion').QtQuickControlsVersion}" }, - { "key": "QtQuickVirtualKeyboardImport", "value": "%{JS: value('QtVersion').QtQuickVirtualKeyboardImport}" }, - { "key": "QtQuickControlsStyle", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyle}" }, - { "key": "QtQuickControlsStyleTheme", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyleTheme}" }, - { "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": "" } - ], - - "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": 0, - "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": "Minimal required Qt version:", - "type": "ComboBox", - "persistenceKey": "QtQuick.minimumQtVersion", - "data": - { - "index": 1, - "items": - [ - { - "trKey": "Qt 6.2", - "value": - { - "QtQuickVersion": "", - "QtQuickControlsVersion": "", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard", - "IsQt6": true - } - }, - { - "trKey": "Qt 5.15", - "value": - { - "QtQuickVersion": "2.15", - "QtQuickControlsVersion": "2.15", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.14", - "value": - { - "QtQuickVersion": "2.14", - "QtQuickControlsVersion": "2.14", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.13", - "value": - { - "QtQuickVersion": "2.13", - "QtQuickControlsVersion": "2.13", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.12", - "value": - { - "QtQuickVersion": "2.12", - "QtQuickControlsVersion": "2.5", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - } - ] - } - }, - { - "name": "ControlsStyle", - "trDisplayName": "Qt Quick Controls Style:", - "type": "ComboBox", - "data": - { - "index": 0, - "items": - [ - { - "trKey": "Material Light", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Material Dark", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal Light", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Universal Dark", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal System", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "System" - } - }, - { - "trKey": "Fusion", - "value": - { - "QtQuickControlsStyle": "Fusion", - "QtQuickControlsStyleTheme": "" - } - }, - { - "trKey": "Imagine", - "value": - { - "QtQuickControlsStyle": "Imagine", - "QtQuickControlsStyleTheme": "" - } - } - ] - } - }, - { - "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": "../qtquickcontrols2.conf", - "target": "qtquickcontrols2.conf" - }, - { - "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/stack/HomeForm.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl deleted file mode 100644 index dc133ab09ee..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} - -Page { - width: 600 - height: 400 - - title: qsTr("Home") - - Label { - text: qsTr("You are on the home page.") - anchors.centerIn: parent - } -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl deleted file mode 100644 index 562060a16dd..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} - -Page { - width: 600 - height: 400 - - title: qsTr("Page 1") - - Label { - text: qsTr("You are on Page 1.") - anchors.centerIn: parent - } -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl deleted file mode 100644 index 3a22d7ff049..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} - -Page { - width: 600 - height: 400 - - title: qsTr("Page 2") - - Label { - text: qsTr("You are on Page 2.") - anchors.centerIn: parent - } -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon.png deleted file mode 100644 index d7ab9f9e812..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon@2x.png deleted file mode 100644 index 87adc78f55c..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon@2x.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl deleted file mode 100644 index bced4fd0a5f..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl +++ /dev/null @@ -1,99 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} -@if %{UseVirtualKeyboard} -import %{QtQuickVirtualKeyboardImport} -@endif - -ApplicationWindow { - id: window - width: 640 - height: 480 - visible: true - title: qsTr("Stack") - - header: ToolBar { - contentHeight: toolButton.implicitHeight - - ToolButton { - id: toolButton - text: stackView.depth > 1 ? "\\u25C0" : "\\u2630" - font.pixelSize: Qt.application.font.pixelSize * 1.6 - onClicked: { - if (stackView.depth > 1) { - stackView.pop() - } else { - drawer.open() - } - } - } - - Label { - text: stackView.currentItem.title - anchors.centerIn: parent - } - } - - Drawer { - id: drawer - width: window.width * 0.66 - height: window.height - - Column { - anchors.fill: parent - - ItemDelegate { - text: qsTr("Page 1") - width: parent.width - onClicked: { - stackView.push("Page1Form.qml") - drawer.close() - } - } - ItemDelegate { - text: qsTr("Page 2") - width: parent.width - onClicked: { - stackView.push("Page2Form.qml") - drawer.close() - } - } - } - } - - StackView { - id: stackView - initialItem: "HomeForm.qml" - anchors.fill: parent - } -@if %{UseVirtualKeyboard} - - InputPanel { - id: inputPanel - z: 99 - x: 0 - y: window.height - width: window.width - - states: State { - name: "visible" - when: inputPanel.active - PropertyChanges { - target: inputPanel - y: window.height - inputPanel.height - } - } - transitions: Transition { - from: "" - to: "visible" - reversible: true - ParallelAnimation { - NumberAnimation { - properties: "y" - duration: 250 - easing.type: Easing.InOutQuad - } - } - } - } -@endif -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/qml.qrc b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/qml.qrc deleted file mode 100644 index 77259896677..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/qml.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - - main.qml - HomeForm.ui.qml - Page1Form.ui.qml - Page2Form.ui.qml - qtquickcontrols2.conf - - diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json deleted file mode 100644 index 8e8d34147bb..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json +++ /dev/null @@ -1,315 +0,0 @@ -{ - "version": 1, - "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], - "id": "V.QtQuickApplicationStack", - "category": "E.ApplicationQtQuick", - "trDescription": "Creates a Qt Quick Controls application with a StackView to display content, and a Drawer and ToolBar for navigation.", - "trDisplayName": "Qt Quick Application - Stack", - "trDisplayCategory": "Application (Qt Quick)", - "icon": "icon.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.7" ], - "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": "QtQuickControlsVersion", "value": "%{JS: value('QtVersion').QtQuickControlsVersion}" }, - { "key": "QtQuickVirtualKeyboardImport", "value": "%{JS: value('QtVersion').QtQuickVirtualKeyboardImport}" }, - { "key": "QtQuickControlsStyle", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyle}" }, - { "key": "QtQuickControlsStyleTheme", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyleTheme}" }, - { "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": "HomeForm.qml Page1Form.qml Page2Form.qml" }, - { "key": "AdditionalQmlFilesQbs", "value": ", \"HomeForm.qml\", \"Page1Form.qml\", \"Page2Form.qml\"" } - - ], - - "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": 0, - "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": "Minimal required Qt version:", - "type": "ComboBox", - "persistenceKey": "QtQuick.minimumQtVersion", - "data": - { - "index": 1, - "items": - [ - { - "trKey": "Qt 6.2", - "value": - { - "QtQuickVersion": "", - "QtQuickControlsVersion": "", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard", - "IsQt6": true - } - }, - { - "trKey": "Qt 5.15", - "value": - { - "QtQuickVersion": "2.15", - "QtQuickControlsVersion": "2.15", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.14", - "value": - { - "QtQuickVersion": "2.14", - "QtQuickControlsVersion": "2.14", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.13", - "value": - { - "QtQuickVersion": "2.13", - "QtQuickControlsVersion": "2.13", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.12", - "value": - { - "QtQuickVersion": "2.12", - "QtQuickControlsVersion": "2.5", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - } - ] - } - }, - { - "name": "ControlsStyle", - "trDisplayName": "Qt Quick Controls Style:", - "type": "ComboBox", - "data": - { - "index": 0, - "items": - [ - { - "trKey": "Material Light", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Material Dark", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal Light", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Universal Dark", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal System", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "System" - } - }, - { - "trKey": "Fusion", - "value": - { - "QtQuickControlsStyle": "Fusion", - "QtQuickControlsStyleTheme": "" - } - }, - { - "trKey": "Imagine", - "value": - { - "QtQuickControlsStyle": "Imagine", - "QtQuickControlsStyleTheme": "" - } - } - ] - } - }, - { - "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": "HomeForm.qml.tpl", - "target": "HomeForm.qml" - }, - { - "source": "Page1Form.qml.tpl", - "target": "Page1Form.qml" - }, - { - "source": "Page2Form.qml.tpl", - "target": "Page2Form.qml" - }, - { - "source": "../qtquickcontrols2.conf", - "target": "qtquickcontrols2.conf" - }, - { - "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/swipe/Page1Form.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl deleted file mode 100644 index bc932b93ef6..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} - -Page { - width: 600 - height: 400 - - header: Label { - text: qsTr("Page 1") - font.pixelSize: Qt.application.font.pixelSize * 2 - padding: 10 - } - - Label { - text: qsTr("You are on Page 1.") - anchors.centerIn: parent - } -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl deleted file mode 100644 index b4a68b30545..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl +++ /dev/null @@ -1,18 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} - -Page { - width: 600 - height: 400 - - header: Label { - text: qsTr("Page 2") - font.pixelSize: Qt.application.font.pixelSize * 2 - padding: 10 - } - - Label { - text: qsTr("You are on Page 2.") - anchors.centerIn: parent - } -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon.png deleted file mode 100644 index 17d2daae1d3..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon@2x.png b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon@2x.png deleted file mode 100644 index dd2adfbd956..00000000000 Binary files a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon@2x.png and /dev/null differ diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl deleted file mode 100644 index e7f201ccabf..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl +++ /dev/null @@ -1,70 +0,0 @@ -import QtQuick %{QtQuickVersion} -import QtQuick.Controls %{QtQuickControlsVersion} -@if %{UseVirtualKeyboard} -import %{QtQuickVirtualKeyboardImport} -@endif - -ApplicationWindow { -@if %{UseVirtualKeyboard} - id: window -@endif - width: 640 - height: 480 - visible: true - title: qsTr("Tabs") - - SwipeView { - id: swipeView - anchors.fill: parent - currentIndex: tabBar.currentIndex - - Page1Form { - } - - Page2Form { - } - } - - footer: TabBar { - id: tabBar - currentIndex: swipeView.currentIndex - - TabButton { - text: qsTr("Page 1") - } - TabButton { - text: qsTr("Page 2") - } - } -@if %{UseVirtualKeyboard} - - InputPanel { - id: inputPanel - z: 99 - x: 0 - y: window.height - width: window.width - - states: State { - name: "visible" - when: inputPanel.active - PropertyChanges { - target: inputPanel - y: window.height - inputPanel.height - } - } - transitions: Transition { - from: "" - to: "visible" - reversible: true - ParallelAnimation { - NumberAnimation { - properties: "y" - duration: 250 - easing.type: Easing.InOutQuad - } - } - } - } -@endif -} diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/qml.qrc b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/qml.qrc deleted file mode 100644 index d4df9e8a7d3..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/qml.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - main.qml - Page1Form.ui.qml - Page2Form.ui.qml - qtquickcontrols2.conf - - diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json deleted file mode 100644 index 739c7a6fcc8..00000000000 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json +++ /dev/null @@ -1,310 +0,0 @@ -{ - "version": 1, - "supportedProjectTypes": [ "CMakeProjectManager.CMakeProject", "Qbs.QbsProject", "Qt4ProjectManager.Qt4Project" ], - "id": "V.QtQuickApplicationSwipe", - "category": "E.ApplicationQtQuick", - "trDescription": "Creates a Qt Quick Controls application with a SwipeView for navigation.", - "trDisplayName": "Qt Quick Application - Swipe", - "trDisplayCategory": "Application (Qt Quick)", - "icon": "icon.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt.5.7" ], - "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": "QtQuickControlsVersion", "value": "%{JS: value('QtVersion').QtQuickControlsVersion}" }, - { "key": "QtQuickVirtualKeyboardImport", "value": "%{JS: value('QtVersion').QtQuickVirtualKeyboardImport}" }, - { "key": "QtQuickControlsStyle", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyle}" }, - { "key": "QtQuickControlsStyleTheme", "value": "%{JS: value('ControlsStyle').QtQuickControlsStyleTheme}" }, - { "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": "Page1Form.qml Page2Form.qml" }, - { "key": "AdditionalQmlFilesQbs", "value": ", \"Page1Form.qml\", \"Page2Form.qml\"" } - ], - - "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": 0, - "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": "Minimal required Qt version:", - "type": "ComboBox", - "persistenceKey": "QtQuick.minimumQtVersion", - "data": - { - "index": 1, - "items": - [ - { - "trKey": "Qt 6.2", - "value": - { - "QtQuickVersion": "", - "QtQuickControlsVersion": "", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard", - "IsQt6": true - } - }, - { - "trKey": "Qt 5.15", - "value": - { - "QtQuickVersion": "2.15", - "QtQuickControlsVersion": "2.15", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.15", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.14", - "value": - { - "QtQuickVersion": "2.14", - "QtQuickControlsVersion": "2.14", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.14", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.13", - "value": - { - "QtQuickVersion": "2.13", - "QtQuickControlsVersion": "2.13", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - }, - { - "trKey": "Qt 5.12", - "value": - { - "QtQuickVersion": "2.12", - "QtQuickControlsVersion": "2.5", - "QtQuickVirtualKeyboardImport": "QtQuick.VirtualKeyboard 2.4", - "IsQt6": false - } - } - ] - } - }, - { - "name": "ControlsStyle", - "trDisplayName": "Qt Quick Controls Style:", - "type": "ComboBox", - "data": - { - "index": 0, - "items": - [ - { - "trKey": "Material Light", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Material Dark", - "value": - { - "QtQuickControlsStyle": "Material", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal Light", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Light" - } - }, - { - "trKey": "Universal Dark", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "Dark" - } - }, - { - "trKey": "Universal System", - "value": - { - "QtQuickControlsStyle": "Universal", - "QtQuickControlsStyleTheme": "System" - } - }, - { - "trKey": "Fusion", - "value": - { - "QtQuickControlsStyle": "Fusion", - "QtQuickControlsStyleTheme": "" - } - }, - { - "trKey": "Imagine", - "value": - { - "QtQuickControlsStyle": "Imagine", - "QtQuickControlsStyleTheme": "" - } - } - ] - } - }, - { - "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": "Page1Form.qml.tpl", - "target": "Page1Form.qml" - }, - { - "source": "Page2Form.qml.tpl", - "target": "Page2Form.qml" - }, - { - "source": "../qtquickcontrols2.conf", - "target": "qtquickcontrols2.conf" - }, - { - "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/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index bc5658d99cd..e35108a3c49 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2352,265 +2352,6 @@ ry="3" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -