diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-12-19 11:35:22 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-12-19 11:40:29 +0100 |
| commit | 3962dd412ed5e63203a28fcc0a656fb2b81dc6a3 (patch) | |
| tree | d5f6d32b985b5b7fa46b2137b435847dd4ee96d6 /src/lib/corelib/language/resolvedfilecontext.cpp | |
| parent | 1b3fcf9ffc3ba08610d6db5a234555ad79d36511 (diff) | |
| parent | 86e872bd99184fe862bfe30ef43acd9806e34bc5 (diff) | |
Merge branch '1.3' into master
Conflicts:
share/qbs/modules/cpp/gcc.js
Change-Id: I3bd9d7fe03a76c7439650d78c94255db56ecab75
Diffstat (limited to 'src/lib/corelib/language/resolvedfilecontext.cpp')
| -rw-r--r-- | src/lib/corelib/language/resolvedfilecontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/language/resolvedfilecontext.cpp b/src/lib/corelib/language/resolvedfilecontext.cpp index 40c2e63d5..703497fc9 100644 --- a/src/lib/corelib/language/resolvedfilecontext.cpp +++ b/src/lib/corelib/language/resolvedfilecontext.cpp @@ -73,8 +73,8 @@ void ResolvedFileContext::store(PersistentPool &pool) const bool operator==(const ResolvedFileContext &a, const ResolvedFileContext &b) { return a.filePath() == b.filePath() - && a.jsExtensions() == b.jsExtensions() - && a.jsImports() == b.jsImports(); + && a.jsExtensions().toSet() == b.jsExtensions().toSet() + && a.jsImports().toSet() == b.jsImports().toSet(); } } // namespace Internal |