From 74bd95d3238dca1c6e22fb3faa59b94f590b1ac8 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 31 May 2010 16:36:48 +0200
Subject: [PATCH] Mark QML support in Qt Creator 2.0 as preview
Reviewed-by: Kai Koehne
---
share/qtcreator/templates/wizards/qml-runtime/wizard.xml | 4 +++-
.../qmlprojectmanager/qmlprojectapplicationwizard.cpp | 7 +++++++
src/plugins/qmlprojectmanager/qmlprojectconstants.h | 2 +-
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp | 9 +++++++++
.../qt4projectmanager/gettingstartedwelcomepagewidget.ui | 6 ++----
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
index 5800b8ef5d6..9b5e58e5820 100644
--- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
+++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
@@ -38,7 +38,9 @@ leave room for the Qt 4 target page.
class="qt4project" firstpage="10"
id="QmlRuntimePlugin" category="F.Projects">
<icon>lib.png</icon>
- <description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description>
+ <description>Creates a C++ plugin to extend the funtionality of the QML runtime.
+
+Note: The Qt Quick specific features are based on a preview version of the Qt 4.7 package. Please update to a more recent version of Qt Creator as soon as Qt 4.7 has been released.</description>
<displayname>QML Runtime Plug-in</displayname>
<displaycategory>QML Runtime Plug-in</displaycategory>
<files>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 4edc8857c27..0909e5fd08e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -73,6 +73,13 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
parameters.setId(QLatin1String("QA.QML Application"));
parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n"
"QML application projects are executed through the QML runtime and do not need to be built."));
+
+ // TODO: Remove me when Qt 4.7 is out
+ parameters.setDescription(parameters.description() +
+ tr("\n\nNote: The Qt Quick specific features are based on a preview version "
+ "of the Qt 4.7 package. Please update to a more recent version of Qt "
+ "Creator as soon as Qt 4.7 has been released."));
+
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index 1fd04264a0f..849e9a6227f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -52,7 +52,7 @@ const char *const TASK_CATEGORY_QML = "Task.Category.Qml";
// Wizard category
const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
-const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
+const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project (Preview)");
const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png";
// Env variables for inspector
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index a8d1349ac7b..0e2d18450b9 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -116,6 +116,15 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
parameters.setDisplayName(tr("Import Existing Qt QML Directory"));
parameters.setId(QLatin1String("QI.QML Import"));
parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
+
+
+ // TODO: Remove me when Qt 4.7 is out
+ parameters.setDescription(parameters.description() +
+ tr("\n\nNote: The Qt Quick specific features are based on a preview version "
+ "of the Qt 4.7 package. Please update to a more recent version of Qt "
+ "Creator as soon as Qt 4.7 has been released."));
+
+
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));
diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
index 9f03d493557..a46f113acce 100644
--- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
+++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.ui
@@ -61,9 +61,7 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="Utils::WelcomeModeTreeWidget" name="tutorialTreeWidget" native="true">
- <zorder></zorder>
- </widget>
+ <widget class="Utils::WelcomeModeTreeWidget" name="tutorialTreeWidget" native="true"/>
</item>
</layout>
</widget>
@@ -139,7 +137,7 @@
<item>
<widget class="Utils::WelcomeModeLabel" name="demoTitleLabel_2">
<property name="text">
- <string>Explore Qt Quick Examples</string>
+ <string>Explore Qt Quick (Preview) Examples</string>
</property>
</widget>
</item>
--
GitLab