diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
| commit | c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a (patch) | |
| tree | c2204d569f87e28bc2e48a763650e1b99871f0ed /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
| parent | 328daa9c5aa9a438a0187bb28e238396451f8548 (diff) | |
| parent | b889bb1608badceed0dc1175f3322ea8015f8924 (diff) | |
| download | qt-creator-c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
src/plugins/qnx/qnxutils.cpp
Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.cpp | 5 |
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) { |