summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppmodelmanagerinterface.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-21 12:59:48 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-10-22 15:58:54 +0200
commite79d4ed2e1aa079884179e04f47cac7ffb29d2f8 (patch)
tree5b9c5fdfac0500b1fe3805fc61121e442e2160f4 /src/plugins/cpptools/cppmodelmanagerinterface.cpp
parentf5fa022de5f03618a1ea172b548e9b265734d83a (diff)
downloadqt-creator-e79d4ed2e1aa079884179e04f47cac7ffb29d2f8.tar.gz
CppEditor: Follow Symbol Under Cursor opens the preprocessor dialog
... when invoked on a macro that is defined inside that dialog. Change-Id: I419c6675d70cfb8dd174f6a33f502b4c584baa3a Reviewed-by: David Schulz <david.schulz@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
-rw-r--r--src/plugins/cpptools/cppmodelmanagerinterface.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
index e2a7c6f10e..31f1b55e18 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.cpp
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
@@ -175,6 +175,11 @@ static CppModelManagerInterface *g_instance = 0;
const QString CppModelManagerInterface::configurationFileName()
{ return CPlusPlus::Preprocessor::configurationFileName; }
+const QString CppModelManagerInterface::editorConfigurationFileName()
+{
+ return QLatin1String("<per-editor-defines>");
+}
+
CppModelManagerInterface::CppModelManagerInterface(QObject *parent)
: QObject(parent)
{