diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 76c260b40acbcd1a90ca303c81143eed965e8c9c..f90146b0d7b373432fa750eb0e6e7b48f9b585df 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -29,19 +29,132 @@
#include "cmakebuildconfiguration.h"
#include "cmakeproject.h"
+#include <projectexplorer/projectexplorerconstants.h>
using namespace CMakeProjectManager;
using namespace Internal;
CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeProject *pro)
- : BuildConfiguration(pro)
+ : BuildConfiguration(pro), m_toolChain(0)
{
}
CMakeBuildConfiguration::CMakeBuildConfiguration(BuildConfiguration *source)
- : BuildConfiguration(source)
+ : BuildConfiguration(source), m_toolChain(0)
{
}
+CMakeBuildConfiguration::~CMakeBuildConfiguration()
+{
+ delete m_toolChain;
+}
+
+ProjectExplorer::Environment CMakeBuildConfiguration::baseEnvironment() const
+{
+ ProjectExplorer::Environment env = useSystemEnvironment() ?
+ ProjectExplorer::Environment(QProcess::systemEnvironment()) :
+ ProjectExplorer::Environment();
+ return env;
+}
+
+ProjectExplorer::Environment CMakeBuildConfiguration::environment() const
+{
+ ProjectExplorer::Environment env = baseEnvironment();
+ env.modify(userEnvironmentChanges());
+ return env;
+}
+
+void CMakeBuildConfiguration::setUseSystemEnvironment(bool b)
+{
+ if (b == useSystemEnvironment())
+ return;
+ setValue("clearSystemEnvironment", !b);
+ emit environmentChanged();
+}
+
+bool CMakeBuildConfiguration::useSystemEnvironment() const
+{
+ bool b = !(value("clearSystemEnvironment").isValid() &&
+ value("clearSystemEnvironment").toBool());
+ return b;
+}
+
+QList<ProjectExplorer::EnvironmentItem> CMakeBuildConfiguration::userEnvironmentChanges() const
+{
+ return ProjectExplorer::EnvironmentItem::fromStringList(value("userEnvironmentChanges").toStringList());
+}
+
+void CMakeBuildConfiguration::setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff)
+{
+ QStringList list = ProjectExplorer::EnvironmentItem::toStringList(diff);
+ if (list == value("userEnvironmentChanges"))
+ return;
+ setValue("userEnvironmentChanges", list);
+ emit environmentChanged();
+}
+
+QString CMakeBuildConfiguration::buildDirectory() const
+{
+ QString buildDirectory = value("buildDirectory").toString();
+ if (buildDirectory.isEmpty())
+ buildDirectory = static_cast<CMakeProject *>(project())->sourceDirectory() + "/qtcreator-build";
+ return buildDirectory;
+}
+
+QString CMakeBuildConfiguration::buildParser() const
+{
+ // TODO this is actually slightly wrong, but do i care?
+ // this should call toolchain(configuration)
+ if (!m_toolChain)
+ return QString::null;
+ if (m_toolChain->type() == ProjectExplorer::ToolChain::GCC
+ //|| m_toolChain->type() == ProjectExplorer::ToolChain::LinuxICC
+ || m_toolChain->type() == ProjectExplorer::ToolChain::MinGW) {
+ return ProjectExplorer::Constants::BUILD_PARSER_GCC;
+ } else if (m_toolChain->type() == ProjectExplorer::ToolChain::MSVC
+ || m_toolChain->type() == ProjectExplorer::ToolChain::WINCE) {
+ return ProjectExplorer::Constants::BUILD_PARSER_MSVC;
+ }
+ return QString::null;
+}
+
+ProjectExplorer::ToolChain::ToolChainType CMakeBuildConfiguration::toolChainType() const
+{
+ if (m_toolChain)
+ return m_toolChain->type();
+ return ProjectExplorer::ToolChain::UNKNOWN;
+}
+
+ProjectExplorer::ToolChain *CMakeBuildConfiguration::toolChain() const
+{
+ return m_toolChain;
+}
+
+void CMakeBuildConfiguration::updateToolChain(const QString &compiler)
+{
+ //qDebug()<<"CodeBlocks Compilername"<<compiler
+ ProjectExplorer::ToolChain *newToolChain = 0;
+ if (compiler == "gcc") {
+#ifdef Q_OS_WIN
+ newToolChain = ProjectExplorer::ToolChain::createMinGWToolChain("gcc", QString());
+#else
+ newToolChain = ProjectExplorer::ToolChain::createGccToolChain("gcc");
+#endif
+ } else if (compiler == "msvc8") {
+ newToolChain = ProjectExplorer::ToolChain::createMSVCToolChain(value("msvcVersion").toString(), false);
+ } else {
+ }
+
+ if (ProjectExplorer::ToolChain::equals(newToolChain, m_toolChain)) {
+ delete newToolChain;
+ newToolChain = 0;
+ } else {
+ delete m_toolChain;
+ m_toolChain = newToolChain;
+ }
+}
+
+
+
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 785dff704cca2653a482a3b34ce96a1ddfa9e052..b662b81a9453629004c5966c0e7acf761ce973b1 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -31,6 +31,7 @@
#define CMAKEBUILDCONFIGURATION_H
#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/toolchain.h>
namespace CMakeProjectManager {
namespace Internal {
@@ -43,6 +44,24 @@ class CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration
public:
CMakeBuildConfiguration(CMakeProject *pro);
CMakeBuildConfiguration(BuildConfiguration *source);
+ ~CMakeBuildConfiguration();
+
+ ProjectExplorer::Environment environment() const;
+ ProjectExplorer::Environment baseEnvironment() const;
+ void setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff);
+ QList<ProjectExplorer::EnvironmentItem> userEnvironmentChanges() const;
+ bool useSystemEnvironment() const;
+ void setUseSystemEnvironment(bool b);
+
+ virtual QString buildDirectory() const;
+ QString buildParser() const;
+
+ ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
+ ProjectExplorer::ToolChain *toolChain() const;
+
+ void updateToolChain(const QString &compiler);
+private:
+ ProjectExplorer::ToolChain *m_toolChain;
};
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp
index 5aa29db27324988a533d0be7ad7e6a1db0662d4a..887c0d40b29b7a6c4c167ffade09d8650046585f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.cpp
@@ -29,6 +29,7 @@
#include "cmakebuildenvironmentwidget.h"
#include "cmakeproject.h"
+#include "cmakebuildconfiguration.h"
#include <projectexplorer/environmenteditmodel.h>
#include <QtGui/QVBoxLayout>
#include <QtGui/QCheckBox>
@@ -68,21 +69,21 @@ void CMakeBuildEnvironmentWidget::init(ProjectExplorer::BuildConfiguration *bc)
if (debug)
qDebug() << "Qt4BuildConfigWidget::init()";
- m_buildConfiguration = bc;
+ m_buildConfiguration = static_cast<CMakeBuildConfiguration *>(bc);
- m_clearSystemEnvironmentCheckBox->setChecked(!m_pro->useSystemEnvironment(m_buildConfiguration));
- m_buildEnvironmentWidget->setBaseEnvironment(m_pro->baseEnvironment(m_buildConfiguration));
- m_buildEnvironmentWidget->setUserChanges(m_pro->userEnvironmentChanges(m_buildConfiguration));
+ m_clearSystemEnvironmentCheckBox->setChecked(!m_buildConfiguration->useSystemEnvironment());
+ m_buildEnvironmentWidget->setBaseEnvironment(m_buildConfiguration->baseEnvironment());
+ m_buildEnvironmentWidget->setUserChanges(m_buildConfiguration->userEnvironmentChanges());
m_buildEnvironmentWidget->updateButtons();
}
void CMakeBuildEnvironmentWidget::environmentModelUserChangesUpdated()
{
- m_pro->setUserEnvironmentChanges(m_buildConfiguration, m_buildEnvironmentWidget->userChanges());
+ m_buildConfiguration->setUserEnvironmentChanges(m_buildEnvironmentWidget->userChanges());
}
void CMakeBuildEnvironmentWidget::clearSystemEnvironmentCheckBoxClicked(bool checked)
{
- m_pro->setUseSystemEnvironment(m_buildConfiguration, !checked);
- m_buildEnvironmentWidget->setBaseEnvironment(m_pro->baseEnvironment(m_buildConfiguration));
+ m_buildConfiguration->setUseSystemEnvironment(!checked);
+ m_buildEnvironmentWidget->setBaseEnvironment(m_buildConfiguration->baseEnvironment());
}
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.h b/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.h
index c732044b9d479ecacb0583882f15c4de886034f2..ee910b261d07aee122095d551c6264ec4455d37f 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildenvironmentwidget.h
@@ -42,6 +42,7 @@ class EnvironmentWidget;
namespace CMakeProjectManager {
namespace Internal {
class CMakeProject;
+class CMakeBuildConfiguration;
class CMakeBuildEnvironmentWidget : public ProjectExplorer::BuildConfigWidget
{
@@ -61,7 +62,7 @@ private:
ProjectExplorer::EnvironmentWidget *m_buildEnvironmentWidget;
QCheckBox *m_clearSystemEnvironmentCheckBox;
CMakeProject *m_pro;
- ProjectExplorer::BuildConfiguration *m_buildConfiguration;
+ CMakeBuildConfiguration *m_buildConfiguration;
};
} // namespace Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 08ea3b45e996921f53508c9e5a778f693718db3e..a40c0625624260ba86a92c5ae348c938c4dc4289 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -116,8 +116,8 @@ BuildConfiguration *CMakeBuildConfigurationFactory::create(const QString &type)
CMakeOpenProjectWizard copw(m_project->projectManager(),
m_project->sourceDirectory(),
- m_project->buildDirectory(bc),
- m_project->environment(bc));
+ bc->buildDirectory(),
+ bc->environment());
if (copw.exec() != QDialog::Accepted) {
delete bc;
return false;
@@ -156,7 +156,6 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
m_fileName(fileName),
m_buildConfigurationFactory(new CMakeBuildConfigurationFactory(this)),
m_rootNode(new CMakeProjectNode(m_fileName)),
- m_toolChain(0),
m_insideFileChanged(false)
{
m_file = new CMakeFile(this, fileName);
@@ -165,7 +164,6 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
CMakeProject::~CMakeProject()
{
delete m_rootNode;
- delete m_toolChain;
}
IBuildConfigurationFactory *CMakeProject::buildConfigurationFactory() const
@@ -179,7 +177,7 @@ void CMakeProject::slotActiveBuildConfiguration()
// Pop up a dialog asking the user to rerun cmake
QFileInfo sourceFileInfo(m_fileName);
- QString cbpFile = CMakeManager::findCbpFile(QDir(buildDirectory(activeBC)));
+ QString cbpFile = CMakeManager::findCbpFile(QDir(activeBC->buildDirectory()));
QFileInfo cbpFileFi(cbpFile);
CMakeOpenProjectWizard::Mode mode = CMakeOpenProjectWizard::Nothing;
if (!cbpFileFi.exists()) {
@@ -196,9 +194,9 @@ void CMakeProject::slotActiveBuildConfiguration()
if (mode != CMakeOpenProjectWizard::Nothing) {
CMakeOpenProjectWizard copw(m_manager,
sourceFileInfo.absolutePath(),
- buildDirectory(activeBC),
+ activeBC->buildDirectory(),
mode,
- environment(activeBC));
+ activeBC->environment());
copw.exec();
activeBC->setValue("msvcVersion", copw.msvcVersion());
}
@@ -216,39 +214,6 @@ void CMakeProject::fileChanged(const QString &fileName)
m_insideFileChanged = false;
}
-void CMakeProject::updateToolChain(const QString &compiler)
-{
- //qDebug()<<"CodeBlocks Compilername"<<compiler
- ProjectExplorer::ToolChain *newToolChain = 0;
- if (compiler == "gcc") {
-#ifdef Q_OS_WIN
- newToolChain = ProjectExplorer::ToolChain::createMinGWToolChain("gcc", QString());
-#else
- newToolChain = ProjectExplorer::ToolChain::createGccToolChain("gcc");
-#endif
- } else if (compiler == "msvc8") {
- newToolChain = ProjectExplorer::ToolChain::createMSVCToolChain(activeBuildConfiguration()->value("msvcVersion").toString(), false);
- } else {
- // TODO other toolchains
- qDebug()<<"Not implemented yet!!! Qt Creator doesn't know which toolchain to use for"<<compiler;
- }
-
- if (ProjectExplorer::ToolChain::equals(newToolChain, m_toolChain)) {
- delete newToolChain;
- newToolChain = 0;
- } else {
- delete m_toolChain;
- m_toolChain = newToolChain;
- }
-}
-
-ProjectExplorer::ToolChain *CMakeProject::toolChain(BuildConfiguration *configuration) const
-{
- if (configuration != activeBuildConfiguration())
- qWarning()<<"CMakeProject asked for toolchain of a not active buildconfiguration";
- return m_toolChain;
-}
-
void CMakeProject::changeBuildDirectory(BuildConfiguration *configuration, const QString &newBuildDirectory)
{
configuration->setValue("buildDirectory", newBuildDirectory);
@@ -263,7 +228,8 @@ QString CMakeProject::sourceDirectory() const
bool CMakeProject::parseCMakeLists()
{
// Find cbp file
- QString cbpFile = CMakeManager::findCbpFile(buildDirectory(activeBuildConfiguration()));
+ CMakeBuildConfiguration *activeCmakeBuildConfiguration = static_cast<CMakeBuildConfiguration *>(activeBuildConfiguration());
+ QString cbpFile = CMakeManager::findCbpFile(activeCmakeBuildConfiguration->buildDirectory());
// setFolderName
m_rootNode->setFolderName(QFileInfo(cbpFile).completeBaseName());
@@ -272,7 +238,7 @@ bool CMakeProject::parseCMakeLists()
//qDebug()<<"Parsing file "<<cbpFile;
if (cbpparser.parseCbpFile(cbpFile)) {
// ToolChain
- updateToolChain(cbpparser.compilerName());
+ activeCmakeBuildConfiguration->updateToolChain(cbpparser.compilerName());
m_projectName = cbpparser.projectName();
m_rootNode->setFolderName(cbpparser.projectName());
@@ -325,7 +291,7 @@ bool CMakeProject::parseCMakeLists()
QStringList allIncludePaths;
QStringList allFrameworkPaths;
- QList<ProjectExplorer::HeaderPath> allHeaderPaths = m_toolChain->systemHeaderPaths();
+ QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeCmakeBuildConfiguration->toolChain()->systemHeaderPaths();
foreach (ProjectExplorer::HeaderPath headerPath, allHeaderPaths) {
if (headerPath.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath)
allFrameworkPaths.append(headerPath.path());
@@ -341,12 +307,12 @@ bool CMakeProject::parseCMakeLists()
CppTools::CppModelManagerInterface::ProjectInfo pinfo = modelmanager->projectInfo(this);
if (pinfo.includePaths != allIncludePaths
|| pinfo.sourceFiles != m_files
- || pinfo.defines != m_toolChain->predefinedMacros()
+ || pinfo.defines != activeCmakeBuildConfiguration->toolChain()->predefinedMacros()
|| pinfo.frameworkPaths != allFrameworkPaths) {
pinfo.includePaths = allIncludePaths;
// TODO we only want C++ files, not all other stuff that might be in the project
pinfo.sourceFiles = m_files;
- pinfo.defines = m_toolChain->predefinedMacros(); // TODO this is to simplistic
+ pinfo.defines = activeCmakeBuildConfiguration->toolChain()->predefinedMacros(); // TODO this is to simplistic
pinfo.frameworkPaths = allFrameworkPaths;
modelmanager->updateProjectInfo(pinfo);
modelmanager->updateSourceFiles(pinfo.sourceFiles);
@@ -404,31 +370,12 @@ bool CMakeProject::parseCMakeLists()
} else {
// TODO report error
qDebug()<<"Parsing failed";
- delete m_toolChain;
- m_toolChain = 0;
+ activeCmakeBuildConfiguration->updateToolChain(QString::null);
return false;
}
return true;
}
-QString CMakeProject::buildParser(BuildConfiguration *configuration) const
-{
- Q_UNUSED(configuration)
- // TODO this is actually slightly wrong, but do i care?
- // this should call toolchain(configuration)
- if (!m_toolChain)
- return QString::null;
- if (m_toolChain->type() == ProjectExplorer::ToolChain::GCC
- //|| m_toolChain->type() == ProjectExplorer::ToolChain::LinuxICC
- || m_toolChain->type() == ProjectExplorer::ToolChain::MinGW) {
- return ProjectExplorer::Constants::BUILD_PARSER_GCC;
- } else if (m_toolChain->type() == ProjectExplorer::ToolChain::MSVC
- || m_toolChain->type() == ProjectExplorer::ToolChain::WINCE) {
- return ProjectExplorer::Constants::BUILD_PARSER_MSVC;
- }
- return QString::null;
-}
-
QStringList CMakeProject::targets() const
{
QStringList results;
@@ -551,8 +498,6 @@ QString CMakeProject::name() const
return m_projectName;
}
-
-
Core::IFile *CMakeProject::file() const
{
return m_file;
@@ -573,56 +518,6 @@ bool CMakeProject::isApplication() const
return true;
}
-ProjectExplorer::Environment CMakeProject::baseEnvironment(BuildConfiguration *configuration) const
-{
- Environment env = useSystemEnvironment(configuration) ? Environment(QProcess::systemEnvironment()) : Environment();
- return env;
-}
-
-ProjectExplorer::Environment CMakeProject::environment(BuildConfiguration *configuration) const
-{
- Environment env = baseEnvironment(configuration);
- env.modify(userEnvironmentChanges(configuration));
- return env;
-}
-
-void CMakeProject::setUseSystemEnvironment(BuildConfiguration *configuration, bool b)
-{
- if (b == useSystemEnvironment(configuration))
- return;
- configuration->setValue("clearSystemEnvironment", !b);
- emit environmentChanged(configuration);
-}
-
-bool CMakeProject::useSystemEnvironment(BuildConfiguration *configuration) const
-{
- bool b = !(configuration->value("clearSystemEnvironment").isValid() &&
- configuration->value("clearSystemEnvironment").toBool());
- return b;
-}
-
-QList<ProjectExplorer::EnvironmentItem> CMakeProject::userEnvironmentChanges(BuildConfiguration *configuration) const
-{
- return EnvironmentItem::fromStringList(configuration->value("userEnvironmentChanges").toStringList());
-}
-
-void CMakeProject::setUserEnvironmentChanges(BuildConfiguration *configuration, const QList<ProjectExplorer::EnvironmentItem> &diff)
-{
- QStringList list = EnvironmentItem::toStringList(diff);
- if (list == configuration->value("userEnvironmentChanges"))
- return;
- configuration->setValue("userEnvironmentChanges", list);
- emit environmentChanged(configuration);
-}
-
-QString CMakeProject::buildDirectory(BuildConfiguration *configuration) const
-{
- QString buildDirectory = configuration->value("buildDirectory").toString();
- if (buildDirectory.isEmpty())
- buildDirectory = sourceDirectory() + "/qtcreator-build";
- return buildDirectory;
-}
-
ProjectExplorer::BuildConfigWidget *CMakeProject::createConfigWidget()
{
return new CMakeBuildSettingsWidget(this);
@@ -686,7 +581,7 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
// or simply run createXml with the saved settings
QFileInfo sourceFileInfo(m_fileName);
BuildConfiguration *activeBC = activeBuildConfiguration();
- QString cbpFile = CMakeManager::findCbpFile(QDir(buildDirectory(activeBC)));
+ QString cbpFile = CMakeManager::findCbpFile(QDir(activeBC->buildDirectory()));
QFileInfo cbpFileFi(cbpFile);
CMakeOpenProjectWizard::Mode mode = CMakeOpenProjectWizard::Nothing;
@@ -698,9 +593,9 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
if (mode != CMakeOpenProjectWizard::Nothing) {
CMakeOpenProjectWizard copw(m_manager,
sourceFileInfo.absolutePath(),
- buildDirectory(activeBC),
+ activeBC->buildDirectory(),
mode,
- environment(activeBC));
+ activeBC->environment());
if (copw.exec() != QDialog::Accepted)
return false;
activeBC->setValue("msvcVersion", copw.msvcVersion());
@@ -729,13 +624,6 @@ CMakeTarget CMakeProject::targetForTitle(const QString &title)
return CMakeTarget();
}
-ProjectExplorer::ToolChain::ToolChainType CMakeProject::toolChainType() const
-{
- if (m_toolChain)
- return m_toolChain->type();
- return ProjectExplorer::ToolChain::UNKNOWN;
-}
-
// CMakeFile
CMakeFile::CMakeFile(CMakeProject *parent, QString fileName)
@@ -825,9 +713,9 @@ QString CMakeBuildSettingsWidget::displayName() const
void CMakeBuildSettingsWidget::init(BuildConfiguration *bc)
{
- m_buildConfiguration = bc;
- m_pathLineEdit->setText(m_project->buildDirectory(bc));
- if (m_project->buildDirectory(bc) == m_project->sourceDirectory())
+ m_buildConfiguration = static_cast<CMakeBuildConfiguration *>(bc);
+ m_pathLineEdit->setText(m_buildConfiguration->buildDirectory());
+ if (m_buildConfiguration->buildDirectory() == m_project->sourceDirectory())
m_changeButton->setEnabled(false);
else
m_changeButton->setEnabled(true);
@@ -837,11 +725,11 @@ void CMakeBuildSettingsWidget::openChangeBuildDirectoryDialog()
{
CMakeOpenProjectWizard copw(m_project->projectManager(),
m_project->sourceDirectory(),
- m_project->buildDirectory(m_buildConfiguration),
- m_project->environment(m_buildConfiguration));
+ m_buildConfiguration->buildDirectory(),
+ m_buildConfiguration->environment());
if (copw.exec() == QDialog::Accepted) {
m_project->changeBuildDirectory(m_buildConfiguration, copw.buildDirectory());
- m_pathLineEdit->setText(m_project->buildDirectory(m_buildConfiguration));
+ m_pathLineEdit->setText(m_buildConfiguration->buildDirectory());
}
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index f9e694dc6af8a4fd0d0b38a5e5b9bde3804d17b0..ffe0c25e7b735daa15345696e5704f211b67dcad 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -32,6 +32,7 @@
#include "cmakeprojectmanager.h"
#include "cmakeprojectnodes.h"
+#include "cmakebuildconfiguration.h"
#include "makestep.h"
#include <projectexplorer/project.h>
@@ -99,16 +100,6 @@ public:
virtual bool isApplication() const;
- //building environment
- ProjectExplorer::Environment environment(ProjectExplorer::BuildConfiguration *configuration) const;
- ProjectExplorer::Environment baseEnvironment(ProjectExplorer::BuildConfiguration *configuration) const;
- void setUserEnvironmentChanges(ProjectExplorer::BuildConfiguration *configuration, const QList<ProjectExplorer::EnvironmentItem> &diff);
- QList<ProjectExplorer::EnvironmentItem> userEnvironmentChanges(ProjectExplorer::BuildConfiguration *configuration) const;
- bool useSystemEnvironment(ProjectExplorer::BuildConfiguration *configuration) const;
- void setUseSystemEnvironment(ProjectExplorer::BuildConfiguration *configuration, bool b);
-
- virtual QString buildDirectory(ProjectExplorer::BuildConfiguration *configuration) const;
-
virtual ProjectExplorer::BuildConfigWidget *createConfigWidget();
virtual QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
@@ -116,12 +107,10 @@ public:
virtual QStringList files(FilesMode fileMode) const;
QStringList targets() const;
- QString buildParser(ProjectExplorer::BuildConfiguration *configuration) const;
+
CMakeTarget targetForTitle(const QString &title);
QString sourceDirectory() const;
- ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
- ProjectExplorer::ToolChain *toolChain(ProjectExplorer::BuildConfiguration *configuration) const;
protected:
virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);
@@ -136,7 +125,6 @@ private slots:
private:
bool parseCMakeLists();
- void updateToolChain(const QString &compiler);
void buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::FileNode *> list);
void gatherFileNodes(ProjectExplorer::FolderNode *parent, QList<ProjectExplorer::FileNode *> &list);
@@ -152,7 +140,6 @@ private:
CMakeProjectNode *m_rootNode;
QStringList m_files;
QList<CMakeTarget> m_targets;
- ProjectExplorer::ToolChain *m_toolChain;
ProjectExplorer::FileWatcher *m_watcher;
bool m_insideFileChanged;
QSet<QString> m_watchedFiles;
@@ -239,7 +226,7 @@ private:
CMakeProject *m_project;
QLineEdit *m_pathLineEdit;
QPushButton *m_changeButton;
- ProjectExplorer::BuildConfiguration *m_buildConfiguration;
+ CMakeBuildConfiguration *m_buildConfiguration;
};
} // namespace Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index fc4c5868adefdaf9e29a84722cd9be59e01d66d1..89f97ee555e2e0ad5af02d609419e6535e23cdff 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -30,6 +30,7 @@
#include "cmakerunconfiguration.h"
#include "cmakeproject.h"
+#include "cmakebuildconfiguration.h"
#include "cmakeprojectconstants.h"
#include <projectexplorer/environment.h>
@@ -58,6 +59,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(CMakeProject *pro, const QString &t
connect(pro, SIGNAL(activeBuildConfigurationChanged()),
this, SIGNAL(baseEnvironmentChanged()));
+ // TODO
connect(pro, SIGNAL(environmentChanged(ProjectExplorer::BuildConfiguration *)),
this, SIGNAL(baseEnvironmentChanged()));
}
@@ -186,7 +188,7 @@ ProjectExplorer::Environment CMakeRunConfiguration::baseEnvironment() const
} else if (m_baseEnvironmentBase == CMakeRunConfiguration::SystemEnvironmentBase) {
env = ProjectExplorer::Environment::systemEnvironment();
} else if (m_baseEnvironmentBase == CMakeRunConfiguration::BuildEnvironmentBase) {
- env = project()->environment(project()->activeBuildConfiguration());
+ env = environment();
}
return env;
}
@@ -226,8 +228,8 @@ void CMakeRunConfiguration::setUserEnvironmentChanges(const QList<ProjectExplore
ProjectExplorer::ToolChain::ToolChainType CMakeRunConfiguration::toolChainType() const
{
- CMakeProject *pro = static_cast<CMakeProject *>(project());
- return pro->toolChainType();
+ CMakeBuildConfiguration *bc = static_cast<CMakeBuildConfiguration *>(project()->activeBuildConfiguration());
+ return bc->toolChainType();
}
// Configuration widget
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 7e49f180c2d0ed30a8c57dfddec01f39e8ca8e89..4fe313e6a58cf54e74cbdd095f9b665183a8a51c 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -29,6 +29,7 @@
#include "makestep.h"
#include "cmakeprojectconstants.h"
#include "cmakeproject.h"
+#include "cmakebuildconfiguration.h"
#include <projectexplorer/projectexplorer.h>
@@ -95,20 +96,20 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
bool MakeStep::init()
{
- BuildConfiguration *bc = buildConfiguration();
+ CMakeBuildConfiguration *bc = static_cast<CMakeBuildConfiguration *>(buildConfiguration());
// TODO, we should probably have a member cmakeBuildConfiguration();
- CMakeProject *pro = static_cast<CMakeProject *>(buildConfiguration()->project());
- setBuildParser(pro->buildParser(bc));
+
+ setBuildParser(bc->buildParser());
setEnabled(true);
- setWorkingDirectory(pro->buildDirectory(bc));
+ setWorkingDirectory(bc->buildDirectory());
- setCommand(pro->toolChain(bc)->makeCommand());
+ setCommand(bc->toolChain()->makeCommand());
QStringList arguments = m_buildTargets;
arguments << additionalArguments();
setArguments(arguments);
- setEnvironment(pro->environment(bc));
+ setEnvironment(bc->environment());
setIgnoreReturnValue(m_clean);
return AbstractMakeStep::init();
@@ -253,9 +254,8 @@ void MakeStepConfigWidget::updateDetails()
QStringList arguments = m_makeStep->m_buildTargets;
arguments << m_makeStep->additionalArguments();
- BuildConfiguration *bc = m_makeStep->buildConfiguration();
- CMakeProject *pro = static_cast<CMakeProject *>(bc->project());
- m_summaryText = tr("<b>Make:</b> %1 %2").arg(pro->toolChain(bc)->makeCommand(), arguments.join(" "));
+ CMakeBuildConfiguration *bc = static_cast<CMakeBuildConfiguration *>(m_makeStep->buildConfiguration());
+ m_summaryText = tr("<b>Make:</b> %1 %2").arg(bc->toolChain()->makeCommand(), arguments.join(" "));
emit updateSummary();
}
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 077f03dfc6fe6924cc5c3818621381b2efc5ab18..d0713e8c355fe85ad060287e9701fe79c24c1454 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -35,6 +35,7 @@
#include <projectexplorer/environment.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/buildconfiguration.h>
#include <utils/qtcassert.h>
#include <coreplugin/icore.h>
@@ -131,7 +132,7 @@ DebuggerRunControl::DebuggerRunControl(DebuggerManager *manager,
}
if (const ProjectExplorer::Project *project = runConfiguration->project()) {
m_startParameters->buildDir =
- project->buildDirectory(project->activeBuildConfiguration());
+ project->activeBuildConfiguration()->buildDirectory();
}
m_startParameters->useTerminal =
runConfiguration->runMode() == LocalApplicationRunConfiguration::Console;
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 7a64c538536f13d690ee6cd53c52a910f0acb91e..5e6e1553ea6f0d1184c9c6b018dcc84677ceca70 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -45,3 +45,22 @@ GenericBuildConfiguration::GenericBuildConfiguration(GenericBuildConfiguration *
{
}
+
+ProjectExplorer::Environment GenericBuildConfiguration::environment() const
+{
+ return ProjectExplorer::Environment::systemEnvironment();
+}
+
+QString GenericBuildConfiguration::buildDirectory() const
+{
+ QString buildDirectory = value("buildDirectory").toString();
+
+ if (buildDirectory.isEmpty()) {
+ QFileInfo fileInfo(project()->file()->fileName());
+
+ buildDirectory = fileInfo.absolutePath();
+ }
+
+ return buildDirectory;
+}
+
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index 132cd17b5874ccecfd4685f211b66c066b93445c..82ad2746a597bff6b69fe9b6ea514b2d5d016bfe 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
@@ -44,6 +44,9 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration
public:
GenericBuildConfiguration(GenericProject *pro);
GenericBuildConfiguration(GenericBuildConfiguration *source);
+
+ virtual ProjectExplorer::Environment environment() const;
+ virtual QString buildDirectory() const;
};
} // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index eb1debd8f471fc24a0e96f3f3e0863d9b539c374..54dd056d867fa04c2ff0ede49c8ecd30d78b379f 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -31,6 +31,7 @@
#include "genericprojectconstants.h"
#include "genericproject.h"
#include "ui_genericmakestep.h"
+#include "genericbuildconfiguration.h"
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/toolchain.h>
@@ -66,22 +67,21 @@ GenericMakeStep::~GenericMakeStep()
bool GenericMakeStep::init()
{
- ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
+ GenericBuildConfiguration *bc = static_cast<GenericBuildConfiguration *>(buildConfiguration());
//TODO
- GenericProject *pro = static_cast<GenericProject *>(buildConfiguration()->project());
- const QString buildParser = pro->buildParser(bc);
+ const QString buildParser = static_cast<GenericProject *>(bc->project())->buildParser(bc);
setBuildParser(buildParser);
setEnabled(true);
Core::VariableManager *vm = Core::VariableManager::instance();
- const QString rawBuildDir = buildConfiguration()->project()->buildDirectory(bc);
+ const QString rawBuildDir = bc->buildDirectory();
const QString buildDir = vm->resolve(rawBuildDir);
setWorkingDirectory(buildDir);
setCommand(makeCommand());
setArguments(replacedArguments());
- setEnvironment(buildConfiguration()->project()->environment(bc));
+ setEnvironment(bc->environment());
return AbstractMakeStep::init();
}
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index fcbc50e7667c42af69e1c5d09e2665ce7be658a3..461915b0c68067b2e3a701cfb7664138baea49f9 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -481,25 +481,6 @@ bool GenericProject::isApplication() const
return true;
}
-ProjectExplorer::Environment GenericProject::environment(BuildConfiguration *configuration) const
-{
- Q_UNUSED(configuration)
- return ProjectExplorer::Environment::systemEnvironment();
-}
-
-QString GenericProject::buildDirectory(BuildConfiguration *configuration) const
-{
- QString buildDirectory = configuration->value("buildDirectory").toString();
-
- if (buildDirectory.isEmpty()) {
- QFileInfo fileInfo(m_fileName);
-
- buildDirectory = fileInfo.absolutePath();
- }
-
- return buildDirectory;
-}
-
ProjectExplorer::BuildConfigWidget *GenericProject::createConfigWidget()
{
return new GenericBuildSettingsWidget(this);
@@ -629,8 +610,8 @@ QString GenericBuildSettingsWidget::displayName() const
void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
{
- m_buildConfiguration = bc;
- m_pathChooser->setPath(m_project->buildDirectory(bc));
+ m_buildConfiguration = static_cast<GenericBuildConfiguration *>(bc);
+ m_pathChooser->setPath(m_buildConfiguration->buildDirectory());
}
void GenericBuildSettingsWidget::buildDirectoryChanged()
diff --git a/src/plugins/genericprojectmanager/genericproject.h b/src/plugins/genericprojectmanager/genericproject.h
index cba88fc4abead964bee7cf63ea34564ec7e89290..eb828b683c672e744725008469d1820a64334ea4 100644
--- a/src/plugins/genericprojectmanager/genericproject.h
+++ b/src/plugins/genericprojectmanager/genericproject.h
@@ -54,6 +54,7 @@ namespace Internal {
class GenericProject;
class GenericMakeStep;
class GenericProjectFile;
+class GenericBuildConfiguration;
class GenericBuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
{
@@ -95,9 +96,6 @@ public:
virtual bool isApplication() const;
- virtual ProjectExplorer::Environment environment(ProjectExplorer::BuildConfiguration *configuration) const;
- virtual QString buildDirectory(ProjectExplorer::BuildConfiguration *configuration) const;
-
virtual ProjectExplorer::BuildConfigWidget *createConfigWidget();
virtual QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
@@ -204,7 +202,7 @@ private Q_SLOTS:
private:
GenericProject *m_project;
Utils::PathChooser *m_pathChooser;
- ProjectExplorer::BuildConfiguration *m_buildConfiguration;
+ GenericBuildConfiguration *m_buildConfiguration;
};
} // namespace Internal
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index fe3b32f05bc09755f230cb6bd3ab522cd391a794..ed279970d50a2746b292e7c34af4312fa2216ace 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -167,6 +167,7 @@ Project *BuildConfiguration::project() const
return m_project;
}
+
///
// IBuildConfigurationFactory
///
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 40cb5a4a787e98069038f3fde69c3f68167b0ad6..477087cdb57db276daef2b3046277cc5fb4e0c2d 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -31,6 +31,7 @@
#define BUILDCONFIGURATION_H
#include "projectexplorer_export.h"
+#include "environment.h"
#include <QtCore/QHash>
#include <QtCore/QString>
@@ -75,6 +76,13 @@ public:
Project *project() const;
+ virtual Environment environment() const = 0;
+ virtual QString buildDirectory() const = 0;
+
+signals:
+ void environmentChanged();
+ void buildDirectoryChanged();
+
protected:
BuildConfiguration(Project * project);
BuildConfiguration(BuildConfiguration *source);
@@ -111,8 +119,8 @@ public:
virtual BuildConfiguration *restore() const = 0;
- // TODO All those methods make the internal name (and display name) unique,
- // but in different ways
+ // TODO display name unique, in different ways
+
signals:
void availableCreationTypesChanged();
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index dc9caecf6993058f310fb67251f03ca75700e720..dd8abc9c64e693e94630d20c8439830954866b11 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -35,6 +35,7 @@
#include <coreplugin/icore.h>
#include <projectexplorer/debugginghelper.h>
+#include <projectexplorer/buildconfiguration.h>
#include <utils/detailswidget.h>
#include <utils/pathchooser.h>
@@ -279,7 +280,7 @@ QString CustomExecutableRunConfiguration::executable() const
{
QString exec;
if (QDir::isRelativePath(m_executable)) {
- Environment env = project()->environment(project()->activeBuildConfiguration());
+ Environment env = project()->activeBuildConfiguration()->environment();
exec = env.searchInPath(m_executable);
} else {
exec = m_executable;
@@ -328,7 +329,7 @@ QString CustomExecutableRunConfiguration::baseWorkingDirectory() const
QString CustomExecutableRunConfiguration::workingDirectory() const
{
QString wd = m_workingDirectory;
- QString bd = project()->buildDirectory(project()->activeBuildConfiguration());
+ QString bd = project()->activeBuildConfiguration()->buildDirectory();
return wd.replace("$BUILDDIR", QDir::cleanPath(bd));
}
@@ -345,7 +346,7 @@ ProjectExplorer::Environment CustomExecutableRunConfiguration::baseEnvironment()
} else if (m_baseEnvironmentBase == CustomExecutableRunConfiguration::SystemEnvironmentBase) {
env = ProjectExplorer::Environment::systemEnvironment();
} else if (m_baseEnvironmentBase == CustomExecutableRunConfiguration::BuildEnvironmentBase) {
- env = project()->environment(project()->activeBuildConfiguration());
+ env = project()->activeBuildConfiguration()->environment();
}
return env;
}
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 0add381c24d741315f5c8169ef800c87abe34e06..e442fc14d6cc8ac0e669a114a3ca559035b29beb 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -65,12 +65,12 @@ ProcessStep::ProcessStep(ProcessStep *bs, BuildConfiguration *bc)
bool ProcessStep::init()
{
- setEnvironment(buildConfiguration()->project()->environment(buildConfiguration()));
+ setEnvironment(buildConfiguration()->environment());
QString wd = workingDirectory();
if (wd.isEmpty())
wd = "$BUILDDIR";
- AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", buildConfiguration()->project()->buildDirectory(buildConfiguration())));
+ AbstractProcessStep::setWorkingDirectory(wd.replace("$BUILDDIR", buildConfiguration()->buildDirectory()));
AbstractProcessStep::setCommand(m_command);
AbstractProcessStep::setEnabled(m_enabled);
AbstractProcessStep::setArguments(m_arguments);
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index f999527703f31f3f275cd6f9dd8f90eedbf30a93..4c543169ec5de5bead1af259206f618b698c5895 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -88,7 +88,9 @@ public:
void removeBuildConfiguration(BuildConfiguration *configuration);
QList<BuildConfiguration *> buildConfigurations() const;
+
// remove and add "QString uniqueConfigurationDisplayName(const QString &proposedName) const" instead
+ // move into BuildConfiguration *
void setDisplayNameFor(BuildConfiguration *configuration, const QString &displayName);
BuildConfiguration *activeBuildConfiguration() const;
void setActiveBuildConfiguration(BuildConfiguration *configuration);
@@ -108,9 +110,6 @@ public:
EditorConfiguration *editorConfiguration() const;
- virtual Environment environment(BuildConfiguration *configuration) const = 0;
- virtual QString buildDirectory(BuildConfiguration *configuration) const = 0;
-
void saveSettings();
bool restoreSettings();
@@ -131,7 +130,6 @@ public:
static QString makeUnique(const QString &preferedName, const QStringList &usedNames);
signals:
void fileListChanged();
- void buildDirectoryChanged();
// TODO clean up signal names
// might be better to also have
@@ -150,7 +148,7 @@ signals:
// This signal is jut there for updating the tree list in the buildsettings wizard
void buildConfigurationDisplayNameChanged(BuildConfiguration *bc);
- void environmentChanged(BuildConfiguration *bc);
+
protected:
/* This method is called when the project .user file is saved. Simply call
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index d8df516d8881ba3fd7fe3d246c04d1cf02c40830..89ebeaf584cbaa40d3cd4efa6bba0edfcb7a40fb 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -162,12 +162,6 @@ QStringList QmlProject::convertToAbsoluteFiles(const QStringList &paths) const
QStringList QmlProject::files() const
{ return m_files; }
-QString QmlProject::buildParser(BuildConfiguration *configuration) const
-{
- Q_UNUSED(configuration)
- return QString();
-}
-
QString QmlProject::name() const
{
return m_projectName;
@@ -198,18 +192,6 @@ bool QmlProject::hasBuildSettings() const
return false;
}
-ProjectExplorer::Environment QmlProject::environment(BuildConfiguration *configuration) const
-{
- Q_UNUSED(configuration)
- return ProjectExplorer::Environment::systemEnvironment();
-}
-
-QString QmlProject::buildDirectory(BuildConfiguration *configuration) const
-{
- Q_UNUSED(configuration)
- return QString();
-}
-
ProjectExplorer::BuildConfigWidget *QmlProject::createConfigWidget()
{
return 0;
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index 1a8e660daeb5c8b195d5e45f783df3639cdd9651..9cbb23a37eb176c73148401e98e9367a0f3f3968 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -71,9 +71,6 @@ public:
virtual bool isApplication() const;
virtual bool hasBuildSettings() const;
- virtual ProjectExplorer::Environment environment(ProjectExplorer::BuildConfiguration *configuration) const;
- virtual QString buildDirectory(ProjectExplorer::BuildConfiguration *configuration) const;
-
virtual ProjectExplorer::BuildConfigWidget *createConfigWidget();
virtual QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
@@ -81,7 +78,6 @@ public:
virtual QStringList files(FilesMode fileMode) const;
QStringList targets() const;
- QString buildParser(ProjectExplorer::BuildConfiguration *configuration) const;
enum RefreshOptions {
Files = 0x01,
diff --git a/src/plugins/qt4projectmanager/externaleditors.cpp b/src/plugins/qt4projectmanager/externaleditors.cpp
index 142bef7f501daa58ed36c5889d493cdeb950db89..f1b0b68f3de1d353a186aa9f07af7a9d9db29604 100644
--- a/src/plugins/qt4projectmanager/externaleditors.cpp
+++ b/src/plugins/qt4projectmanager/externaleditors.cpp
@@ -2,6 +2,7 @@
#include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include "qtversionmanager.h"
+#include "qt4buildconfiguration.h"
#include <utils/synchronousprocess.h>
#include <projectexplorer/projectexplorer.h>
@@ -99,7 +100,8 @@ bool ExternalQtEditor::getEditorLaunchData(const QString &fileName,
const Qt4Project *project = qt4ProjectFor(fileName);
// Get the binary either from the current Qt version of the project or Path
if (project) {
- const QtVersion *qtVersion= project->qtVersion(project->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project->activeBuildConfiguration());
+ const QtVersion *qtVersion= qt4bc->qtVersion();
data->binary = (qtVersion->*commandAccessor)();
data->workingDirectory = QFileInfo(project->file()->fileName()).absolutePath();
} else {
diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp
index 66e2c0a7532176d343d1cec722dacb0274f96b20..4f2aba4aa15f583f6b986981895bf5a11edd6287 100644
--- a/src/plugins/qt4projectmanager/makestep.cpp
+++ b/src/plugins/qt4projectmanager/makestep.cpp
@@ -30,6 +30,7 @@
#include "makestep.h"
#include "qt4project.h"
+#include "qt4buildconfiguration.h"
#include "qt4projectmanagerconstants.h"
#include <projectexplorer/projectexplorerconstants.h>
@@ -96,16 +97,15 @@ void MakeStep::storeIntoLocalMap(QMap<QString, QVariant> &map)
bool MakeStep::init()
{
- ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
- Environment environment = buildConfiguration()->project()->environment(bc);
+ Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
+ Environment environment = bc->environment();
setEnvironment(environment);
//TODO
- Qt4Project *qt4project = static_cast<Qt4Project *>(buildConfiguration()->project());
- QString workingDirectory = qt4project->buildDirectory(bc);
+ QString workingDirectory = bc->buildDirectory();
setWorkingDirectory(workingDirectory);
- QString makeCmd = qt4project->makeCommand(bc);
+ QString makeCmd = bc->makeCommand();
if (!m_makeCmd.isEmpty())
makeCmd = m_makeCmd;
if (!QFileInfo(makeCmd).isAbsolute()) {
@@ -126,15 +126,15 @@ bool MakeStep::init()
setIgnoreReturnValue(m_clean);
QStringList args = m_makeargs;
if (!m_clean) {
- if (!qt4project->defaultMakeTarget(bc).isEmpty())
- args << qt4project->defaultMakeTarget(bc);
+ if (!bc->defaultMakeTarget().isEmpty())
+ args << bc->defaultMakeTarget();
}
// -w option enables "Enter"/"Leaving directory" messages, which we need for detecting the
// absolute file path
// FIXME doing this without the user having a way to override this is rather bad
// so we only do it for unix and if the user didn't override the make command
// but for now this is the least invasive change
- ProjectExplorer::ToolChain *toolchain = qt4project->toolChain(bc);
+ ProjectExplorer::ToolChain *toolchain = bc->toolChain();
ProjectExplorer::ToolChain::ToolChainType type = ProjectExplorer::ToolChain::UNKNOWN;
if (toolchain)
@@ -225,22 +225,20 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
void MakeStepConfigWidget::updateMakeOverrideLabel()
{
- Qt4Project *qt4project = static_cast<Qt4Project *>(m_makeStep->buildConfiguration()->project());
- m_ui.makeLabel->setText(tr("Override %1:").arg(qt4project->
- makeCommand(m_makeStep->buildConfiguration())));
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(m_makeStep->buildConfiguration());
+ m_ui.makeLabel->setText(tr("Override %1:").arg(qt4bc->makeCommand()));
}
void MakeStepConfigWidget::updateDetails()
{
- Qt4Project *pro = static_cast<Qt4Project *>(m_makeStep->buildConfiguration()->project());
- ProjectExplorer::BuildConfiguration *bc = m_makeStep->buildConfiguration();
- QString workingDirectory = pro->buildDirectory(bc);
+ Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(m_makeStep->buildConfiguration());
+ QString workingDirectory = bc->buildDirectory();
- QString makeCmd = pro->makeCommand(bc);
+ QString makeCmd = bc->makeCommand();
if (!m_makeStep->m_makeCmd.isEmpty())
makeCmd = m_makeStep->m_makeCmd;
if (!QFileInfo(makeCmd).isAbsolute()) {
- Environment environment = pro->environment(bc);
+ Environment environment = bc->environment();
// Try to detect command in environment
QString tmp = environment.searchInPath(makeCmd);
if (tmp == QString::null) {
@@ -257,7 +255,7 @@ void MakeStepConfigWidget::updateDetails()
// but for now this is the least invasive change
QStringList args = m_makeStep->makeArguments();
ProjectExplorer::ToolChain::ToolChainType t = ProjectExplorer::ToolChain::UNKNOWN;
- ProjectExplorer::ToolChain *toolChain = pro->toolChain(bc);
+ ProjectExplorer::ToolChain *toolChain = bc->toolChain();
if (toolChain)
t = toolChain->type();
if (t != ProjectExplorer::ToolChain::MSVC && t != ProjectExplorer::ToolChain::WINCE) {
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 79efdeea8ac81ce596556be47442bd0892076077..9a8181e9641955972f96579ea054909bd457f002 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -34,6 +34,7 @@
#include "qt4projectmanager.h"
#include "makestep.h"
#include "qtversionmanager.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
@@ -69,15 +70,14 @@ QMakeStep::~QMakeStep()
QStringList QMakeStep::arguments()
{
QStringList additonalArguments = m_qmakeArgs;
- ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
+ Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
QStringList arguments;
arguments << buildConfiguration()->project()->file()->fileName();
arguments << "-r";
// TODO
- Qt4Project *pro = static_cast<Qt4Project *>(buildConfiguration()->project());
if (!additonalArguments.contains("-spec"))
- arguments << "-spec" << pro->qtVersion(bc)->mkspec();
+ arguments << "-spec" << bc->qtVersion()->mkspec();
#ifdef Q_OS_WIN
ToolChain::ToolChainType type = pro->toolChainType(bc);
@@ -87,7 +87,7 @@ QStringList QMakeStep::arguments()
if (bc->value("buildConfiguration").isValid()) {
QStringList configarguments;
- QtVersion::QmakeBuildConfigs defaultBuildConfiguration = pro->qtVersion(bc)->defaultBuildConfig();
+ QtVersion::QmakeBuildConfigs defaultBuildConfiguration = bc->qtVersion()->defaultBuildConfig();
QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(bc->value("buildConfiguration").toInt());
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))
configarguments << "CONFIG-=debug_and_release";
@@ -111,10 +111,9 @@ QStringList QMakeStep::arguments()
bool QMakeStep::init()
{
- ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
// TODO
- Qt4Project *pro = static_cast<Qt4Project *>(buildConfiguration()->project());
- const QtVersion *qtVersion = pro->qtVersion(bc);
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
+ const QtVersion *qtVersion = qt4bc->qtVersion();
if (!qtVersion->isValid()) {
#if defined(Q_WS_MAC)
@@ -126,7 +125,7 @@ bool QMakeStep::init()
}
QStringList args = arguments();
- QString workingDirectory = pro->buildDirectory(bc);
+ QString workingDirectory = qt4bc->buildDirectory();
QString program = qtVersion->qmakeCommand();
@@ -135,7 +134,7 @@ bool QMakeStep::init()
if (QDir(workingDirectory).exists(QLatin1String("Makefile"))) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
if (qtVersion->qmakeCommand() == qmakePath) {
- m_needToRunQMake = !pro->compareBuildConfigurationToImportFrom(bc, workingDirectory);
+ m_needToRunQMake = !qt4bc->compareBuildConfigurationToImportFrom(workingDirectory);
}
}
@@ -148,7 +147,7 @@ bool QMakeStep::init()
setWorkingDirectory(workingDirectory);
setCommand(program);
setArguments(args);
- setEnvironment(pro->environment(bc));
+ setEnvironment(qt4bc->environment());
setBuildParser(ProjectExplorer::Constants::BUILD_PARSER_QMAKE);
return AbstractMakeStep::init();
@@ -266,8 +265,8 @@ void QMakeStepConfigWidget::qtVersionChanged(ProjectExplorer::BuildConfiguration
void QMakeStepConfigWidget::updateTitleLabel()
{
- Qt4Project *qt4project = static_cast<Qt4Project *>(m_step->buildConfiguration()->project());
- const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(m_step->buildConfiguration());
+ const QtVersion *qtVersion = qt4bc->qtVersion();
if (!qtVersion) {
m_summaryText = tr("<b>QMake:</b> No Qt version set. QMake can not be run.");
emit updateSummary();
@@ -340,8 +339,8 @@ void QMakeStepConfigWidget::init()
void QMakeStepConfigWidget::updateEffectiveQMakeCall()
{
- Qt4Project *qt4project = static_cast<Qt4Project *>(m_step->buildConfiguration()->project());
- const QtVersion *qtVersion = qt4project->qtVersion(m_step->buildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(m_step->buildConfiguration());
+ const QtVersion *qtVersion = qt4bc->qtVersion();
if (qtVersion) {
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
m_ui.qmakeArgumentsEdit->setPlainText(program + QLatin1Char(' ') + ProjectExplorer::Environment::joinArgumentList(m_step->arguments()));
diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h
index 05f17477298ad9ca694d7d048234a22b56761864..2e08953e24656c7db22162fab2b715c4f56ebebe 100644
--- a/src/plugins/qt4projectmanager/qmakestep.h
+++ b/src/plugins/qt4projectmanager/qmakestep.h
@@ -61,12 +61,9 @@ public:
class Qt4Project;
-
class QMakeStep : public ProjectExplorer::AbstractMakeStep
{
Q_OBJECT
- friend class Qt4Project; // TODO remove
- // Currently used to access qmakeArgs
public:
QMakeStep(ProjectExplorer::BuildConfiguration *bc);
QMakeStep(QMakeStep *bs, ProjectExplorer::BuildConfiguration *bc);
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 6382ab51c5cba34e9bf364317a8dfe2c8a6db291..67cba594f5510738513f2e965744b0ea2a6613dc 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -28,11 +28,11 @@
**************************************************************************/
#include "maemorunconfiguration.h"
-
#include "maemomanager.h"
#include "maemotoolchain.h"
#include "profilereader.h"
#include "qt4project.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -322,10 +322,9 @@ Qt4Project *MaemoRunConfiguration::project() const
bool MaemoRunConfiguration::isEnabled() const
{
- Qt4Project *qt4Project = qobject_cast<Qt4Project*>(project());
- QTC_ASSERT(qt4Project, return false);
- ToolChain::ToolChainType type =
- qt4Project->toolChainType(qt4Project->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ QTC_ASSERT(qt4bc, return false);
+ ToolChain::ToolChainType type = qt4bc->toolChainType();
return type == ToolChain::GCC_MAEMO;
}
@@ -412,8 +411,8 @@ void MaemoRunConfiguration::wasDeployed()
bool MaemoRunConfiguration::hasDebuggingHelpers() const
{
- return project()->qtVersion(project()->activeBuildConfiguration())
- ->hasDebuggingHelper();
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ return qt4bc->qtVersion()->hasDebuggingHelper();
}
bool MaemoRunConfiguration::debuggingHelpersNeedDeployment() const
@@ -482,10 +481,10 @@ const QString MaemoRunConfiguration::cmd(const QString &cmdName) const
const MaemoToolChain *MaemoRunConfiguration::toolchain() const
{
- Qt4Project *qt4Project = qobject_cast<Qt4Project *>(project());
- QTC_ASSERT(qt4Project != 0, return 0);
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ QTC_ASSERT(qt4bc, return 0);
MaemoToolChain *tc = dynamic_cast<MaemoToolChain *>(
- qt4Project->toolChain(qt4Project->activeBuildConfiguration()) );
+ qt4bc->toolChain() );
QTC_ASSERT(tc != 0, return 0);
return tc;
}
@@ -518,8 +517,8 @@ const QStringList MaemoRunConfiguration::arguments() const
const QString MaemoRunConfiguration::dumperLib() const
{
- return project()->qtVersion(project()->activeBuildConfiguration())->
- debuggingHelperLibrary();
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ return qt4bc->qtVersion()->debuggingHelperLibrary();
}
QString MaemoRunConfiguration::executable() const
@@ -668,6 +667,7 @@ void MaemoRunConfiguration::updateTarget()
m_cachedTargetInformationValid = true;
if (Qt4Project *qt4Project = static_cast<Qt4Project *>(project())) {
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
Qt4PriFileNode * priFileNode = qt4Project->rootProjectNode()
->findProFileFor(m_proFilePath);
if (!priFileNode) {
@@ -675,8 +675,7 @@ void MaemoRunConfiguration::updateTarget()
return;
}
- QtVersion *qtVersion =
- qt4Project->qtVersion(qt4Project->activeBuildConfiguration());
+ QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
reader->setQtVersion(qtVersion);
@@ -724,8 +723,7 @@ void MaemoRunConfiguration::updateTarget()
QFileInfo(project()->file()->fileName()).absoluteDir();
QString relSubDir =
baseProjectDirectory.relativeFilePath(QFileInfo(m_proFilePath).path());
- QDir baseBuildDirectory =
- project()->buildDirectory(project()->activeBuildConfiguration());
+ QDir baseBuildDirectory = qt4bc->buildDirectory();
QString baseDir = baseBuildDirectory.absoluteFilePath(relSubDir);
if (!reader->contains("DESTDIR")) {
@@ -1324,11 +1322,10 @@ const QString AbstractMaemoRunControl::targetCmdLinePrefix() const
bool AbstractMaemoRunControl::setProcessEnvironment(QProcess &process)
{
QTC_ASSERT(runConfig, return false);
- Qt4Project *qt4Project = qobject_cast<Qt4Project *>(runConfig->project());
- QTC_ASSERT(qt4Project, return false);
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(runConfig->project()->activeBuildConfiguration());
+ QTC_ASSERT(qt4bc, return false);
Environment env = Environment::systemEnvironment();
- qt4Project->toolChain(qt4Project->activeBuildConfiguration())
- ->addToEnvironment(env);
+ qt4bc->toolChain()->addToEnvironment(env);
process.setEnvironment(env.toStringList());
return true;
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 58e4b625a29239e01dd1de4a213052cc55b68fc2..daf08c2ad9772868711d9c6985c64f6411f10194 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -37,6 +37,7 @@
#include "s60runconfigbluetoothstarter.h"
#include "bluetoothlistener_gui.h"
#include "serialdevicelister.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -106,21 +107,22 @@ QString S60DeviceRunConfiguration::type() const
ProjectExplorer::ToolChain::ToolChainType S60DeviceRunConfiguration::toolChainType(
ProjectExplorer::BuildConfiguration *configuration) const
{
- if (const Qt4Project *pro = qobject_cast<const Qt4Project*>(project()))
- return pro->toolChainType(configuration);
+ if (Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(configuration))
+ return bc->toolChainType();
return ProjectExplorer::ToolChain::INVALID;
}
ProjectExplorer::ToolChain::ToolChainType S60DeviceRunConfiguration::toolChainType() const
{
- if (const Qt4Project *pro = qobject_cast<const Qt4Project*>(project()))
- return pro->toolChainType(pro->activeBuildConfiguration());
+ if (Qt4BuildConfiguration *bc = qobject_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration()))
+ return bc->toolChainType();
return ProjectExplorer::ToolChain::INVALID;
}
bool S60DeviceRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
- const ToolChain::ToolChainType type = toolChainType(configuration);
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(configuration);
+ const ToolChain::ToolChainType type = qt4bc->toolChainType();
return type == ToolChain::GCCE || type == ToolChain::RVCT_ARMV5 || type == ToolChain::RVCT_ARMV6;
}
@@ -243,9 +245,8 @@ QString S60DeviceRunConfiguration::packageFileName() const
QString S60DeviceRunConfiguration::localExecutableFileName() const
{
- Qt4Project *qt4project = qobject_cast<Qt4Project *>(project());
- S60Devices::Device device = S60Manager::instance()->deviceForQtVersion(
- qt4project->qtVersion(qt4project->activeBuildConfiguration()));
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ S60Devices::Device device = S60Manager::instance()->deviceForQtVersion(qt4bc->qtVersion());
QString localExecutable = device.epocRoot;
localExecutable += QString::fromLatin1("/epoc32/release/%1/%2/%3.exe")
@@ -258,7 +259,7 @@ void S60DeviceRunConfiguration::updateTarget()
{
if (m_cachedTargetInformationValid)
return;
- Qt4Project *pro = static_cast<Qt4Project *>(project());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
Qt4PriFileNode * priFileNode = static_cast<Qt4Project *>(project())->rootProjectNode()->findProFileFor(m_proFilePath);
if (!priFileNode) {
m_baseFileName = QString::null;
@@ -266,7 +267,7 @@ void S60DeviceRunConfiguration::updateTarget()
emit targetInformationChanged();
return;
}
- QtVersion *qtVersion = pro->qtVersion(pro->activeBuildConfiguration());
+ QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
reader->setQtVersion(qtVersion);
@@ -274,7 +275,7 @@ void S60DeviceRunConfiguration::updateTarget()
// Find out what flags we pass on to qmake, this code is duplicated in the qmake step
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfigs projectBuildConfiguration =
- QtVersion::QmakeBuildConfigs(pro->activeBuildConfiguration()->value("buildConfiguration").toInt());
+ QtVersion::QmakeBuildConfigs(qt4bc->value("buildConfiguration").toInt());
QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments;
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))
@@ -297,7 +298,7 @@ void S60DeviceRunConfiguration::updateTarget()
// Extract data
const QDir baseProjectDirectory = QFileInfo(project()->file()->fileName()).absoluteDir();
const QString relSubDir = baseProjectDirectory.relativeFilePath(QFileInfo(m_proFilePath).path());
- const QDir baseBuildDirectory = project()->buildDirectory(project()->activeBuildConfiguration());
+ const QDir baseBuildDirectory = qt4bc->buildDirectory();
const QString baseDir = baseBuildDirectory.absoluteFilePath(relSubDir);
// Directory
@@ -319,7 +320,7 @@ void S60DeviceRunConfiguration::updateTarget()
m_packageTemplateFileName = QDir::cleanPath(
m_workingDir + QLatin1Char('/') + m_targetName + QLatin1String("_template.pkg"));
- switch (pro->toolChainType(pro->activeBuildConfiguration())) {
+ switch (qt4bc->toolChainType()) {
case ToolChain::GCCE:
case ToolChain::GCCE_GNUPOC:
m_platform = QLatin1String("gcce");
@@ -417,8 +418,8 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(RunConfiguration *runConfigurat
connect(m_makesis, SIGNAL(finished(int,QProcess::ExitStatus)),
this, SLOT(makesisProcessFinished()));
- Qt4Project *project = qobject_cast<Qt4Project *>(runConfiguration->project());
- QTC_ASSERT(project, return);
+ Qt4BuildConfiguration *activeBuildConf =
+ static_cast<Qt4BuildConfiguration *>(runConfiguration->project()->activeBuildConfiguration());
S60DeviceRunConfiguration *s60runConfig = qobject_cast<S60DeviceRunConfiguration *>(runConfiguration);
QTC_ASSERT(s60runConfig, return);
@@ -432,18 +433,17 @@ S60DeviceRunControlBase::S60DeviceRunControlBase(RunConfiguration *runConfigurat
m_symbianTarget = s60runConfig->symbianTarget();
m_packageTemplateFile = s60runConfig->packageTemplateFileName();
m_workingDirectory = QFileInfo(m_baseFileName).absolutePath();
- m_qtDir = project->qtVersion(project->activeBuildConfiguration())->versionInfo().value("QT_INSTALL_DATA");
+ m_qtDir = activeBuildConf->qtVersion()->versionInfo().value("QT_INSTALL_DATA");
m_useCustomSignature = (s60runConfig->signingMode() == S60DeviceRunConfiguration::SignCustom);
m_customSignaturePath = s60runConfig->customSignaturePath();
m_customKeyPath = s60runConfig->customKeyPath();
- ProjectExplorer::BuildConfiguration *const activeBuildConf = project->activeBuildConfiguration();
- const S60Devices::Device device = S60Manager::instance()->deviceForQtVersion(project->qtVersion(activeBuildConf));
+ const S60Devices::Device device = S60Manager::instance()->deviceForQtVersion(activeBuildConf->qtVersion());
switch (m_toolChain) {
case ProjectExplorer::ToolChain::GCCE_GNUPOC:
case ProjectExplorer::ToolChain::RVCT_ARMV6_GNUPOC: {
// 'sis' is a make target here. Set up with correct environment
- ProjectExplorer::ToolChain *toolchain = project->toolChain(activeBuildConf);
+ ProjectExplorer::ToolChain *toolchain = activeBuildConf->toolChain();
m_makesisTool = toolchain->makeCommand();
m_toolsDirectory = device.epocRoot + QLatin1String("/epoc32/tools");
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
index 5c3c2c48023e28818c8e2d51d4394cb86f9cac65..59fc165d361d585dc77f9c48c19635ffcd21ed06 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
@@ -34,6 +34,7 @@
#include "profilereader.h"
#include "s60manager.h"
#include "s60devices.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -78,9 +79,9 @@ QString S60EmulatorRunConfiguration::type() const
bool S60EmulatorRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
- Qt4Project *pro = qobject_cast<Qt4Project*>(project());
- QTC_ASSERT(pro, return false);
- ToolChain::ToolChainType type = pro->toolChainType(configuration);
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(configuration);
+ QTC_ASSERT(qt4bc, return false);
+ ToolChain::ToolChainType type = qt4bc->toolChainType();
return type == ToolChain::WINSCW;
}
@@ -113,7 +114,7 @@ void S60EmulatorRunConfiguration::updateTarget()
{
if (m_cachedTargetInformationValid)
return;
- Qt4Project *pro = static_cast<Qt4Project *>(project());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
Qt4PriFileNode * priFileNode = static_cast<Qt4Project *>(project())->rootProjectNode()->findProFileFor(m_proFilePath);
if (!priFileNode) {
m_executable = QString::null;
@@ -121,15 +122,14 @@ void S60EmulatorRunConfiguration::updateTarget()
emit targetInformationChanged();
return;
}
- QtVersion *qtVersion = pro->qtVersion(pro->activeBuildConfiguration());
+ QtVersion *qtVersion = qt4bc->qtVersion();
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
reader->setQtVersion(qtVersion);
// Find out what flags we pass on to qmake, this code is duplicated in the qmake step
QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qtVersion->defaultBuildConfig();
- QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()
- ->value("buildConfiguration").toInt());
+ QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(qt4bc->value("buildConfiguration").toInt());
QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments;
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))
@@ -283,7 +283,7 @@ S60EmulatorRunControl::S60EmulatorRunControl(S60EmulatorRunConfiguration *runCon
// stuff like the EPOCROOT and EPOCDEVICE env variable
Environment env = Environment::systemEnvironment();
Project *project = runConfiguration->project();
- static_cast<Qt4Project *>(project)->toolChain(project->activeBuildConfiguration())->addToEnvironment(env);
+ static_cast<Qt4BuildConfiguration *>(project->activeBuildConfiguration())->toolChain()->addToEnvironment(env);
m_applicationLauncher.setEnvironment(env.toStringList());
m_executable = runConfiguration->executable();
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 91e4846f98774bb88039f1dd7548b6065d8b8c9f..2916badccb2a541bc4ec86bfab90443311806b3d 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -32,7 +32,15 @@
using namespace Qt4ProjectManager;
using namespace Qt4ProjectManager::Internal;
-using ProjectExplorer::BuildConfiguration;
+using namespace ProjectExplorer;
+
+namespace {
+ bool debug = false;
+}
+
+namespace {
+ const char * const KEY_QT_VERSION_ID = "QtVersionId";
+}
Qt4BuildConfiguration::Qt4BuildConfiguration(Qt4Project *pro)
: BuildConfiguration(pro)
@@ -50,3 +58,257 @@ Qt4BuildConfiguration::~Qt4BuildConfiguration()
{
}
+
+ProjectExplorer::Environment Qt4BuildConfiguration::baseEnvironment() const
+{
+ Environment env = useSystemEnvironment() ? Environment::systemEnvironment() : Environment();
+ qtVersion()->addToEnvironment(env);
+ ToolChain *tc = toolChain();
+ if (tc)
+ tc->addToEnvironment(env);
+ return env;
+}
+
+ProjectExplorer::Environment Qt4BuildConfiguration::environment() const
+{
+ Environment env = baseEnvironment();
+ env.modify(userEnvironmentChanges());
+ return env;
+}
+
+void Qt4BuildConfiguration::setUseSystemEnvironment(bool b)
+{
+ if (useSystemEnvironment() == b)
+ return;
+ setValue("clearSystemEnvironment", !b);
+ emit environmentChanged();
+}
+
+bool Qt4BuildConfiguration::useSystemEnvironment() const
+{
+ bool b = !(value("clearSystemEnvironment").isValid()
+ && value("clearSystemEnvironment").toBool());
+ return b;
+}
+
+QList<ProjectExplorer::EnvironmentItem> Qt4BuildConfiguration::userEnvironmentChanges() const
+{
+ return EnvironmentItem::fromStringList(value("userEnvironmentChanges").toStringList());
+}
+
+void Qt4BuildConfiguration::setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff)
+{
+ QStringList list = EnvironmentItem::toStringList(diff);
+ if (list == value("userEnvironmentChanges").toStringList())
+ return;
+ setValue("userEnvironmentChanges", list);
+ emit environmentChanged();
+}
+
+QString Qt4BuildConfiguration::buildDirectory() const
+{
+ QString workingDirectory;
+ if (value("useShadowBuild").toBool())
+ workingDirectory = value("buildDirectory").toString();
+ if (workingDirectory.isEmpty())
+ workingDirectory = QFileInfo(project()->file()->fileName()).absolutePath();
+ return workingDirectory;
+}
+
+ProjectExplorer::ToolChain *Qt4BuildConfiguration::toolChain() const
+{
+ ToolChain::ToolChainType tct = toolChainType();
+ return qtVersion()->toolChain(tct);
+}
+
+QString Qt4BuildConfiguration::makeCommand() const
+{
+ ToolChain *tc = toolChain();
+ return tc ? tc->makeCommand() : "make";
+}
+
+#ifdef QTCREATOR_WITH_S60
+static inline QString symbianMakeTarget(QtVersion::QmakeBuildConfig buildConfig,
+ const QString &type)
+{
+ QString rc = (buildConfig & QtVersion::DebugBuild) ?
+ QLatin1String("debug-") : QLatin1String("release-");
+ rc += type;
+ return rc;
+}
+#endif
+
+QString Qt4BuildConfiguration::defaultMakeTarget() const
+{
+#ifdef QTCREATOR_WITH_S60
+ ToolChain *tc = toolChain();
+ if (!tc)
+ return QString::null;
+ const QtVersion::QmakeBuildConfig buildConfig
+ = QtVersion::QmakeBuildConfig(value("buildConfiguration").toInt());
+
+ switch (tc->type()) {
+ case ToolChain::GCCE:
+ case ToolChain::GCCE_GNUPOC:
+ return symbianMakeTarget(buildConfig, QLatin1String("gcce"));
+ case ToolChain::RVCT_ARMV5:
+ return symbianMakeTarget(buildConfig, QLatin1String("armv5"));
+ case ToolChain::RVCT_ARMV6:
+ case ToolChain::RVCT_ARMV6_GNUPOC:
+ return symbianMakeTarget(buildConfig, QLatin1String("armv6"));
+ default:
+ break;
+ }
+#else
+
+#endif
+ return QString::null;
+}
+
+QString Qt4BuildConfiguration::qtDir() const
+{
+ QtVersion *version = qtVersion();
+ if (version)
+ return version->versionInfo().value("QT_INSTALL_DATA");
+ return QString::null;
+}
+
+QtVersion *Qt4BuildConfiguration::qtVersion() const
+{
+ return QtVersionManager::instance()->version(qtVersionId());
+}
+
+int Qt4BuildConfiguration::qtVersionId() const
+{
+ QtVersionManager *vm = QtVersionManager::instance();
+ if (debug)
+ qDebug()<<"Looking for qtVersion ID of "<<displayName();
+ int id = 0;
+ QVariant vid = value(KEY_QT_VERSION_ID);
+ if (vid.isValid()) {
+ id = vid.toInt();
+ if (vm->version(id)->isValid()) {
+ return id;
+ } else {
+ const_cast<Qt4BuildConfiguration *>(this)->setValue(KEY_QT_VERSION_ID, 0);
+ return 0;
+ }
+ } else {
+ // Backward compatibilty, we might have just the name:
+ QString vname = value("QtVersion").toString();
+ if (debug)
+ qDebug()<<" Backward compatibility reading QtVersion"<<vname;
+ if (!vname.isEmpty()) {
+ const QList<QtVersion *> &versions = vm->versions();
+ foreach (const QtVersion * const version, versions) {
+ if (version->name() == vname) {
+ if (debug)
+ qDebug()<<"found name in versions";
+ const_cast<Qt4BuildConfiguration *>(this)->setValue(KEY_QT_VERSION_ID, version->uniqueId());
+ return version->uniqueId();
+ }
+ }
+ }
+ }
+ if (debug)
+ qDebug()<<" using qtversion with id ="<<id;
+ // Nothing found, reset to default
+ const_cast<Qt4BuildConfiguration *>(this)->setValue(KEY_QT_VERSION_ID, id);
+ return id;
+}
+
+void Qt4BuildConfiguration::setQtVersion(int id)
+{
+ setValue(KEY_QT_VERSION_ID, id);
+ emit qtVersionChanged();
+ static_cast<Qt4Project *>(project())->updateActiveRunConfiguration();
+}
+
+void Qt4BuildConfiguration::setToolChainType(ProjectExplorer::ToolChain::ToolChainType type)
+{
+ setValue("ToolChain", (int)type);
+ static_cast<Qt4Project *>(project())->updateActiveRunConfiguration();
+}
+
+ProjectExplorer::ToolChain::ToolChainType Qt4BuildConfiguration::toolChainType() const
+{
+ ToolChain::ToolChainType originalType = ToolChain::ToolChainType(value("ToolChain").toInt());
+ ToolChain::ToolChainType type = originalType;
+ const QtVersion *version = qtVersion();
+ if (!version->possibleToolChainTypes().contains(type)) {
+ // Oh no the saved type is not valid for this qt version
+ // use default tool chain
+ type = version->defaultToolchainType();
+ const_cast<Qt4BuildConfiguration *>(this)->setToolChainType(type);
+ }
+ return type;
+}
+
+
+QMakeStep *Qt4BuildConfiguration::qmakeStep() const
+{
+ QMakeStep *qs = 0;
+ foreach(BuildStep *bs, buildSteps())
+ if ((qs = qobject_cast<QMakeStep *>(bs)) != 0)
+ return qs;
+ return 0;
+}
+
+MakeStep *Qt4BuildConfiguration::makeStep() const
+{
+ MakeStep *qs = 0;
+ foreach(BuildStep *bs, buildSteps())
+ if ((qs = qobject_cast<MakeStep *>(bs)) != 0)
+ return qs;
+ return 0;
+}
+
+// returns true if both are equal
+bool Qt4BuildConfiguration::compareBuildConfigurationToImportFrom(const QString &workingDirectory)
+{
+ QMakeStep *qs = qmakeStep();
+ if (QDir(workingDirectory).exists(QLatin1String("Makefile")) && qs) {
+ QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
+ QtVersion *version = qtVersion();
+ if (version->qmakeCommand() == qmakePath) {
+ // same qtversion
+ QPair<QtVersion::QmakeBuildConfigs, QStringList> result =
+ QtVersionManager::scanMakeFile(workingDirectory, version->defaultBuildConfig());
+ if (QtVersion::QmakeBuildConfig(value("buildConfiguration").toInt()) == result.first) {
+ // The QMake Build Configuration are the same,
+ // now compare arguments lists
+ // we have to compare without the spec/platform cmd argument
+ // and compare that on its own
+ QString actualSpec = Qt4Project::extractSpecFromArgumentList(qs->qmakeArguments(), workingDirectory, version);
+ if (actualSpec.isEmpty()) {
+ // Easy one the user has choosen not to override the settings
+ actualSpec = version->mkspec();
+ }
+
+
+ QString parsedSpec = Qt4Project::extractSpecFromArgumentList(result.second, workingDirectory, version);
+ QStringList actualArgs = Qt4Project::removeSpecFromArgumentList(qs->qmakeArguments());
+ QStringList parsedArgs = Qt4Project::removeSpecFromArgumentList(result.second);
+
+ if (debug) {
+ qDebug()<<"Actual args:"<<actualArgs;
+ qDebug()<<"Parsed args:"<<parsedArgs;
+ qDebug()<<"Actual spec:"<<actualSpec;
+ qDebug()<<"Parsed spec:"<<parsedSpec;
+ }
+
+ if (actualArgs == parsedArgs) {
+ // Specs match exactly
+ if (actualSpec == parsedSpec)
+ return true;
+ // Actual spec is the default one
+// qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec();
+ if ((actualSpec == version->mkspec() || actualSpec == "default")
+ && (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty()))
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+}
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index d633527285b1fb73bd2c53e0f515f82785882dbd..f74aed9df43e3d92e402500c5e6c9cdf284a8267 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -31,10 +31,14 @@
#define QT4BUILDCONFIGURATION_H
#include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/toolchain.h>
namespace Qt4ProjectManager {
class Qt4Project;
+class QtVersion;
+class QMakeStep;
+class MakeStep;
namespace Internal {
@@ -46,6 +50,53 @@ public:
// copy ctor
Qt4BuildConfiguration(Qt4BuildConfiguration *source);
~Qt4BuildConfiguration();
+
+ ProjectExplorer::Environment environment() const;
+ ProjectExplorer::Environment baseEnvironment() const;
+ void setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff);
+ QList<ProjectExplorer::EnvironmentItem> userEnvironmentChanges() const;
+ bool useSystemEnvironment() const;
+ void setUseSystemEnvironment(bool b);
+
+ virtual QString buildDirectory() const;
+
+ // returns the qtdir (depends on the current QtVersion)
+ QString qtDir() const;
+ //returns the qtVersion, if the project is set to use the default qt version, then
+ // that is returned
+ // to check wheter the project uses the default qt version use qtVersionId
+ QtVersion *qtVersion() const;
+
+ // returns the id of the qt version, if the project is using the default qt version
+ // this function returns 0
+ int qtVersionId() const;
+ //returns the name of the qt version, might be QString::Null, which means default qt version
+ // qtVersion is in general the better method to use
+ QString qtVersionName() const;
+
+ void setQtVersion(int id);
+
+ ProjectExplorer::ToolChain *toolChain() const;
+ void setToolChainType(ProjectExplorer::ToolChain::ToolChainType type);
+ ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
+
+
+ // Those functions are used in a few places.
+ // The drawback is that we shouldn't actually depend on them beeing always there
+ // That is generally the stuff that is asked should normally be transfered to
+ // Qt4Project *
+ // So that we can later enable people to build qt4projects the way they would like
+ QMakeStep *qmakeStep() const;
+ MakeStep *makeStep() const;
+
+ QString makeCommand() const;
+ QString defaultMakeTarget() const;
+
+ // TODO rename
+ bool compareBuildConfigurationToImportFrom(const QString &workingDirectory);
+
+signals:
+ void qtVersionChanged();
};
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
index 16d64842ae76e5038f78dce2af1a779feed0a4f9..998ae3591bf6f52f06eea38c2658f1a03569bce3 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
@@ -29,6 +29,7 @@
#include "qt4buildenvironmentwidget.h"
#include "qt4project.h"
+#include "qt4buildconfiguration.h"
#include <projectexplorer/environmenteditmodel.h>
@@ -70,20 +71,20 @@ void Qt4BuildEnvironmentWidget::init(ProjectExplorer::BuildConfiguration *bc)
if (debug)
qDebug() << "Qt4BuildConfigWidget::init()";
- m_buildConfiguration = bc;
- m_clearSystemEnvironmentCheckBox->setChecked(!m_pro->useSystemEnvironment(m_buildConfiguration));
- m_buildEnvironmentWidget->setBaseEnvironment(m_pro->baseEnvironment(m_buildConfiguration));
- m_buildEnvironmentWidget->setUserChanges(m_pro->userEnvironmentChanges(m_buildConfiguration));
+ m_buildConfiguration = static_cast<Qt4BuildConfiguration *>(bc);
+ m_clearSystemEnvironmentCheckBox->setChecked(!m_buildConfiguration->useSystemEnvironment());
+ m_buildEnvironmentWidget->setBaseEnvironment(m_buildConfiguration->baseEnvironment());
+ m_buildEnvironmentWidget->setUserChanges(m_buildConfiguration->userEnvironmentChanges());
m_buildEnvironmentWidget->updateButtons();
}
void Qt4BuildEnvironmentWidget::environmentModelUserChangesUpdated()
{
- m_pro->setUserEnvironmentChanges(m_buildConfiguration, m_buildEnvironmentWidget->userChanges());
+ m_buildConfiguration->setUserEnvironmentChanges(m_buildEnvironmentWidget->userChanges());
}
void Qt4BuildEnvironmentWidget::clearSystemEnvironmentCheckBoxClicked(bool checked)
{
- m_pro->setUseSystemEnvironment(m_buildConfiguration, !checked);
- m_buildEnvironmentWidget->setBaseEnvironment(m_pro->baseEnvironment(m_buildConfiguration));
+ m_buildConfiguration->setUseSystemEnvironment(!checked);
+ m_buildEnvironmentWidget->setBaseEnvironment(m_buildConfiguration->baseEnvironment());
}
diff --git a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
index 7f565e73a28c987c486d7ea3d02cdc25328d6f8c..304649c044954b80c7276fb9dd9066f133a7877b 100644
--- a/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
+++ b/src/plugins/qt4projectmanager/qt4buildenvironmentwidget.h
@@ -45,6 +45,8 @@ namespace Qt4ProjectManager {
class Qt4Project;
namespace Internal {
+class Qt4BuildConfiguration;
+
class Qt4BuildEnvironmentWidget : public ProjectExplorer::BuildConfigWidget
{
Q_OBJECT
@@ -63,7 +65,7 @@ private:
ProjectExplorer::EnvironmentWidget *m_buildEnvironmentWidget;
QCheckBox *m_clearSystemEnvironmentCheckBox;
Qt4Project *m_pro;
- ProjectExplorer::BuildConfiguration *m_buildConfiguration;
+ Qt4BuildConfiguration *m_buildConfiguration;
};
} // namespace Internal
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 70c7029251c910b6403a4184eeef158e4d473114..7276f950eb602e583cfba941921014f2d63da391 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -35,6 +35,7 @@
#include "qt4project.h"
#include "qt4projectmanager.h"
#include "qtuicodemodelsupport.h"
+#include "qt4buildconfiguration.h"
#include <projectexplorer/nodesvisitor.h>
#include <projectexplorer/filewatcher.h>
@@ -1101,7 +1102,9 @@ ProFileReader *Qt4PriFileNode::createProFileReader() const
connect(reader, SIGNAL(errorFound(QString)),
m_project, SLOT(proFileParseError(QString)));
- QtVersion *version = m_project->qtVersion(m_project->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(m_project->activeBuildConfiguration());
+
+ QtVersion *version = qt4bc->qtVersion();
if (version->isValid())
reader->setQtVersion(version);
@@ -1202,7 +1205,7 @@ QString Qt4PriFileNode::buildDir() const
{
const QDir srcDirRoot = QFileInfo(m_project->rootProjectNode()->path()).absoluteDir();
const QString relativeDir = srcDirRoot.relativeFilePath(m_projectDir);
- return QDir(m_project->buildDirectory(m_project->activeBuildConfiguration())).absoluteFilePath(relativeDir);
+ return QDir(m_project->activeBuildConfiguration()->buildDirectory()).absoluteFilePath(relativeDir);
}
/*
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index d5f986e9dd82b3396aa5a280ac857313c5aa55aa..40b494e72e0bbde65bfcc5bac810aadcadb954c8 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -42,6 +42,7 @@
#include "projectloadwizard.h"
#include "qtversionmanager.h"
#include "qt4buildconfiguration.h"
+#include "qt4buildconfiguration.h"
#ifdef QTCREATOR_WITH_S60
#include "qt-s60/gccetoolchain.h"
@@ -68,10 +69,6 @@ using namespace ProjectExplorer;
enum { debug = 0 };
-namespace {
- const char * const KEY_QT_VERSION_ID = "QtVersionId";
-}
-
namespace Qt4ProjectManager {
namespace Internal {
@@ -341,7 +338,7 @@ Qt4Project::~Qt4Project()
void Qt4Project::defaultQtVersionChanged()
{
- if (qtVersionId(activeBuildConfiguration()) == 0)
+ if (static_cast<Qt4BuildConfiguration *>(activeBuildConfiguration())->qtVersionId() == 0)
m_rootProjectNode->update();
}
@@ -349,9 +346,10 @@ void Qt4Project::qtVersionsChanged()
{
QtVersionManager *vm = QtVersionManager::instance();
foreach (BuildConfiguration *bc, buildConfigurations()) {
- if (!vm->version(qtVersionId(bc))->isValid()) {
- setQtVersion(bc, 0);
- if (bc == activeBuildConfiguration())
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(bc);
+ if (!vm->version(qt4bc->qtVersionId())->isValid()) {
+ qt4bc->setQtVersion(0);
+ if (qt4bc == activeBuildConfiguration())
m_rootProjectNode->update();
}
}
@@ -381,8 +379,9 @@ bool Qt4Project::restoreSettingsImpl(PersistentSettingsReader &settingsReader)
// or if not, is reset to the default
foreach (BuildConfiguration *bc, buildConfigurations()) {
- qtVersionId(bc);
- toolChainType(bc);
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(bc);
+ qt4bc->qtVersionId();
+ qt4bc->toolChainType();
}
m_rootProjectNode = new Qt4ProFileNode(this, m_fileInfo->fileName(), this);
@@ -473,7 +472,7 @@ Qt4BuildConfiguration *Qt4Project::addQt4BuildConfiguration(QString buildConfigu
cleanStep->setClean(true);
bc->insertCleanStep(0, cleanStep);
if (!additionalArguments.isEmpty())
- qmakeStep->m_qmakeArgs = additionalArguments;
+ qmakeStep->setQMakeArguments(additionalArguments);
// set some options for qmake and make
if (qmakeBuildConfiguration & QtVersion::BuildAll) // debug_and_release => explicit targets
@@ -484,9 +483,9 @@ Qt4BuildConfiguration *Qt4Project::addQt4BuildConfiguration(QString buildConfigu
// Finally set the qt version
bool defaultQtVersion = (qtversion == 0);
if (defaultQtVersion)
- setQtVersion(bc, 0);
+ bc->setQtVersion(0);
else
- setQtVersion(bc, qtversion->uniqueId());
+ bc->setQtVersion(qtversion->uniqueId());
return bc;
}
@@ -517,61 +516,13 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
m_proFilesForCodeModelUpdate.append(pro);
}
-ProjectExplorer::ToolChain *Qt4Project::toolChain(BuildConfiguration *configuration) const
-{
- ToolChain::ToolChainType tct = toolChainType(configuration);
- return qtVersion(configuration)->toolChain(tct);
-}
-
-QString Qt4Project::makeCommand(BuildConfiguration *configuration) const
-{
- ToolChain *tc = toolChain(configuration);
- return tc ? tc->makeCommand() : "make";
-}
-
-#ifdef QTCREATOR_WITH_S60
-static inline QString symbianMakeTarget(QtVersion::QmakeBuildConfig buildConfig,
- const QString &type)
-{
- QString rc = (buildConfig & QtVersion::DebugBuild) ?
- QLatin1String("debug-") : QLatin1String("release-");
- rc += type;
- return rc;
-}
-#endif
-
-QString Qt4Project::defaultMakeTarget(BuildConfiguration *configuration) const
-{
-#ifdef QTCREATOR_WITH_S60
- ToolChain *tc = toolChain(configuration);
- if (!tc)
- return QString::null;
- const QtVersion::QmakeBuildConfig buildConfig
- = QtVersion::QmakeBuildConfig(activeBuildConfiguration()->value("buildConfiguration").toInt());
-
- switch (tc->type()) {
- case ToolChain::GCCE:
- case ToolChain::GCCE_GNUPOC:
- return symbianMakeTarget(buildConfig, QLatin1String("gcce"));
- case ToolChain::RVCT_ARMV5:
- return symbianMakeTarget(buildConfig, QLatin1String("armv5"));
- case ToolChain::RVCT_ARMV6:
- case ToolChain::RVCT_ARMV6_GNUPOC:
- return symbianMakeTarget(buildConfig, QLatin1String("armv6"));
- default:
- break;
- }
-#else
- Q_UNUSED(configuration);
-#endif
- return QString::null;
-}
-
void Qt4Project::updateCodeModel()
{
if (debug)
qDebug()<<"Qt4Project::updateCodeModel()";
+ Qt4BuildConfiguration *activeQt4BuildConfiguration = static_cast<Qt4BuildConfiguration *>(activeBuildConfiguration());
+
CppTools::CppModelManagerInterface *modelmanager =
ExtensionSystem::PluginManager::instance()
->getObject<CppTools::CppModelManagerInterface>();
@@ -583,7 +534,7 @@ void Qt4Project::updateCodeModel()
QStringList predefinedFrameworkPaths;
QByteArray predefinedMacros;
- ToolChain *tc = toolChain(activeBuildConfiguration());
+ ToolChain *tc = activeQt4BuildConfiguration->toolChain();
QList<HeaderPath> allHeaderPaths;
if (tc) {
predefinedMacros = tc->predefinedMacros();
@@ -602,7 +553,7 @@ void Qt4Project::updateCodeModel()
predefinedIncludePaths.append(headerPath.path());
}
- const QHash<QString, QString> versionInfo = qtVersion(activeBuildConfiguration())->versionInfo();
+ const QHash<QString, QString> versionInfo = activeQt4BuildConfiguration->qtVersion()->versionInfo();
const QString newQtIncludePath = versionInfo.value(QLatin1String("QT_INSTALL_HEADERS"));
predefinedIncludePaths.append(newQtIncludePath);
@@ -687,7 +638,7 @@ void Qt4Project::updateCodeModel()
}
// Add mkspec directory
- info.includes.append(qtVersion(activeBuildConfiguration())->mkspecPath());
+ info.includes.append(activeQt4BuildConfiguration->qtVersion()->mkspecPath());
info.frameworkPaths = allFrameworkPaths;
@@ -701,7 +652,7 @@ void Qt4Project::updateCodeModel()
}
// Add mkspec directory
- allIncludePaths.append(qtVersion(activeBuildConfiguration())->mkspecPath());
+ allIncludePaths.append(activeQt4BuildConfiguration->qtVersion()->mkspecPath());
// Dump things out
// This is debugging output...
@@ -784,7 +735,6 @@ QStringList Qt4Project::frameworkPaths(const QString &fileName) const
// */
void Qt4Project::update()
{
- // TODO Maybe remove this method completely?
m_rootProjectNode->update();
//updateCodeModel();
}
@@ -859,126 +809,6 @@ Qt4ProFileNode *Qt4Project::rootProjectNode() const
return m_rootProjectNode;
}
-QString Qt4Project::buildDirectory(BuildConfiguration *configuration) const
-{
- QString workingDirectory;
- if (configuration->value("useShadowBuild").toBool())
- workingDirectory = configuration->value("buildDirectory").toString();
- if (workingDirectory.isEmpty())
- workingDirectory = QFileInfo(file()->fileName()).absolutePath();
- return workingDirectory;
-}
-
-ProjectExplorer::Environment Qt4Project::baseEnvironment(BuildConfiguration *configuration) const
-{
- Environment env = useSystemEnvironment(configuration) ? Environment::systemEnvironment() : Environment();
- qtVersion(configuration)->addToEnvironment(env);
- ToolChain *tc = toolChain(configuration);
- if (tc)
- tc->addToEnvironment(env);
- return env;
-}
-
-ProjectExplorer::Environment Qt4Project::environment(BuildConfiguration *configuration) const
-{
- Environment env = baseEnvironment(configuration);
- env.modify(userEnvironmentChanges(configuration));
- return env;
-}
-
-void Qt4Project::setUseSystemEnvironment(BuildConfiguration *configuration, bool b)
-{
- if (useSystemEnvironment(configuration) == b)
- return;
- configuration->setValue("clearSystemEnvironment", !b);
- emit environmentChanged(configuration);
-}
-
-bool Qt4Project::useSystemEnvironment(BuildConfiguration *configuration) const
-{
- bool b = !(configuration->value("clearSystemEnvironment").isValid()
- && configuration->value("clearSystemEnvironment").toBool());
- return b;
-}
-
-QList<ProjectExplorer::EnvironmentItem> Qt4Project::userEnvironmentChanges(BuildConfiguration *configuration) const
-{
- return EnvironmentItem::fromStringList(configuration->value("userEnvironmentChanges").toStringList());
-}
-
-void Qt4Project::setUserEnvironmentChanges(BuildConfiguration *configuration, const QList<ProjectExplorer::EnvironmentItem> &diff)
-{
- QStringList list = EnvironmentItem::toStringList(diff);
- if (list == configuration->value("userEnvironmentChanges").toStringList())
- return;
- configuration->setValue("userEnvironmentChanges", list);
- emit environmentChanged(configuration);
-}
-
-QString Qt4Project::qtDir(BuildConfiguration *configuration) const
-{
- QtVersion *version = qtVersion(configuration);
- if (version)
- return version->versionInfo().value("QT_INSTALL_DATA");
- return QString::null;
-}
-
-QtVersion *Qt4Project::qtVersion(BuildConfiguration *configuration) const
-{
- return QtVersionManager::instance()->version(qtVersionId(configuration));
-}
-
-int Qt4Project::qtVersionId(BuildConfiguration *configuration) const
-{
- QtVersionManager *vm = QtVersionManager::instance();
- if (debug)
- qDebug()<<"Looking for qtVersion ID of "<<configuration->displayName();
- int id = 0;
- QVariant vid = configuration->value(KEY_QT_VERSION_ID);
- if (vid.isValid()) {
- id = vid.toInt();
- if (vm->version(id)->isValid()) {
- return id;
- } else {
- configuration->setValue(KEY_QT_VERSION_ID, 0);
- return 0;
- }
- } else {
- // Backward compatibilty, we might have just the name:
- QString vname = configuration->value("QtVersion").toString();
- if (debug)
- qDebug()<<" Backward compatibility reading QtVersion"<<vname;
- if (!vname.isEmpty()) {
- const QList<QtVersion *> &versions = vm->versions();
- foreach (const QtVersion * const version, versions) {
- if (version->name() == vname) {
- if (debug)
- qDebug()<<"found name in versions";
- configuration->setValue(KEY_QT_VERSION_ID, version->uniqueId());
- return version->uniqueId();
- }
- }
- }
- }
- if (debug)
- qDebug()<<" using qtversion with id ="<<id;
- // Nothing found, reset to default
- configuration->setValue(KEY_QT_VERSION_ID, id);
- return id;
-}
-
-void Qt4Project::setQtVersion(BuildConfiguration *configuration, int id)
-{
- configuration->setValue(KEY_QT_VERSION_ID, id);
- emit qtVersionChanged(configuration);
- updateActiveRunConfiguration();
-}
-
-void Qt4Project::setToolChainType(BuildConfiguration *configuration, ProjectExplorer::ToolChain::ToolChainType type)
-{
- configuration->setValue("ToolChain", (int)type);
- updateActiveRunConfiguration();
-}
void Qt4Project::updateActiveRunConfiguration()
{
@@ -986,18 +816,6 @@ void Qt4Project::updateActiveRunConfiguration()
emit targetInformationChanged();
}
-ProjectExplorer::ToolChain::ToolChainType Qt4Project::toolChainType(BuildConfiguration *configuration) const
-{
- ToolChain::ToolChainType originalType = ToolChain::ToolChainType(configuration->value("ToolChain").toInt());
- ToolChain::ToolChainType type = originalType;
- const QtVersion *version = qtVersion(configuration);
- if (!version->possibleToolChainTypes().contains(type)) // use default tool chain
- type = version->defaultToolchainType();
- if (type != originalType)
- const_cast<Qt4Project *>(this)->setToolChainType(configuration, type);
- return type;
-}
-
QString Qt4Project::extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version)
{
int index = list.indexOf("-spec");
@@ -1185,24 +1003,6 @@ void Qt4Project::proFileUpdated(Qt4ProjectManager::Internal::Qt4ProFileNode *nod
}
}
-QMakeStep *Qt4Project::qmakeStep(ProjectExplorer::BuildConfiguration *bc) const
-{
- QMakeStep *qs = 0;
- foreach(BuildStep *bs, bc->buildSteps())
- if ((qs = qobject_cast<QMakeStep *>(bs)) != 0)
- return qs;
- return 0;
-}
-
-MakeStep *Qt4Project::makeStep(ProjectExplorer::BuildConfiguration *bc) const
-{
- MakeStep *qs = 0;
- foreach(BuildStep *bs, bc->buildSteps())
- if ((qs = qobject_cast<MakeStep *>(bs)) != 0)
- return qs;
- return 0;
-}
-
bool Qt4Project::hasSubNode(Qt4PriFileNode *root, const QString &path)
{
if (root->path() == path)
@@ -1243,11 +1043,6 @@ void Qt4Project::invalidateCachedTargetInformation()
emit targetInformationChanged();
}
-void Qt4Project::emitBuildDirectoryChanged()
-{
- emit buildDirectoryChanged();
-}
-
// We match -spec and -platfrom separetly
// We ignore -cache, because qmake contained a bug that it didn't
// mention the -cache in the Makefile
@@ -1274,56 +1069,6 @@ QStringList Qt4Project::removeSpecFromArgumentList(const QStringList &old)
return newList;
}
-// returns true if both are equal
-bool Qt4Project::compareBuildConfigurationToImportFrom(BuildConfiguration *bc, const QString &workingDirectory)
-{
- QMakeStep *qs = qmakeStep(bc);
- if (QDir(workingDirectory).exists(QLatin1String("Makefile")) && qs) {
- QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(workingDirectory);
- QtVersion *version = qtVersion(bc);
- if (version->qmakeCommand() == qmakePath) {
- // same qtversion
- QPair<QtVersion::QmakeBuildConfigs, QStringList> result =
- QtVersionManager::scanMakeFile(workingDirectory, version->defaultBuildConfig());
- if (QtVersion::QmakeBuildConfig(bc->value("buildConfiguration").toInt()) == result.first) {
- // The QMake Build Configuration are the same,
- // now compare arguments lists
- // we have to compare without the spec/platform cmd argument
- // and compare that on its own
- QString actualSpec = extractSpecFromArgumentList(qs->m_qmakeArgs, workingDirectory, version);
- if (actualSpec.isEmpty()) {
- // Easy one the user has choosen not to override the settings
- actualSpec = version->mkspec();
- }
-
-
- QString parsedSpec = extractSpecFromArgumentList(result.second, workingDirectory, version);
- QStringList actualArgs = removeSpecFromArgumentList(qs->m_qmakeArgs);
- QStringList parsedArgs = removeSpecFromArgumentList(result.second);
-
- if (debug) {
- qDebug()<<"Actual args:"<<actualArgs;
- qDebug()<<"Parsed args:"<<parsedArgs;
- qDebug()<<"Actual spec:"<<actualSpec;
- qDebug()<<"Parsed spec:"<<parsedSpec;
- }
-
- if (actualArgs == parsedArgs) {
- // Specs match exactly
- if (actualSpec == parsedSpec)
- return true;
- // Actual spec is the default one
-// qDebug()<<"AS vs VS"<<actualSpec<<version->mkspec();
- if ((actualSpec == version->mkspec() || actualSpec == "default")
- && (parsedSpec == version->mkspec() || parsedSpec == "default" || parsedSpec.isEmpty()))
- return true;
- }
- }
- }
- }
- return false;
-}
-
/*!
Handle special case were a subproject of the qt directory is opened, and
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 78494cde3f82aa923912005fc6db29fa952c3494..cff0723018ddf22aabb8fb3ab654d7edaf94c929 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -178,70 +178,34 @@ public:
virtual QStringList files(FilesMode fileMode) const;
- //building environment
- ProjectExplorer::Environment environment(ProjectExplorer::BuildConfiguration *configuration) const;
- ProjectExplorer::Environment baseEnvironment(ProjectExplorer::BuildConfiguration *configuration) const;
- void setUserEnvironmentChanges(ProjectExplorer::BuildConfiguration *configuration, const QList<ProjectExplorer::EnvironmentItem> &diff);
- QList<ProjectExplorer::EnvironmentItem> userEnvironmentChanges(ProjectExplorer::BuildConfiguration *configuration) const;
- bool useSystemEnvironment(ProjectExplorer::BuildConfiguration *configuration) const;
- void setUseSystemEnvironment(ProjectExplorer::BuildConfiguration *configuration, bool b);
-
- virtual QString buildDirectory(ProjectExplorer::BuildConfiguration *configuration) const;
// returns the CONFIG variable from the .pro file
QStringList qmakeConfig() const;
- // returns the qtdir (depends on the current QtVersion)
- QString qtDir(ProjectExplorer::BuildConfiguration *configuration) const;
- //returns the qtVersion, if the project is set to use the default qt version, then
- // that is returned
- // to check wheter the project uses the default qt version use qtVersionId
- QtVersion *qtVersion(ProjectExplorer::BuildConfiguration *configuration) const;
-
- // returns the id of the qt version, if the project is using the default qt version
- // this function returns 0
- int qtVersionId(ProjectExplorer::BuildConfiguration *configuration) const;
- //returns the name of the qt version, might be QString::Null, which means default qt version
- // qtVersion is in general the better method to use
- QString qtVersionName(ProjectExplorer::BuildConfiguration *configuration) const;
-
- ProjectExplorer::ToolChain *toolChain(ProjectExplorer::BuildConfiguration *configuration) const;
- void setToolChainType(ProjectExplorer::BuildConfiguration *configuration, ProjectExplorer::ToolChain::ToolChainType type);
- ProjectExplorer::ToolChain::ToolChainType toolChainType(ProjectExplorer::BuildConfiguration *configuration) const;
ProjectExplorer::BuildConfigWidget *createConfigWidget();
QList<ProjectExplorer::BuildConfigWidget*> subConfigWidgets();
- void setQtVersion(ProjectExplorer::BuildConfiguration *configuration, int id);
-
QList<Internal::Qt4ProFileNode *> applicationProFiles() const;
- // Those functions are used in a few places.
- // The drawback is that we shouldn't actually depend on them beeing always there
- // That is generally the stuff that is asked should normally be transfered to
- // Qt4Project *
- // So that we can later enable people to build qt4projects the way they would like
- QMakeStep *qmakeStep(ProjectExplorer::BuildConfiguration *bc) const;
- MakeStep *makeStep(ProjectExplorer::BuildConfiguration *bc) const;
void notifyChanged(const QString &name);
- QString makeCommand(ProjectExplorer::BuildConfiguration *configuration) const;
- QString defaultMakeTarget(ProjectExplorer::BuildConfiguration *configuration) const;
-
// Is called by qmakestep qt4configurationwidget if the settings change
// Informs all Qt4RunConfigurations that their cached values are now invalid
// the Qt4RunConfigurations will update as soon as asked
+
+ // TODO remove
void invalidateCachedTargetInformation();
virtual QByteArray predefinedMacros(const QString &fileName) const;
virtual QStringList includePaths(const QString &fileName) const;
virtual QStringList frameworkPaths(const QString &fileName) const;
- bool compareBuildConfigurationToImportFrom(ProjectExplorer::BuildConfiguration *configuration, const QString &workingDirectory);
-
static QStringList removeSpecFromArgumentList(const QStringList &old);
static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version);
+
+ // TODO can i remove this?
+ void updateActiveRunConfiguration();
signals:
void targetInformationChanged();
- void qtVersionChanged(ProjectExplorer::BuildConfiguration *);
public slots:
void update();
@@ -271,17 +235,12 @@ private:
static void findProFile(const QString& fileName, Internal::Qt4ProFileNode *root, QList<Internal::Qt4ProFileNode *> &list);
static bool hasSubNode(Internal::Qt4PriFileNode *root, const QString &path);
- // called by Qt4ProjectConfigWidget
- // TODO remove once there's a setBuildDirectory call
- void emitBuildDirectoryChanged();
-
QList<Internal::Qt4ProFileNode *> m_applicationProFileChange;
ProjectExplorer::ProjectExplorerPlugin *projectExplorer() const;
void addDefaultBuild();
static QString qmakeVarName(ProjectExplorer::FileType type);
- void updateActiveRunConfiguration();
Qt4Manager *m_manager;
Internal::Qt4ProFileNode *m_rootProjectNode;
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 1a80dc1f1a7969d632ec639393b8bc58e0d70ba3..b069c09a44c067e93ca929b4f10d26c78aabd811 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -34,6 +34,7 @@
#include "qt4project.h"
#include "qt4projectmanagerconstants.h"
#include "qt4projectmanager.h"
+#include "qt4buildconfiguration.h"
#include "ui_qt4projectconfigwidget.h"
#include <coreplugin/icore.h>
@@ -53,9 +54,9 @@ using namespace Qt4ProjectManager::Internal;
Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
: BuildConfigWidget(),
- m_pro(project),
m_buildConfiguration(0)
{
+ Q_UNUSED(project);
QVBoxLayout *vbox = new QVBoxLayout(this);
vbox->setMargin(0);
m_detailsContainer = new Utils::DetailsWidget(this);
@@ -112,9 +113,9 @@ Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
void Qt4ProjectConfigWidget::updateDetails()
{
- QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
+ QtVersion *version = m_buildConfiguration->qtVersion();
QString versionString;
- if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
+ if (m_buildConfiguration->qtVersionId() == 0) {
versionString = tr("Default Qt Version (%1)").arg(version->name());
} else if(version){
versionString = version->name();
@@ -126,8 +127,8 @@ void Qt4ProjectConfigWidget::updateDetails()
"with tool chain <b>%2</b><br>"
"building in <b>%3</b>")
.arg(versionString,
- ProjectExplorer::ToolChain::toolChainName(m_pro->toolChainType(m_buildConfiguration)),
- QDir::toNativeSeparators(m_pro->buildDirectory(m_buildConfiguration))));
+ ProjectExplorer::ToolChain::toolChainName(m_buildConfiguration->toolChainType()),
+ QDir::toNativeSeparators(m_buildConfiguration->buildDirectory())));
}
void Qt4ProjectConfigWidget::manageQtVersions()
@@ -147,7 +148,7 @@ void Qt4ProjectConfigWidget::init(ProjectExplorer::BuildConfiguration *bc)
if (debug)
qDebug() << "Qt4ProjectConfigWidget::init() for"<<bc->displayName();
- m_buildConfiguration = bc;
+ m_buildConfiguration = static_cast<Qt4BuildConfiguration *>(bc);
m_ui->nameLineEdit->setText(m_buildConfiguration->displayName());
setupQtVersionsComboBox();
@@ -156,7 +157,7 @@ void Qt4ProjectConfigWidget::init(ProjectExplorer::BuildConfiguration *bc)
m_ui->shadowBuildCheckBox->setChecked(shadowBuild);
m_ui->shadowBuildDirEdit->setEnabled(shadowBuild);
m_browseButton->setEnabled(shadowBuild);
- m_ui->shadowBuildDirEdit->setPath(m_pro->buildDirectory(m_buildConfiguration));
+ m_ui->shadowBuildDirEdit->setPath(m_buildConfiguration->buildDirectory());
updateImportLabel();
updateToolChainCombo();
updateDetails();
@@ -164,7 +165,7 @@ void Qt4ProjectConfigWidget::init(ProjectExplorer::BuildConfiguration *bc)
void Qt4ProjectConfigWidget::changeConfigName(const QString &newName)
{
- m_pro->setDisplayNameFor(m_buildConfiguration, newName);
+ m_buildConfiguration->project()->setDisplayNameFor(m_buildConfiguration, newName);
}
void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
@@ -180,7 +181,7 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
m_ui->qtVersionComboBox->clear();
m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->name()), 0);
- int qtVersionId = m_pro->qtVersionId(m_buildConfiguration);
+ int qtVersionId = m_buildConfiguration->qtVersionId();
if (qtVersionId == 0) {
m_ui->qtVersionComboBox->setCurrentIndex(0);
@@ -204,7 +205,7 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
void Qt4ProjectConfigWidget::onBeforeBeforeShadowBuildDirBrowsed()
{
- QString initialDirectory = QFileInfo(m_pro->file()->fileName()).absolutePath();
+ QString initialDirectory = QFileInfo(m_buildConfiguration->project()->file()->fileName()).absolutePath();
if (!initialDirectory.isEmpty())
m_ui->shadowBuildDirEdit->setInitialBrowsePathBackup(initialDirectory);
}
@@ -220,7 +221,7 @@ void Qt4ProjectConfigWidget::shadowBuildCheckBoxClicked(bool checked)
else
m_buildConfiguration->setValue("buildDirectory", QVariant(QString::null));
updateDetails();
- m_pro->invalidateCachedTargetInformation();
+ static_cast<Qt4Project *>(m_buildConfiguration->project())->invalidateCachedTargetInformation();
updateImportLabel();
}
@@ -229,9 +230,9 @@ void Qt4ProjectConfigWidget::updateImportLabel()
bool visible = false;
// we only show if we actually have a qmake and makestep
- if (m_pro->qmakeStep(m_buildConfiguration) && m_pro->makeStep(m_buildConfiguration)) {
- QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(m_pro->buildDirectory(m_buildConfiguration));
- QtVersion *version = m_pro->qtVersion(m_buildConfiguration);
+ if (m_buildConfiguration->qmakeStep() && m_buildConfiguration->makeStep()) {
+ QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(m_buildConfiguration->buildDirectory());
+ QtVersion *version = m_buildConfiguration->qtVersion();
// check that there's a makefile
if (!qmakePath.isEmpty()) {
// and that the qmake path is different from the current version
@@ -240,7 +241,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
visible = true;
} else {
// check that the qmake flags, arguments match
- visible = !m_pro->compareBuildConfigurationToImportFrom(m_buildConfiguration, m_pro->buildDirectory(m_buildConfiguration));
+ visible = !m_buildConfiguration->compareBuildConfigurationToImportFrom(m_buildConfiguration->buildDirectory());
}
} else {
visible = false;
@@ -260,15 +261,15 @@ void Qt4ProjectConfigWidget::shadowBuildLineEditTextChanged()
// offer to import it
updateImportLabel();
- m_pro->invalidateCachedTargetInformation();
+ static_cast<Qt4Project *>(m_buildConfiguration->project())->invalidateCachedTargetInformation();
updateDetails();
}
void Qt4ProjectConfigWidget::importLabelClicked()
{
- if (!m_pro->qmakeStep(m_buildConfiguration) || !m_pro->makeStep(m_buildConfiguration))
+ if (!m_buildConfiguration->qmakeStep() || !m_buildConfiguration->makeStep())
return;
- QString directory = m_pro->buildDirectory(m_buildConfiguration);
+ QString directory = m_buildConfiguration->buildDirectory();
if (!directory.isEmpty()) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(directory);
if (!qmakePath.isEmpty()) {
@@ -293,12 +294,12 @@ void Qt4ProjectConfigWidget::importLabelClicked()
}
// So we got all the information now apply it...
- m_pro->setQtVersion(m_buildConfiguration, version->uniqueId());
+ m_buildConfiguration->setQtVersion(version->uniqueId());
// Combo box will be updated at the end
- QMakeStep *qmakeStep = m_pro->qmakeStep(m_buildConfiguration);
+ QMakeStep *qmakeStep = m_buildConfiguration->qmakeStep();
qmakeStep->setQMakeArguments(additionalArguments);
- MakeStep *makeStep = m_pro->makeStep(m_buildConfiguration);
+ MakeStep *makeStep = m_buildConfiguration->makeStep();
m_buildConfiguration->setValue("buildConfiguration", int(qmakeBuildConfig));
// Adjust command line arguments, this is ugly as hell
@@ -335,10 +336,10 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
QtVersionManager *vm = QtVersionManager::instance();
bool isValid = vm->version(newQtVersion)->isValid();
m_ui->invalidQtWarningLabel->setVisible(!isValid);
- if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
- m_pro->setQtVersion(m_buildConfiguration, newQtVersion);
+ if (newQtVersion != m_buildConfiguration->qtVersionId()) {
+ m_buildConfiguration->setQtVersion(newQtVersion);
updateToolChainCombo();
- m_pro->update();
+ static_cast<Qt4Project *>(m_buildConfiguration->project())->update();
}
updateDetails();
}
@@ -346,19 +347,19 @@ void Qt4ProjectConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString
void Qt4ProjectConfigWidget::updateToolChainCombo()
{
m_ui->toolChainComboBox->clear();
- QList<ProjectExplorer::ToolChain::ToolChainType> toolchains = m_pro->qtVersion(m_buildConfiguration)->possibleToolChainTypes();
+ QList<ProjectExplorer::ToolChain::ToolChainType> toolchains = m_buildConfiguration->qtVersion()->possibleToolChainTypes();
using namespace ProjectExplorer;
foreach (ToolChain::ToolChainType toolchain, toolchains) {
m_ui->toolChainComboBox->addItem(ToolChain::toolChainName(toolchain), qVariantFromValue(toolchain));
}
m_ui->toolChainComboBox->setEnabled(toolchains.size() > 1);
- setToolChain(toolchains.indexOf(m_pro->toolChainType(m_buildConfiguration)));
+ setToolChain(toolchains.indexOf(m_buildConfiguration->toolChainType()));
}
void Qt4ProjectConfigWidget::selectToolChain(int index)
{
setToolChain(index);
- m_pro->update();
+ static_cast<Qt4Project *>(m_buildConfiguration->project())->update();
}
void Qt4ProjectConfigWidget::setToolChain(int index)
@@ -366,7 +367,7 @@ void Qt4ProjectConfigWidget::setToolChain(int index)
ProjectExplorer::ToolChain::ToolChainType selectedToolChainType =
m_ui->toolChainComboBox->itemData(index,
Qt::UserRole).value<ProjectExplorer::ToolChain::ToolChainType>();
- m_pro->setToolChainType(m_buildConfiguration, selectedToolChainType);
+ m_buildConfiguration->setToolChainType(selectedToolChainType);
if (m_ui->toolChainComboBox->currentIndex() != index)
m_ui->toolChainComboBox->setCurrentIndex(index);
updateDetails();
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
index 4abbee93ed86f9ce18aabd2e397fdb0199256a83..2f6171a9ad723d96114ae78d6e064b49e4165f07 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.h
@@ -39,6 +39,7 @@ namespace Qt4ProjectManager {
class Qt4Project;
namespace Internal {
+class Qt4BuildConfiguration;
namespace Ui {
class Qt4ProjectConfigWidget;
@@ -72,8 +73,7 @@ private:
void setToolChain(int index);
Ui::Qt4ProjectConfigWidget *m_ui;
QAbstractButton *m_browseButton;
- Qt4Project *m_pro; // TODO remove
- ProjectExplorer::BuildConfiguration *m_buildConfiguration;
+ Qt4BuildConfiguration *m_buildConfiguration;
Utils::DetailsWidget *m_detailsContainer;
};
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 8994ee9bd2e6bc574301a84612662d6137e801a4..93dcffe431f99f26dc33d5e390e329bbbbd495d6 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -33,6 +33,7 @@
#include "profilereader.h"
#include "qt4nodes.h"
#include "qt4project.h"
+#include "qt4buildconfiguration.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
@@ -96,9 +97,9 @@ QString Qt4RunConfiguration::type() const
bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configuration) const
{
#if defined(QTCREATOR_WITH_S60) || defined(QTCREATOR_WITH_MAEMO)
- Qt4Project *pro = qobject_cast<Qt4Project*>(project());
- QTC_ASSERT(pro, return false);
- ProjectExplorer::ToolChain::ToolChainType type = pro->toolChainType(configuration);
+ Qt4BuildConfiguration *qt4bc = qobject_cast<Qt4BuildConfiguration *>(configuration);
+ QTC_ASSERT(qt4bc, return false);
+ ProjectExplorer::ToolChain::ToolChainType type = qt4bc->toolChainType();
#ifdef QTCREATOR_WITH_S60
if (type == ProjectExplorer::ToolChain::WINSCW
|| type == ProjectExplorer::ToolChain::GCCE
@@ -479,7 +480,7 @@ ProjectExplorer::Environment Qt4RunConfiguration::baseEnvironment() const
} else if (m_baseEnvironmentBase == Qt4RunConfiguration::SystemEnvironmentBase) {
env = ProjectExplorer::Environment::systemEnvironment();
} else if (m_baseEnvironmentBase == Qt4RunConfiguration::BuildEnvironmentBase) {
- env = project()->environment(project()->activeBuildConfiguration());
+ env = project()->activeBuildConfiguration()->environment();
}
if (m_isUsingDyldImageSuffix) {
env.set("DYLD_IMAGE_SUFFIX", "_debug");
@@ -554,7 +555,7 @@ void Qt4RunConfiguration::updateTarget()
if (m_cachedTargetInformationValid)
return;
//qDebug()<<"updateTarget";
- Qt4Project *pro = static_cast<Qt4Project *>(project());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
Qt4PriFileNode * priFileNode = static_cast<Qt4Project *>(project())->rootProjectNode()->findProFileFor(m_proFilePath);
if (!priFileNode) {
m_workingDir = QString::null;
@@ -565,11 +566,11 @@ void Qt4RunConfiguration::updateTarget()
}
ProFileReader *reader = priFileNode->createProFileReader();
reader->setCumulative(false);
- reader->setQtVersion(pro->qtVersion(pro->activeBuildConfiguration()));
+ reader->setQtVersion(qt4bc->qtVersion());
// Find out what flags we pass on to qmake, this code is duplicated in the qmake step
- QtVersion::QmakeBuildConfigs defaultBuildConfiguration = pro->qtVersion(pro->activeBuildConfiguration())->defaultBuildConfig();
- QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(pro->activeBuildConfiguration()->value("buildConfiguration").toInt());
+ QtVersion::QmakeBuildConfigs defaultBuildConfiguration = qt4bc->qtVersion()->defaultBuildConfig();
+ QtVersion::QmakeBuildConfigs projectBuildConfiguration = QtVersion::QmakeBuildConfig(qt4bc->value("buildConfiguration").toInt());
QStringList addedUserConfigArguments;
QStringList removedUserConfigArguments;
if ((defaultBuildConfiguration & QtVersion::BuildAll) && !(projectBuildConfiguration & QtVersion::BuildAll))
@@ -592,7 +593,7 @@ void Qt4RunConfiguration::updateTarget()
// Extract data
QDir baseProjectDirectory = QFileInfo(project()->file()->fileName()).absoluteDir();
QString relSubDir = baseProjectDirectory.relativeFilePath(QFileInfo(m_proFilePath).path());
- QDir baseBuildDirectory = project()->buildDirectory(project()->activeBuildConfiguration());
+ QDir baseBuildDirectory = project()->activeBuildConfiguration()->buildDirectory();
QString baseDir = baseBuildDirectory.absoluteFilePath(relSubDir);
//qDebug()<<relSubDir<<baseDir;
@@ -653,8 +654,8 @@ void Qt4RunConfiguration::invalidateCachedTargetInformation()
QString Qt4RunConfiguration::dumperLibrary() const
{
- Qt4Project *pro = qobject_cast<Qt4Project *>(project());
- QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ QtVersion *version = qt4bc->qtVersion();
if (version)
return version->debuggingHelperLibrary();
else
@@ -663,8 +664,8 @@ QString Qt4RunConfiguration::dumperLibrary() const
QStringList Qt4RunConfiguration::dumperLibraryLocations() const
{
- Qt4Project *pro = qobject_cast<Qt4Project *>(project());
- QtVersion *version = pro->qtVersion(pro->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ QtVersion *version = qt4bc->qtVersion();
if (version)
return version->debuggingHelperLibraryLocations();
else
@@ -685,8 +686,8 @@ Qt4RunConfiguration::BaseEnvironmentBase Qt4RunConfiguration::baseEnvironmentBas
}
ProjectExplorer::ToolChain::ToolChainType Qt4RunConfiguration::toolChainType() const
{
- Qt4Project *pro = qobject_cast<Qt4Project *>(project());
- return pro->toolChainType(pro->activeBuildConfiguration());
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(project()->activeBuildConfiguration());
+ return qt4bc->toolChainType();
}
///
diff --git a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
index 62a0f1755352b9d56e910237178a447c2ef16982..14b5982ca4550cbcec7ccecb75a9d0a8f8d962d5 100644
--- a/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
+++ b/src/plugins/qt4projectmanager/qtuicodemodelsupport.cpp
@@ -1,4 +1,5 @@
#include "qtuicodemodelsupport.h"
+#include "qt4buildconfiguration.h"
#include "qt4project.h"
#include <designer/formwindoweditor.h>
@@ -88,9 +89,10 @@ void Qt4UiCodeModelSupport::setFileName(const QString &name)
bool Qt4UiCodeModelSupport::runUic(const QString &ui) const
{
+ Qt4BuildConfiguration *qt4bc = static_cast<Qt4BuildConfiguration *>(m_project->activeBuildConfiguration());
QProcess uic;
- uic.setEnvironment(m_project->environment(m_project->activeBuildConfiguration()).toStringList());
- uic.start(m_project->qtVersion(m_project->activeBuildConfiguration())->uicCommand(), QStringList(), QIODevice::ReadWrite);
+ uic.setEnvironment(m_project->activeBuildConfiguration()->environment().toStringList());
+ uic.start(qt4bc->qtVersion()->uicCommand(), QStringList(), QIODevice::ReadWrite);
uic.waitForStarted();
uic.write(ui.toUtf8());
uic.closeWriteChannel();