summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/FastPreprocessor.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-11-27 12:11:46 +0100
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2014-12-17 14:32:17 +0100
commita48adcf9be144eff9f22f30195e834f869fe19b4 (patch)
treee80ea9ea39345dbdeb060a04b95b1c46919396cc /src/libs/cplusplus/FastPreprocessor.cpp
parenta8ece5e9b0b92b36a4b513696afcc8ca6781e447 (diff)
downloadqt-creator-a48adcf9be144eff9f22f30195e834f869fe19b4.tar.gz
C++: handle case-insensitive file names in the CPlusPlus::Snapshot
... by keying on Utils::FileName Task-number: QTCREATORBUG-12390 Change-Id: Ia98afb5a9160a7fd9225a2f9e02539ff3c35ae86 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.cpp')
-rw-r--r--src/libs/cplusplus/FastPreprocessor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index 1590bc1faa..e6ef1d37f7 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -53,8 +53,8 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source)
_merged.insert(fileName);
for (Snapshot::const_iterator i = _snapshot.begin(), ei = _snapshot.end(); i != ei; ++i) {
- if (isInjectedFile(i.key()))
- mergeEnvironment(i.key());
+ if (isInjectedFile(i.key().toString()))
+ mergeEnvironment(i.key().toString());
}
foreach (const Document::Include &i, doc->resolvedIncludes())