From c2aeec7e86ec7b7929ad48bfdd7bede6cf5239d0 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 20 Sep 2021 11:45:52 +0200 Subject: [PATCH] Wizards: Reduce QtQuick wizards to essentials The new/upcoming way of co-authoring and sharing a project in Qt Creator and in Qt Design Studio, as-well as the disabling of the QmlDesigner plugin in Qt Creator are a substantial step in the offering. The QtQuick application wizards must not stay behind, but rather also reflect that change: Keep one essential Qt Quick wizard in Qt Creator (which will eventually support the project sharing approach). Leave the competence to create Qml UI code to Qt Design Studio. The removal of wizards for mobile-oriented ui code (for further hand coding) also re-enforces the motto that application wizards should create essentials, rather than example code. Task-number: QTCREATORBUG-26160 Change-Id: I9775d70b45f97290ab65936ff6e373b6fc177c85 Reviewed-by: Alessandro Portale --- .../qtquickapplication/empty/wizard.json | 6 +- .../qtquickapplication/scroll/icon.png | Bin 573 -> 0 bytes .../qtquickapplication/scroll/icon@2x.png | Bin 1095 -> 0 bytes .../qtquickapplication/scroll/main.qml.tpl | 60 ---- .../qtquickapplication/scroll/qml.qrc | 6 - .../qtquickapplication/scroll/wizard.json | 302 ----------------- .../qtquickapplication/stack/HomeForm.qml.tpl | 14 - .../stack/Page1Form.qml.tpl | 14 - .../stack/Page2Form.qml.tpl | 14 - .../qtquickapplication/stack/icon.png | Bin 480 -> 0 bytes .../qtquickapplication/stack/icon@2x.png | Bin 851 -> 0 bytes .../qtquickapplication/stack/main.qml.tpl | 99 ------ .../projects/qtquickapplication/stack/qml.qrc | 9 - .../qtquickapplication/stack/wizard.json | 315 ------------------ .../swipe/Page1Form.qml.tpl | 18 - .../swipe/Page2Form.qml.tpl | 18 - .../qtquickapplication/swipe/icon.png | Bin 561 -> 0 bytes .../qtquickapplication/swipe/icon@2x.png | Bin 1079 -> 0 bytes .../qtquickapplication/swipe/main.qml.tpl | 70 ---- .../projects/qtquickapplication/swipe/qml.qrc | 8 - .../qtquickapplication/swipe/wizard.json | 310 ----------------- src/tools/icons/qtcreatoricons.svg | 259 -------------- 22 files changed, 3 insertions(+), 1519 deletions(-) delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/icon@2x.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/main.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/qml.qrc delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/HomeForm.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page1Form.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/Page2Form.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/icon@2x.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/main.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/qml.qrc delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page1Form.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/Page2Form.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/icon@2x.png delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/main.qml.tpl delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/qml.qrc delete mode 100644 share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json 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 7d0267a6037616f386b6b9a5c1858c1bf94494ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 573 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_Rs{HjxH2#>G&D5i<~C#% zwY0ZSYwnzyQ`neQ*qEK)kWjigKY0A=_1o94-+un`<;$0^-@pI(@#E+3-@iY1-{E9n zV2~^c@(X5Ql95%?%r9KJZ25{!TeluR`SjV#H*eqm_?fkH<6;H|Mr}_Q#}JR>Yp2}| zI^-bW+Pq`K4%M!%Zyk$vu(K}u`@dc-M6%Uqe&fcX`zu~Kf3#on9l(}l> zz8~@F?^tK!bMWnNlXfh(p+A#q*cZpVb~n~ysede&9g@p>jRnc^XA2T zeQeHVaNhAT`w8&_zpEU|PETz+clW3E+PZ%=B9>a-;*U25M#Zn2KaF$Z=M7-^?)6jtQd^2LFPwVL8})Nf_O3AHiTl^S-tz7D^ze1FHaCQ& zr`j*LI?MhhXNKuB{_X!i_I202ElWuem|UId`mfaDu2)CK@_!Y#4*k4Q!<^sYI7^7* SE-wQE1B0ilpUXO@geCwt0Ui+m 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 27004e64689891fe2e49e6c0e22e619ea5a41b77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1095 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4rT@hhO2JvTnr41z5zZVt_%ze4PcO)JE^a) zFDIuVH@Bg!ZANxsQ$}7xPGM7KenWPCQ)W>^bNlq>_9;2}4cP?^Sp^N*g&;;wVFN@Y zy8y&(?wHcjITa*Z(9qH`HM0_aEDL z;P~;A=g*wGeD?g6bLX#|yKwdVg{v1XUAuPu_VpWguHU?KW|K#b%PoKYh`}yZ@ z8E4QH1_q{bPZ!6KjC*fqg$EyU5NS<*zxO+v*@o;l5eM4#e!sWj?f?1`^DbkhBh`6A z>=!>DI{mCJ`NYqTn;B6~D$9@DT`GL(souG?9{-hZE}wj*Z%Vcc+ zzxv}N*UF-}@G$4j9p>CjQ&#*eZ<-P9s?o%-_EU$lA#HsCt)vAXB2i@5dxx@t9m5>4r-kr%Qh4 z{_9)7G%r~%(wsqeqN_FcufM0CH?dXRoH;vkZ{Nlzml#T-0$K%jzgiz__`XZ^z#=9e zTbI2uIgAqGcfU+7Zb)X0IP52w5d5=ngTelv9E<|9FZE;}TqeVi63oZ2>7}`^89R#y z!(}yhRtK}ECX!n;7oVKrYw6pTb1Ktl376YsM}|AiE({4~t+RPht0^u} zz|n9^B+n=#*ln`m?4nsbH^1cno8R+S?#Sc2rd9b}OgYtgzXa9i&yL!v$)51NI5^wv zZT;y5?|+wU&dKVLmyl9qxD{dc^(ifOA?}Q}te&$bH~i{h zx%upq#oowQ)7)h)G5#pa-)NKcXPVXjG#@?v7KWQyr)&Q_m{(Hw&F$*6YPD@E;~V#x z1azIf9yDviPu?HhqM`@7rT3 - - 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 d7ab9f9e8124a613a27e4a655b1482fd73031af1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_rUm$fxH2#>G&D5i<~C#% zwY0ZSYwnzyQ`neQ*qEK)kW;>4pt#)|*sPP(`W76OE`@#%6*2YVC^menm@G#$xU-#{$ zPtk#SUhW)irjjp0KhJBlEz1x2e@bq5t_)|P?ShjG@2)3?Y_qsnw5fFY$!|+58C3(N W1Z{#h>||hIVDNPHb6Mw<&;$UaT-;Ou 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 87adc78f55cbc4e62c7727207e65e90a9bd2bfa7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 851 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4rT@hhO2JvTnr41QUN|8t_%ze4PcO)JE^a) zFDIuVH@Bg!ZANxsQ$}7xPGM7KenWPCQ)W>^bNlq>_9;2}4cP?^Sp^N*g&;;wVFN@Y zy8y&(?wHcjITa*Z(9qH`HMDNV_&Ov|dyE@;RpY%DBoDK2j-t!gi= z>Zq*ku4(A2Z<*N8GO4k3QcK6w4V!mw+PZi1*1dc8A3JmI^4arO&VkU?a~H0@dGqf5 z`;YHGeEj(F^QTXrKY#x6`ODYezkmP#|34@C*lq>}2BVT7zhDLyHg--a87*xcT|ILP zr?$TS2@@wxo;q#D%%v;VZ`i$O&%OhfuUx%$|H;#jpFV&2_Vdr*GR~kY3=E9hJY5_^ zGVZ;-bv@`%fB@Tr8=7KPWiAKUG+bQQ$n0+F5*0oCdw-jHU|I=Jig^mV`}h41)5`59 z1x&JZ5B%q{=U_+}!z5o;8?$5Id!Msf{PfVT`nShHwNF%y#YphU&+F&Ud#+r-6l7sB z?Wm>GjOhfBa3|c*4t>E$5g1*}aE(7w4k7WZTah85kHC NJYD@<);T3K0RV;gjqd;e 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 17d2daae1d34e961e835c89cf3fd1f7a5fab17de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4rT@hhJ-tuTNxM_js^IHxH2#>G&D5i<~C#% zwY0ZSYwnzyQ`neQ*qEK)kW9XZ3 zHf`N{{N&STFW5nU3sv?V^(aM(P3A~|GU$^XK#P$s?}1e#Vhajr>gZWzk}KX7iRwK%#>RG z>5O(Ab(-NHBp5u592gtt%`RJ;!pbmbst)6--;H&1_c1*;b69p@tLTIqd3Wj=`{UVu z)ES-TlB<7mKuPV?tIKTX?YTVS+d?8|%NettVOX{1Zqhuh2j6pDrcRyu!}vSjY3oIM zqCL%y>E#M-j(MS9yXQge?AtoWIXYw{TmskIpMCDdaI@#vi33x-E(^uXxz%{B^9J*c zWb-8s({0OM&uCG5ail=vz+bDFX{_oo=X1WxY`bq(KVd@Q$u)1czhhuvVDNPHb6Mw< G&;$VVzzq5T 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 dd2adfbd956dcd485bfb239c1d13d38660e4afe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1079 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4rT@hhO2JvTnr41vjcoWTp1V`8o(eocT!(p zUrtU#Zf-+c+l=hOri{FXoWiEe{D$oOrp%&-=Jx5$?Nf5{8?p-;vI-iq3qg#W!Ul*) zb^(an+%cu4b1F!-prNH>YIY%*%x}mk03nbXur81kSUpGt#%Sr7+R`xvB4Xtb>f{mQ zm86B7@idzksTJD7a3m=pHiBZRh^bootaykUC;n>Lt$fXQDa_lQ+`Qv zK}kztS!;1cdr3umNo9L!RcBdsXL)s3Wo>t5ZBKQ5Uv)!YO=Evu^MuCM$xUsOo7$%| zw@+#5nA+Agy=TIl36tkfoVsA@j3u+@t(?DT&HTk{mn`47a?RFt8+UHnx_9%|y*qXt z+PnYQp(Ce`pE!5=%%#(3FP%Mq<=pwJ=Pq15f8pxIOV_VnyM67(om;o>KX~}$@ssCI zo;-i?;`OUnZ(hHC`}W=Y_wPTx|M2m{hfkkAeg5?M%jeHuK7aZ8_3O89-@kwV{^Q4w zpFe;8`t|GA@87=}YxEv6FfbUE1o;Isu&}XnO37$x>*(s4TR64#^-q{MY4X%*GiEMb zv3|quJ$v>YxP0a6wfj$=e*Eh^XQ3{*sAOITeM=M5=BpyXsoa2lbEN$)+7?o!+6t5 z^a2-;I8)+29>%j;3C0G39iMqTRyFVhOks|1+``4cA;S2ffnAGzji>tU>DH_a*L2Hx zHf%j;cwn1qALF%MY!P9M39>(?yk}i-R#bq6pTT1XvmMihyRrtG{pCJ1u-h1@Z@0H* z+hL%|$W^ZL_Rzz}<@=8^1y6T*yQuEw)$p-P6D zdG-IAxNS4T965gWdv|9@PS~=UFWApp%@r#zHs~)&tHqlsJe%d0l zpNH30EV!eW^=#JL8PksWE9Qz9PI>=#!~KkWx212L()Ik0+iBH3`>)?HBN`9#Enx%$b0x-I(N z!3P8_3;5o?z9*KDuwCTEP7afm4Zmaz3QE?q+$hfxIB{(i!{tt+++AONeW&OB<^9F4 zZ6zw7mvZ~+Yw6@yvnETPd^OW0c - - 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" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -