diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp index f82c3203e539834f61e8ac38568daeefe1babf4f..7ba4da6cbc15b71d9cf043f88ebd6810e48b21e2 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.cpp +++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp @@ -54,13 +54,7 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W setWindowTitle(tr("Project setup")); - m_importVersions = TargetSetupPage::recursivelyCheckDirectoryForBuild(project->projectDirectory()); - m_importVersions.append(TargetSetupPage::recursivelyCheckDirectoryForBuild(project->defaultTopLevelBuildDirectory())); - - m_importVersions.append(TargetSetupPage::importInfosForKnownQtVersions(project)); - - if (m_importVersions.count() > 1) - setupTargetPage(); + setupTargetPage(); setOptions(options() | QWizard::NoCancelButton | QWizard::NoBackButtonOnLastPage); } @@ -100,11 +94,18 @@ void ProjectLoadWizard::setupTargetPage() if (m_targetSetupPage) return; + QList<TargetSetupPage::ImportInfo> importVersions = TargetSetupPage::recursivelyCheckDirectoryForBuild(m_project->projectDirectory()); + importVersions.append(TargetSetupPage::recursivelyCheckDirectoryForBuild(m_project->defaultTopLevelBuildDirectory())); + importVersions.append(TargetSetupPage::importInfosForKnownQtVersions(m_project)); + m_targetSetupPage = new TargetSetupPage(this); - m_targetSetupPage->setImportInfos(m_importVersions); + m_targetSetupPage->setImportInfos(importVersions); m_targetSetupPage->setImportDirectoryBrowsingEnabled(true); m_targetSetupPage->setImportDirectoryBrowsingLocation(m_project->projectDirectory()); + if (importVersions.count() <= 1) + return; + const int targetPageId = addPage(m_targetSetupPage); wizardProgress()->item(targetPageId)->setTitle(tr("Targets")); } @@ -114,4 +115,3 @@ void ProjectLoadWizard::applySettings() Q_ASSERT(m_targetSetupPage); m_targetSetupPage->setupProject(m_project); } - diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h index 12376095ca07f26b4c3ae9984f09099ad206e8a8..f6bba107c245e45e88c111f086f2cff6fa1e62b0 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.h +++ b/src/plugins/qt4projectmanager/projectloadwizard.h @@ -57,8 +57,6 @@ private: void applySettings(); Qt4Project *m_project; - QList<TargetSetupPage::ImportInfo> m_importVersions; - TargetSetupPage *m_targetSetupPage; };