diff options
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4runconfiguration.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp index 3953e6d9ba..3ff03bcc28 100644 --- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp @@ -41,7 +41,6 @@ #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> #include <coreplugin/variablemanager.h> -#include <extensionsystem/pluginmanager.h> #include <projectexplorer/buildstep.h> #include <utils/qtcassert.h> @@ -182,8 +181,7 @@ void Qt4RunConfiguration::updateCachedValues() ProFileReader *reader = static_cast<Qt4Project *>(project())->createProFileReader(); if (!reader->readProFile(m_proFilePath)) { delete reader; - Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>(); - core->messageManager()->printToOutputPane(QString("Could not parse %1. The Qt4 run configuration %2 can not be started.").arg(m_proFilePath).arg(name())); + Core::ICore::instance()->messageManager()->printToOutputPane(QString("Could not parse %1. The Qt4 run configuration %2 can not be started.").arg(m_proFilePath).arg(name())); return; } @@ -233,7 +231,7 @@ QString Qt4RunConfiguration::resolveVariables(const QString &buildConfiguration, QString relSubDir = QFileInfo(project()->file()->fileName()).absoluteDir().relativeFilePath(m_srcDir); QString baseDir = QDir(project()->buildDirectory(buildConfiguration)).absoluteFilePath(relSubDir); - Core::VariableManager *vm = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->variableManager(); + Core::VariableManager *vm = Core::ICore::instance()->variableManager(); if (!vm) return QString(); QString dest; |