forked from qt-creator/qt-creator
QmlProjectManager: Fix Qt Quick UI Prototype wizard
Fix the path to the main.qml template. Remove all Qt version quirks,
since "Qt Quick Application" project wizards are for Qt 6 from now on.
Amends: 4e0b4fcc92
Fixes: QTCREATORBUG-28722
Change-Id: I338f52f215afc8591fadb12c2ad3ca58d32ec7c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -9,17 +9,12 @@
|
|||||||
"icon": "qtquickuiprototype.png",
|
"icon": "qtquickuiprototype.png",
|
||||||
"iconKind": "Themed",
|
"iconKind": "Themed",
|
||||||
"enabled": "%{JS: value('Plugins').indexOf('QmlProjectManager') >= 0}",
|
"enabled": "%{JS: value('Plugins').indexOf('QmlProjectManager') >= 0}",
|
||||||
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
|
"featuresRequired": [ "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQtQuick.6" ],
|
||||||
|
|
||||||
"options":
|
"options":
|
||||||
[
|
[
|
||||||
{ "key": "QmlProjectFileName", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'qmlproject')}" },
|
{ "key": "QmlProjectFileName", "value": "%{JS: Util.fileName(value('ProjectDirectory') + '/' + value('ProjectName'), 'qmlproject')}" },
|
||||||
{ "key": "IsQt6", "value": "%{JS: value('QtVersion').IsQt6}" },
|
|
||||||
{ "key": "MainQmlFileName", "value": "%{JS: Util.fileName(value('ProjectName'), 'qml')}" },
|
{ "key": "MainQmlFileName", "value": "%{JS: Util.fileName(value('ProjectName'), 'qml')}" },
|
||||||
{ "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.FeatureQtQuick.6' : 'QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}'}" },
|
|
||||||
{ "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }
|
{ "key": "UseVirtualKeyboardByDefault", "value": "%{JS: value('Plugins').indexOf('Boot2Qt') >= 0 || value('Plugins').indexOf('Boot2QtQdb') >= 0}" }
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -36,68 +31,6 @@
|
|||||||
"typeId": "Fields",
|
"typeId": "Fields",
|
||||||
"data":
|
"data":
|
||||||
[
|
[
|
||||||
{
|
|
||||||
"name": "QtVersion",
|
|
||||||
"trDisplayName": "Minimum required Qt version:",
|
|
||||||
"type": "ComboBox",
|
|
||||||
"data":
|
|
||||||
{
|
|
||||||
"index": 1,
|
|
||||||
"items":
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"trKey": "Qt 6",
|
|
||||||
"value":
|
|
||||||
{
|
|
||||||
"QtQuickVersion": "",
|
|
||||||
"QtQuickWindowVersion": "",
|
|
||||||
"QtQuickVirtualKeyboardImport": "",
|
|
||||||
"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",
|
"name": "UseVirtualKeyboard",
|
||||||
"trDisplayName": "Use Qt Virtual Keyboard",
|
"trDisplayName": "Use Qt Virtual Keyboard",
|
||||||
@@ -116,7 +49,7 @@
|
|||||||
"enabled": "%{JS: ! %{IsSubproject}}",
|
"enabled": "%{JS: ! %{IsSubproject}}",
|
||||||
"data": {
|
"data": {
|
||||||
"projectFilePath": "%{QmlProjectFileName}",
|
"projectFilePath": "%{QmlProjectFileName}",
|
||||||
"requiredFeatures": [ "QtSupport.Wizards.FeatureQt", "%{QtQuickFeature}" ]
|
"requiredFeatures": [ "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQtQuick.6" ]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -137,7 +70,7 @@
|
|||||||
"openAsProject": true
|
"openAsProject": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"source": "../qtquickapplication/empty/main.qml.tpl",
|
"source": "../qtquickapplication/main.qml.tpl",
|
||||||
"target": "%{ProjectDirectory}/%{MainQmlFileName}",
|
"target": "%{ProjectDirectory}/%{MainQmlFileName}",
|
||||||
"openInEditor": true
|
"openInEditor": true
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user