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 | |
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')
-rw-r--r-- | src/lib/corelib/language/jsimports.h | 2 | ||||
-rw-r--r-- | src/lib/corelib/language/resolvedfilecontext.cpp | 4 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/corelib/language/jsimports.h b/src/lib/corelib/language/jsimports.h index 089dcabc3..5a0d13f66 100644 --- a/src/lib/corelib/language/jsimports.h +++ b/src/lib/corelib/language/jsimports.h @@ -32,6 +32,7 @@ #define QBS_JSIMPORTS_H #include <tools/codelocation.h> +#include <QHash> #include <QSet> #include <QStringList> @@ -52,6 +53,7 @@ public: QStringList filePaths; CodeLocation location; }; +inline uint qHash(const JsImport &jsi) { return qHash(jsi.location.toString()); } typedef QList<JsImport> JsImports; 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 diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index 4ae256f8d..39aef9e5f 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -239,8 +239,13 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, const bool isMingw = qtEnv.mkspecName.startsWith(QLatin1String("win")) && qtEnv.mkspecName.contains(QLatin1String("g++")); libFilePath = libDir; - if (isMingw) + + // QMAKE_PRL_TARGET has a "lib" prefix, except for mingw. + // Of course, the exception has an exception too: For static libs, mingw *does* + // have the "lib" prefix. TODO: Shoot the people responsible for this. + if (isMingw && !isStaticLibrary) libFilePath += QLatin1String("lib"); + libFilePath += QString::fromLatin1(simplifiedLine.mid(equalsOffset + 1).trimmed()); if (isNonStaticQt4OnWindows) libFilePath += QString::number(4); // This is *not* part of QMAKE_PRL_TARGET... |