feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"

Browse Source 
This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
Kai Koehne
2011-06-24 12:47:38 +02:00
parent e1256f11f4
commit cdda5c775d
6 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
View File

@@ -95,8 +95,6 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
QSet<QString> requiredFeatures;
requiredFeatures << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
targetsPage()->setRequiredFeatures(requiredFeatures);
} else if (m_componentOptionsPage->componentSet() == QtQuickApp::QtQuick11Components) {
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
}
}
return AbstractMobileAppWizardDialog::validateCurrentPage();
@@ -135,7 +133,8 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
"mobile target platforms. For example, you can create signed "
"Symbian Installation System (SIS) packages for this type of "
"projects. Moreover, you can select to use a set of premade "
"UI components in your Qt Quick application."));
"UI components in your Qt Quick application. "
"To utilize the components, Qt 4.7.3 or newer is required."));
parameters.setCategory(QLatin1String(QtSupport::Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(QtSupport::Constants::QML_WIZARD_TR_SCOPE,
QtSupport::Constants::QML_WIZARD_TR_CATEGORY));