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

Move extractSpec and removeSpec to Qt4BuildConfiguration

Browse Source
This commit is contained in:
dt
2009-11-26 16:49:45 +01:00
parent fb1ef427a0
commit 6e01bf6070
6 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include "qt4projectmanager.h"
#include "qmakestep.h"
#include "makestep.h"
#include "qt4buildconfiguration.h"
#include <extensionsystem/pluginmanager.h>
@@ -66,9 +67,9 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
QPair<QtVersion::QmakeBuildConfigs, QStringList> result =
QtVersionManager::scanMakeFile(directory, m_importVersion->defaultBuildConfig());
m_importBuildConfig = result.first;
m_additionalArguments = Qt4Project::removeSpecFromArgumentList(result.second);
m_additionalArguments = Qt4BuildConfiguration::removeSpecFromArgumentList(result.second);
QString parsedSpec = Qt4Project::extractSpecFromArgumentList(result.second, directory, m_importVersion);
QString parsedSpec = Qt4BuildConfiguration::extractSpecFromArgumentList(result.second, directory, m_importVersion);
QString versionSpec = m_importVersion->mkspec();
// Compare mkspecs and add to additional arguments