From dea111abd1bbeb08dfc5e5abc4ebdb2d7d47f6b7 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 20 Feb 2012 18:29:42 +0100
Subject: [PATCH] QtQuickAppWizard: stating qt requirements in the description.
We should mention the correct Qt requirements to avoid confusion.
Change-Id: I8d729075359606b632ed617ae898d9f9ddacdfa2
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
.../qmlprojectmanager/qmlprojectapplicationwizard.cpp | 2 +-
.../qt4projectmanager/wizards/qtquickappwizard.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 80ed8efb44a..00404733491 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -82,7 +82,7 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
"QML file that contains the main view.\n\n"
"You can review Qt Quick 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 projects."));
+ "on your computer to create and run this type of projects.\n\nRequires <b>Qt 4.7.4</b> or newer."));
parameters.setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
parameters.setDisplayCategory(QT_TRANSLATE_NOOP("ProjectExplorer", "Qt Application"));
return parameters;
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 2bde90f4038..2a82b8325ed 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -147,7 +147,7 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
parameter.setDisplayName(tr("Qt Quick Application (Built-in elements)"));
parameter.setDescription(basicDescription + tr("The built-in elements in the QtQuick namespace allow "
"you to write cross-platform applications with "
- "a custom look and feel.\n\nRequires Qt 4.7.1 or newer."));
+ "a custom look and feel.\n\nRequires <b>Qt 4.7.4</b> or newer."));
parameter.setRequiredFeatures(basicFeatures);
list << parameter;
@@ -156,7 +156,7 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
parameter.setDescription(basicDescription + tr("The Qt Quick Components for Symbian are a set of "
"ready-made components that are designed with specific "
"native appearance for the Symbian platform.\n\nRequires "
- "Qt 4.7.4 or newer, and the component set installed for "
+ "<b>Qt 4.7.4</b> or newer, and the component set installed for "
"your Qt version."));
parameter.setRequiredFeatures(basicFeatures | Core::Feature(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_SYMBIAN));
list << parameter;
@@ -166,7 +166,7 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
parameter.setDescription(basicDescription + tr("The Qt Quick Components for MeeGo/Harmattan are "
"a set of ready-made components that are designed "
"with specific native appearance for the MeeGo/Harmattan "
- "platform.\n\nRequires Qt 4.7.4 or newer, and the "
+ "platform.\n\nRequires <b>Qt 4.7.4</b> or newer, and the "
"component set installed for your Qt version."));
parameter.setRequiredFeatures(basicFeatures | Core::Feature(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO));
list << parameter;
@@ -177,8 +177,8 @@ void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
"existing QML files. All files and directories that "
"reside in the same directory as the main QML file "
"are deployed. You can modify the contents of the "
- "directory any time before deploying."));
- parameter.setRequiredFeatures(basicFeatures);
+ "directory any time before deploying.\n\nRequires <b>Qt 4.7.0</b> or newer."));
+ parameter.setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK));
list << parameter;
QList<QtQuickAppWizard*> wizardList = Core::createMultipleBaseFileWizardInstances<QtQuickAppWizard>(list, plugin);
--
GitLab