diff options
30 files changed, 247 insertions, 12 deletions
diff --git a/share/qtcreator/templates/qml/qtquick_1_1/template.xml b/share/qtcreator/templates/qml/qtquick_1_1/template.xml index c7be17228b..75b8be6596 100644 --- a/share/qtcreator/templates/qml/qtquick_1_1/template.xml +++ b/share/qtcreator/templates/qml/qtquick_1_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="E" +<template openeditor="main.qml" priority="BZ" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.1.1"> <displayname>Qt Quick 1.1</displayname> <description>Creates a Qt Quick 1 UI project with a single QML file that contains the main view. You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 4.8 or newer.</description> diff --git a/share/qtcreator/templates/qml/qtquick_2_1/template.xml b/share/qtcreator/templates/qml/qtquick_2_1/template.xml index a7bba350ed..7cffb946a4 100644 --- a/share/qtcreator/templates/qml/qtquick_2_1/template.xml +++ b/share/qtcreator/templates/qml/qtquick_2_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="D" +<template openeditor="main.qml" priority="BY" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.2.1"> <displayname>Qt Quick 2.1</displayname> <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 5.1 or newer.</description> diff --git a/share/qtcreator/templates/qml/qtquick_2_2/template.xml b/share/qtcreator/templates/qml/qtquick_2_2/template.xml index 07259fbc73..9a005c2997 100644 --- a/share/qtcreator/templates/qml/qtquick_2_2/template.xml +++ b/share/qtcreator/templates/qml/qtquick_2_2/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="C" +<template openeditor="main.qml" priority="BX" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.2.2"> <displayname>Qt Quick 2.2</displayname> <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 5.2 or newer.</description> diff --git a/share/qtcreator/templates/qml/qtquick_2_3/main.qml b/share/qtcreator/templates/qml/qtquick_2_3/main.qml new file mode 100644 index 0000000000..58f5c65a02 --- /dev/null +++ b/share/qtcreator/templates/qml/qtquick_2_3/main.qml @@ -0,0 +1,19 @@ +import QtQuick 2.3 + +Rectangle { + width: 360 + height: 360 + + MouseArea { + anchors.fill: parent + onClicked: { + Qt.quit(); + } + } + + Text { + anchors.centerIn: parent + text: "Hello World" + } +} + diff --git a/share/qtcreator/templates/qml/qtquick_2_3/main.qmlproject b/share/qtcreator/templates/qml/qtquick_2_3/main.qmlproject new file mode 100644 index 0000000000..558f68d035 --- /dev/null +++ b/share/qtcreator/templates/qml/qtquick_2_3/main.qmlproject @@ -0,0 +1,21 @@ +/* File generated by Qt Creator, version 2.7.0 */ + +import QmlProject 1.1 + +Project { +// QTC_REPLACE main.qml WITH main + mainFile: "main.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ "../exampleplugin" ] +} diff --git a/share/qtcreator/templates/qml/qtquick_2_3/template.xml b/share/qtcreator/templates/qml/qtquick_2_3/template.xml new file mode 100644 index 0000000000..36e776d746 --- /dev/null +++ b/share/qtcreator/templates/qml/qtquick_2_3/template.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<template openeditor="main.qml" priority="BW" + featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.2.3"> + <displayname>Qt Quick 2.3</displayname> + <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of project. Requires Qt 5.3 or newer.</description> +</template> diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml b/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml index 0f6ed41d43..766a047dca 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_0/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="B" +<template openeditor="main.qml" priority="AZ" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.Controls.1.0"> <displayname>Qt Quick Controls 1.0</displayname> <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view and uses Qt Quick Controls. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. This project requires that you have installed Qt Quick Controls for your Qt version. Requires Qt 5.1 or newer.</description> diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml b/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml index 211da365f7..f5f228ebfb 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_1/main.qml @@ -1,6 +1,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Window 2.0 +import QtQuick.Window 2.1 ApplicationWindow { title: qsTr("Hello World") diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_1/template.xml b/share/qtcreator/templates/qml/qtquickcontrols_1_1/template.xml index 24cbe0c6fd..7a0b3d26bc 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols_1_1/template.xml +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="A" +<template openeditor="main.qml" priority="AY" featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.Controls.1.1"> <displayname>Qt Quick Controls 1.1</displayname> <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view and uses Qt Quick Controls. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. This project requires that you have installed Qt Quick Controls for your Qt version. Requires Qt 5.2 or newer.</description> diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qml b/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qml new file mode 100644 index 0000000000..8e9f3a8acc --- /dev/null +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qml @@ -0,0 +1,29 @@ +import QtQuick 2.3 +import QtQuick.Controls 1.2 +import QtQuick.Window 2.2 + +ApplicationWindow { + title: qsTr("Hello World") + width: 640 + height: 480 + + menuBar: MenuBar { + Menu { + title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } + MenuItem { + text: qsTr("Exit") + onTriggered: Qt.quit(); + } + } + } + + Button { + text: qsTr("Hello World") + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + } +} diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qmlproject b/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qmlproject new file mode 100644 index 0000000000..558f68d035 --- /dev/null +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_2/main.qmlproject @@ -0,0 +1,21 @@ +/* File generated by Qt Creator, version 2.7.0 */ + +import QmlProject 1.1 + +Project { +// QTC_REPLACE main.qml WITH main + mainFile: "main.qml" + + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ "../exampleplugin" ] +} diff --git a/share/qtcreator/templates/qml/qtquickcontrols_1_2/template.xml b/share/qtcreator/templates/qml/qtquickcontrols_1_2/template.xml new file mode 100644 index 0000000000..a8773c8b2d --- /dev/null +++ b/share/qtcreator/templates/qml/qtquickcontrols_1_2/template.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<template openeditor="main.qml" priority="AX" + featuresRequired="QtSupport.Wizards.FeatureQtQuickProject, QtSupport.Wizards.FeatureQtQuick.Controls.1.2"> + <displayname>Qt Quick Controls 1.2</displayname> + <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view and uses Qt Quick Controls. You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. This project requires that you have installed Qt Quick Controls for your Qt version. Requires Qt 5.3 or newer.</description> +</template> diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml index 4e87f29513..02c44b7551 100644 --- a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml +++ b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="E" +<template openeditor="main.qml" priority="BZ" featuresRequired="QtSupport.Wizards.FeatureQtQuick.1.1" qrcdeployment="qrcdeployment.pri" viewerdir="qtquick1applicationviewer" diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml index 405aa668f9..e3c67118ea 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml +++ b/share/qtcreator/templates/qtquick/qtquick_2_1/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.1 -import QtQuick.Window 2.1 +import QtQuick.Window 2.0 Window { visible: true diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml index e0a5cb5008..648571a702 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml +++ b/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="D" +<template openeditor="main.qml" priority="BY" featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.1" qrcdeployment="qrcdeployment.pri" stubversionminor="5"> diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml index 77e0205cef..86431f727c 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml +++ b/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="C" +<template openeditor="main.qml" priority="BX" featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.2" qrcdeployment="qrcdeployment.pri" stubversionminor="5"> diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro b/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro new file mode 100644 index 0000000000..fa61ce669e --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro @@ -0,0 +1,14 @@ +TEMPLATE = app + +QT += qml quick + +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +# QML_IMPORT_PATH # +QML_IMPORT_PATH = + +# Default rules for deployment. +include(../../shared/qrcdeployment.pri) diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/main.cpp b/share/qtcreator/templates/qtquick/qtquick_2_3/main.cpp new file mode 100644 index 0000000000..d76049d67e --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/main.cpp @@ -0,0 +1,12 @@ +#include <QGuiApplication> +#include <QQmlApplicationEngine> + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + + return app.exec(); +} diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/main.qml b/share/qtcreator/templates/qtquick/qtquick_2_3/main.qml new file mode 100644 index 0000000000..af32f2eff9 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/main.qml @@ -0,0 +1,20 @@ +import QtQuick 2.3 +import QtQuick.Window 2.2 + +Window { + visible: true + width: 360 + height: 360 + + MouseArea { + anchors.fill: parent + onClicked: { + Qt.quit(); + } + } + + Text { + text: qsTr("Hello World") + anchors.centerIn: parent + } +} diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/qml.qrc b/share/qtcreator/templates/qtquick/qtquick_2_3/qml.qrc new file mode 100644 index 0000000000..5f6483ac33 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/qml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_3/template.xml new file mode 100644 index 0000000000..e788fe9a7d --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/template.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<template openeditor="main.qml" priority="BW" + featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.3" + qrcdeployment="qrcdeployment.pri" + stubversionminor="5"> + <displayname>Qt Quick 2.3</displayname> + <description>Creates a deployable Qt Quick 2 application using the QtQuick 2.3 import. Requires Qt 5.3 or newer.</description> +</template> diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml index 026be35600..c2368c519b 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="B" +<template openeditor="main.qml" priority="AZ" featuresRequired="QtSupport.Wizards.FeatureQtQuick.Controls.1.0" qrcdeployment="qrcdeployment.pri" stubversionminor="1"> diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml index d3d0f96fe0..d4930dd83b 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<template openeditor="main.qml" priority="A" +<template openeditor="main.qml" priority="AY" featuresRequired="QtSupport.Wizards.FeatureQtQuick.Controls.1.1" qrcdeployment="qrcdeployment.pri" stubversionminor="1"> diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro new file mode 100644 index 0000000000..1c260786ad --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro @@ -0,0 +1,13 @@ +TEMPLATE = app + +QT += qml quick widgets + +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Default rules for deployment. +include(../../shared/qrcdeployment.pri) diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.cpp b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.cpp new file mode 100644 index 0000000000..1e5bf587b3 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.cpp @@ -0,0 +1,12 @@ +#include <QApplication> +#include <QQmlApplicationEngine> + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + QQmlApplicationEngine engine; + engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + + return app.exec(); +} diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.qml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.qml new file mode 100644 index 0000000000..cc2db21d98 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/main.qml @@ -0,0 +1,28 @@ +import QtQuick 2.3 +import QtQuick.Controls 1.2 + +ApplicationWindow { + visible: true + width: 640 + height: 480 + title: qsTr("Hello World") + + menuBar: MenuBar { + Menu { + title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } + MenuItem { + text: qsTr("Exit") + onTriggered: Qt.quit(); + } + } + } + + Text { + text: qsTr("Hello World") + anchors.centerIn: parent + } +} diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/qml.qrc b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/qml.qrc new file mode 100644 index 0000000000..5f6483ac33 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/qml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/template.xml new file mode 100644 index 0000000000..66b44a4d43 --- /dev/null +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/template.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<template openeditor="main.qml" priority="AX" + featuresRequired="QtSupport.Wizards.FeatureQtQuick.Controls.1.2" + qrcdeployment="qrcdeployment.pri" + stubversionminor="1"> + <displayname>Qt Quick Controls 1.2</displayname> + <description>Creates a deployable Qt Quick 2 application using Qt Quick Controls. Requires Qt 5.3 or newer.</description> +</template> diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 089851e0ff..328b3038a2 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -264,6 +264,12 @@ FeatureSet BaseQtVersion::availableFeatures() const features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_2); features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_1); + if (qtVersion() < QtVersionNumber(5, 3, 0)) + return features; + + features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_3); + features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_2); + return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 93d9c4fc2c..4709c046c2 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -57,10 +57,12 @@ const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2"; const char FEATURE_QT_QUICK_2_0[] = "QtSupport.Wizards.FeatureQtQuick.2.0"; const char FEATURE_QT_QUICK_2_1[] = "QtSupport.Wizards.FeatureQtQuick.2.1"; const char FEATURE_QT_QUICK_2_2[] = "QtSupport.Wizards.FeatureQtQuick.2.2"; +const char FEATURE_QT_QUICK_2_3[] = "QtSupport.Wizards.FeatureQtQuick.2.3"; const char FEATURE_QT_QUICK_CONTROLS[] = "QtSupport.Wizards.FeatureQtQuick.Controls"; const char FEATURE_QT_QUICK_CONTROLS_1[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1"; const char FEATURE_QT_QUICK_CONTROLS_1_0[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.0"; const char FEATURE_QT_QUICK_CONTROLS_1_1[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.1"; +const char FEATURE_QT_QUICK_CONTROLS_1_2[] = "QtSupport.Wizards.FeatureQtQuick.Controls.1.2"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile"; |