feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Refactoring: Move QtVersionManager instance() into the ProjectExplorer

Browse Source 
And add a instance() method to it.
This commit is contained in:
dt
2009-04-22 16:51:38 +02:00
parent 8f738dfcc8
commit b6c05a334c
11 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/projectloadwizard.cpp
View File

@@ -34,6 +34,8 @@
#include "qmakestep.h"
#include "makestep.h"
#include <extensionsystem/pluginmanager.h>
#include <QtGui/QCheckBox>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
@@ -48,7 +50,7 @@ using ProjectExplorer::QtVersion;
ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::WindowFlags flags)
: QWizard(parent, flags), m_project(project), m_importVersion(0), m_temporaryVersion(false)
{
ProjectExplorer::QtVersionManager * vm = project->qt4ProjectManager()->versionManager();
ProjectExplorer::QtVersionManager * vm = ProjectExplorer::QtVersionManager::instance();
QString directory = QFileInfo(project->file()->fileName()).absolutePath();
QString importVersion = vm->findQtVersionFromMakefile(directory);
@@ -127,6 +129,7 @@ void ProjectLoadWizard::addBuildConfiguration(QString name, QtVersion *qtversion
void ProjectLoadWizard::done(int result)
{
ProjectExplorer::QtVersionManager *vm = ProjectExplorer::QtVersionManager::instance();
QWizard::done(result);
// This normally happens on showing the final page, but since we
// don't show it anymore, do it here
@@ -135,7 +138,7 @@ void ProjectLoadWizard::done(int result)
if (m_importVersion && importCheckbox->isChecked()) {
// Importing
if (m_temporaryVersion)
m_project->qt4ProjectManager()->versionManager()->addVersion(m_importVersion);
vm->addVersion(m_importVersion);
// Import the existing stuff
// qDebug()<<"Creating m_buildconfiguration entry from imported stuff";
// qDebug()<<((m_importBuildConfig& QtVersion::BuildAll)? "debug_and_release" : "")<<((m_importBuildConfig & QtVersion::DebugBuild)? "debug" : "release");
@@ -158,7 +161,7 @@ void ProjectLoadWizard::done(int result)
delete m_importVersion;
// Create default
bool buildAll = false;
QtVersion *defaultVersion = m_project->qt4ProjectManager()->versionManager()->version(0);
QtVersion *defaultVersion = vm->version(0);
if (defaultVersion && defaultVersion->isValid() && (defaultVersion->defaultBuildConfig() & QtVersion::BuildAll))
buildAll = true;
if (buildAll) {