diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-01-17 08:45:28 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-01-17 12:41:18 +0100 |
commit | f7b0dcb8e965a8a152738a507118c3dc4d70401c (patch) | |
tree | c93d1b620185ec05b6f34065d2c200a93cf73ad2 /src | |
parent | 712c5474b08af11b34c37b545f4e2b7baab27a9f (diff) | |
parent | d9b6a84900552b55117c8034743964726c2bc102 (diff) |
Merge remote-tracking branch 'origin/1.10'
Conflicts:
src/lib/qtprofilesetup/qtprofilesetup.cpp
src/lib/qtprofilesetup/templates/QtModule.qbs
src/lib/qtprofilesetup/templates/core.qbs
Change-Id: I342608a47f1a90b53eb12cc14fc3ff116063d15f
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/qtprofilesetup/qtmoduleinfo.cpp | 5 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 5 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 1 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 6 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/templates/phonon.qbs | 19 |
5 files changed, 33 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index fa97f1632..50a2f5924 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -107,6 +107,8 @@ QtModuleInfo::QtModuleInfo(const QString &name, const QString &qbsName, const QS QString QtModuleInfo::moduleNameWithoutPrefix() const { + if (name == QLatin1String("Phonon")) + return QLatin1String("phonon"); if (modulePrefix.isEmpty() && name.startsWith(QLatin1String("Qt"))) return name.mid(2); // Strip off "Qt". if (name.startsWith(modulePrefix)) @@ -140,7 +142,8 @@ QString QtModuleInfo::libraryBaseName(const QtEnvironment &qtEnvironment, // Some modules use a different naming scheme, so it doesn't get boring. const bool libNameBroken = name == QLatin1String("Enginio") - || name == QLatin1String("DataVisualization"); + || name == QLatin1String("DataVisualization") + || name == QLatin1String("Phonon"); QString libName = modulePrefix.isEmpty() && !libNameBroken ? QLatin1String("Qt") : modulePrefix; if (qtEnvironment.qtMajorVersion >= 5 && !isFramework(qtEnvironment) && !libNameBroken) diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 824b36838..c4ac50a26 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -386,6 +386,11 @@ static QStringList extractQbsArchs(const QtModuleInfo &module, const QtEnvironme QString qbsArch = canonicalArchitecture(qtEnv.architecture); if (qbsArch == QLatin1String("arm") && qtEnv.mkspecPath.contains(QLatin1String("android"))) qbsArch = QLatin1String("armv7a"); + + // Qt4 has "QT_ARCH = windows" in qconfig.pri for both MSVC and mingw. + if (qbsArch == QLatin1String("windows")) + return QStringList(); + return QStringList { qbsArch }; } diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index cd7f57cba..56f80de6a 100644 --- a/src/lib/qtprofilesetup/templates/QtModule.qbs +++ b/src/lib/qtprofilesetup/templates/QtModule.qbs @@ -4,6 +4,7 @@ import qbs.FileInfo Module { condition: (qbs.targetPlatform === targetPlatform || isCombinedUIKitBuild) && (!qbs.architecture + || architectures.length === 0 || architectures.contains(qbs.architecture) || !hasLibrary) readonly property bool isCombinedUIKitBuild: ["ios", "tvos", "watchos"].contains(targetPlatform) diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index f18ee40b3..783fffe7e 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -8,8 +8,10 @@ import "moc.js" as Moc import "qdoc.js" as Qdoc Module { - condition: (!qbs.architecture || architectures.contains(qbs.architecture)) && - (qbs.targetPlatform === targetPlatform || isCombinedUIKitBuild) + condition: (qbs.targetPlatform === targetPlatform || isCombinedUIKitBuild) + && (!qbs.architecture + || architectures.length === 0 + || architectures.contains(qbs.architecture) || !hasLibrary) readonly property bool isCombinedUIKitBuild: ["ios", "tvos", "watchos"].contains(targetPlatform) && ["x86", "x86_64"].contains(qbs.architecture) diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs index ea8434783..34bd51d9e 100644 --- a/src/lib/qtprofilesetup/templates/phonon.qbs +++ b/src/lib/qtprofilesetup/templates/phonon.qbs @@ -4,6 +4,25 @@ import '../QtModule.qbs' as QtModule QtModule { qtModuleName: "phonon" Depends { name: "Qt"; submodules: ['core'] } + + architecture: @arch@ + hasLibrary: @has_library@ + staticLibsDebug: @staticLibsDebug@ + staticLibsRelease: @staticLibsRelease@ + dynamicLibsDebug: @dynamicLibsDebug@ + dynamicLibsRelease: @dynamicLibsRelease@ + linkerFlagsDebug: @linkerFlagsDebug@ + linkerFlagsRelease: @linkerFlagsRelease@ + frameworksDebug: @frameworksDebug@ + frameworksRelease: @frameworksRelease@ + frameworkPathsDebug: @frameworkPathsDebug@ + frameworkPathsRelease: @frameworkPathsRelease@ + libNameForLinkerDebug: @libNameForLinkerDebug@ + libNameForLinkerRelease: @libNameForLinkerRelease@ + libFilePathDebug: @libFilePathDebug@ + libFilePathRelease: @libFilePathRelease@ cpp.defines: @defines@ cpp.includePaths: @includes@ + cpp.libraryPaths: @libraryPaths@ + @special_properties@ } |