diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index dfc354aea0ebe5707af55960d2c8b5e751384243..6a253e484a072947ad70160b0ef9648ee8e73034 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -2520,7 +2520,7 @@ QString EditorManager::windowTitleVcsTopic() void EditorManager::updateVariable(const QByteArray &variable) { - if (VariableManager::instance()->isFileVariable(variable, kCurrentDocumentPrefix)) { + if (VariableManager::isFileVariable(variable, kCurrentDocumentPrefix)) { QString value; IDocument *document = currentDocument(); if (document) { diff --git a/src/plugins/coreplugin/variablemanager.cpp b/src/plugins/coreplugin/variablemanager.cpp index 06146712ae9377f4b7153542ac938f882bef7d00..d548add3d8a10c44285629bf31d6c8f6c23bc7f3 100644 --- a/src/plugins/coreplugin/variablemanager.cpp +++ b/src/plugins/coreplugin/variablemanager.cpp @@ -276,7 +276,7 @@ Utils::AbstractMacroExpander *VariableManager::macroExpander() * Returns the variable manager instance, for connecting to signals. All other methods are static * and should be called as class methods, not through the instance. */ -VariableManager *VariableManager::instance() +QObject *VariableManager::instance() { return variableManagerInstance; } diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h index 5649820e8e1068d62175fb1ec75d09da59ea9218..927747df95b76b08434801e53fb3d7fe0f2e91b1 100644 --- a/src/plugins/coreplugin/variablemanager.h +++ b/src/plugins/coreplugin/variablemanager.h @@ -50,7 +50,7 @@ class CORE_EXPORT VariableManager : public QObject Q_OBJECT public: - static VariableManager *instance(); + static QObject *instance(); static void insert(const QByteArray &variable, const QString &value); static bool remove(const QByteArray &variable); diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 5e45390f81c9a0415d0c8be1714225d077d14318..c1f16ec3ee7d6fb7ab3dc46e5b8b6578a2c96281 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -117,18 +117,18 @@ void QtSupportPlugin::updateVariable(const QByteArray &variable) ProjectExplorer::Project *project = ProjectExplorer::ProjectExplorerPlugin::currentProject(); if (!project || !project->activeTarget()) { - Core::VariableManager::instance()->remove(variable); + Core::VariableManager::remove(variable); return; } const BaseQtVersion *qtVersion = QtKitInformation::qtVersion(project->activeTarget()->kit()); if (!qtVersion) { - Core::VariableManager::instance()->remove(variable); + Core::VariableManager::remove(variable); return; } QString value = qtVersion->qmakeProperty(variable == kHostBins ? "QT_HOST_BINS" : "QT_INSTALL_BINS"); - Core::VariableManager::instance()->insert(variable, value); + Core::VariableManager::insert(variable, value); } Q_EXPORT_PLUGIN(QtSupportPlugin)