aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2012-05-14 18:55:30 +0200
committerJarek Kobus <jaroslaw.kobus@nokia.com>2012-07-03 14:01:17 +0200
commit5c04b408605d27377fc9d3991527b15aee4d8797 (patch)
treee4728491dc350687800813d03704969be7539461 /src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
parente7993e20ec60fa362e07ae07e02531206f0b0a2a (diff)
Don't show the target setup page on adding a subproject
Task-number: QTCREATORBUG-7426 Change-Id: I69232c9cd924a701a5c7b48d124ed2319337ea02 Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp')
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 66b67f1193..e95e52ba24 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -88,8 +88,9 @@ QtQuickAppWizardDialog::QtQuickAppWizardDialog(QWidget *parent,
AbstractMobileAppWizardDialog::addMobilePages();
if (kind == QtQuickAppWizard::ImportQml) {
- m_componentItem->setNextItems(QList<Utils::WizardProgressItem *>()
- << targetsPageItem());
+ if (targetsPageItem())
+ m_componentItem->setNextItems(QList<Utils::WizardProgressItem *>()
+ << targetsPageItem());
}
}
@@ -235,7 +236,8 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWid
void QtQuickAppWizard::projectPathChanged(const QString &path) const
{
- d->wizardDialog->targetsPage()->setProFilePath(path);
+ if (d->wizardDialog->targetsPage())
+ d->wizardDialog->targetsPage()->setProFilePath(path);
}
void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,