From f996b24612f6fc6a548b14fb2a415bb8739b9cc0 Mon Sep 17 00:00:00 2001 From: Tobias Hunger <tobias.hunger@nokia.com> Date: Fri, 23 Apr 2010 11:50:56 +0200 Subject: [PATCH] Remove the side widget of the ProjectLoadWizard We only have one page there, so there is no need for the side widget. --- src/plugins/qt4projectmanager/projectloadwizard.cpp | 5 ++--- src/plugins/qt4projectmanager/projectloadwizard.h | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp index bf2711c47cb..89dae97b505 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.cpp +++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp @@ -48,7 +48,7 @@ using namespace Qt4ProjectManager; using namespace Qt4ProjectManager::Internal; ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::WindowFlags flags) - : Utils::Wizard(parent, flags), m_project(project), m_targetSetupPage(0) + : QWizard(parent, flags), m_project(project), m_targetSetupPage(0) { Q_ASSERT(project); @@ -107,8 +107,7 @@ void ProjectLoadWizard::setupTargetPage() m_targetSetupPage->setImportDirectoryBrowsingEnabled(true); m_targetSetupPage->setImportDirectoryBrowsingLocation(m_project->projectDirectory()); - const int targetPageId = addPage(m_targetSetupPage); - wizardProgress()->item(targetPageId)->setTitle(tr("Targets")); + addPage(m_targetSetupPage); } void ProjectLoadWizard::applySettings() diff --git a/src/plugins/qt4projectmanager/projectloadwizard.h b/src/plugins/qt4projectmanager/projectloadwizard.h index f6bba107c24..355847672ff 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.h +++ b/src/plugins/qt4projectmanager/projectloadwizard.h @@ -32,7 +32,8 @@ #include "qtversionmanager.h" #include <wizards/targetsetuppage.h> -#include <utils/wizard.h> + +#include <QtGui/QWizard> namespace Qt4ProjectManager { class Qt4Project; @@ -41,7 +42,7 @@ namespace Internal { class TargetsPage; -class ProjectLoadWizard : public Utils::Wizard +class ProjectLoadWizard : public QWizard { Q_OBJECT public: -- GitLab