summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-05-07 18:56:58 +0200
committerKai Koehne <kai.koehne@digia.com>2013-05-15 15:01:03 +0200
commitdc4822d1233aee3802c047c5462c2b94cfdbd782 (patch)
treef0e3a992925fc90173c9680fe2fa29f73b7b4d4a /src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
parent67e91ce3d92ae97ed8d1d2d43bb7950606ddbc2b (diff)
downloadqt-creator-dc4822d1233aee3802c047c5462c2b94cfdbd782.tar.gz
Qt Quick Wizards: Prefer mobile to desktop kits
This also affects the Html5Wizard. Compare to code in BaseQt4ProjectWizardDialog::addTargetSetupPage Note: The selected platform refers to the "filter" combobox in the top right of the new project wizard. Change-Id: I0d7d5162a2693ea0ced03f928fa7c4d67a4ac164 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp')
-rw-r--r--src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index b0c8ef6322..d7ca07f3a1 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -63,7 +63,14 @@ AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent,
{
if (!parameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS))) {
m_targetsPage = new TargetSetupPage;
- m_targetsPage->setPreferredKitMatcher(new QtSupport::QtPlatformKitMatcher(selectedPlatform()));
+ QString platform = selectedPlatform();
+ if (platform.isEmpty()) {
+ m_targetsPage->setPreferredKitMatcher(
+ new QtSupport::QtVersionKitMatcher(
+ Core::FeatureSet( QtSupport::Constants::FEATURE_MOBILE)));
+ } else {
+ m_targetsPage->setPreferredKitMatcher(new QtSupport::QtPlatformKitMatcher(platform));
+ }
m_targetsPage->setRequiredKitMatcher(new QtSupport::QtVersionKitMatcher(requiredFeatures(),
minimumQtVersionNumber,
maximumQtVersionNumber));