diff options
Diffstat (limited to 'src/libs/cplusplus')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.cpp | 2 | ||||
| -rw-r--r-- | src/libs/cplusplus/Macro.h | 5 | ||||
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 607dd55364..c948776c4b 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -87,7 +87,7 @@ void FastPreprocessor::macroAdded(const Macro ¯o) static const Macro revision(const Snapshot &s, const Macro &m) { - if (Document::Ptr d = s.document(m.fileName())) { + if (Document::Ptr d = s.document(m.filePath())) { Macro newMacro(m); newMacro.setFileRevision(d->revision()); return newMacro; diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h index 603dca0ccd..ca71d10d4c 100644 --- a/src/libs/cplusplus/Macro.h +++ b/src/libs/cplusplus/Macro.h @@ -27,6 +27,8 @@ #include <cplusplus/CPlusPlusForwardDeclarations.h> +#include <utils/filepath.h> + #include <QByteArray> #include <QVector> #include <QString> @@ -69,6 +71,9 @@ public: const QString &fileName() const { return _fileName; } + Utils::FilePath filePath() const + { return Utils::FilePath::fromString(_fileName); } + void setFileName(const QString &fileName) { _fileName = fileName; } diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 69a5a0b353..a846c46840 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -2014,7 +2014,7 @@ void Preprocessor::handleIfDefDirective(bool checkUndefined, PPToken *tk) // the macro is a feature constraint(e.g. QT_NO_XXX) if (checkUndefined && macroName.startsWith("QT_NO_")) { - if (macro->fileName() == configurationFileName().pathView()) { + if (macro->filePath() == configurationFileName()) { // and it' defined in a pro file (e.g. DEFINES += QT_NO_QOBJECT) value = false; // take the branch |