forked from qt-creator/qt-creator
App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0
Bumping the minimum required Qt version from 4.7.3 to 4.7.4, accordingly. Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
@@ -85,9 +85,9 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
|
||||
{
|
||||
if (currentPage() == m_componentOptionsPage) {
|
||||
setIgnoreGenericOptionsPage(false);
|
||||
if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian10Components) {
|
||||
if (m_componentOptionsPage->componentSet() == QtQuickApp::Symbian11Components) {
|
||||
setIgnoreGenericOptionsPage(true);
|
||||
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 3));
|
||||
targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 4));
|
||||
QSet<QString> requiredFeatures;
|
||||
requiredFeatures << Constants::QTQUICKCOMPONENTS_SYMBIAN_TARGETFEATURE_ID;
|
||||
targetsPage()->setRequiredFeatures(requiredFeatures);
|
||||
@@ -139,7 +139,7 @@ Core::BaseFileWizardParameters QtQuickAppWizard::parameters()
|
||||
"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. "
|
||||
"To utilize the components, Qt 4.7.3 or newer is required."));
|
||||
"To utilize the components, Qt 4.7.4 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));
|
||||
@@ -170,7 +170,7 @@ void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
|
||||
d->app->setMainQml(QtQuickApp::ModeImport, mainQmlFile);
|
||||
}
|
||||
d->app->setComponentSet(wizard->m_componentOptionsPage->componentSet());
|
||||
if (d->app->componentSet() == QtQuickApp::Symbian10Components)
|
||||
if (d->app->componentSet() == QtQuickApp::Symbian11Components)
|
||||
d->app->setOrientation(AbstractMobileApp::ScreenOrientationImplicit);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user