From aab816ce003dc4c4d03f7f6be2aa84c0e730c3da Mon Sep 17 00:00:00 2001 From: Thomas Epting Date: Wed, 14 May 2014 07:52:40 +0200 Subject: Fixed handling of Qt4 Phonon submodule in qtprofilesetup. Considered the different naming conventions of the Phonon module and associated paths and libraries (Phonon vs. QtXxxx). Change-Id: Iedf7501b35685f30379a8145440fc751a6cde91d Reviewed-by: Christian Kandeler Reviewed-by: Joerg Bornemann --- src/lib/qtprofilesetup/qtprofilesetup.cpp | 2 ++ src/lib/qtprofilesetup/templates.qrc | 1 + src/lib/qtprofilesetup/templates/QtModule.qbs | 5 +++-- src/lib/qtprofilesetup/templates/phonon.qbs | 8 ++++++++ src/lib/qtprofilesetup/templates/qtfunctions.js | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/lib/qtprofilesetup/templates/phonon.qbs diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index dca51c169..31b6950a1 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -293,6 +293,8 @@ static void createModules(Profile &profile, Settings *settings, copyTemplateFile(QLatin1String("moc.js"), qbsQtModuleDir, profile.name()); } else if (module.qbsName == QLatin1String("gui")) { copyTemplateFile(QLatin1String("gui.qbs"), qbsQtModuleDir, profile.name()); + } else if (module.qbsName == QLatin1String("phonon")) { + copyTemplateFile(QLatin1String("phonon.qbs"), qbsQtModuleDir, profile.name()); } else { copyTemplateFile(QLatin1String("module.qbs"), qbsQtModuleDir, profile.name()); QFile moduleFile(qbsQtModuleDir + QLatin1String("/module.qbs")); diff --git a/src/lib/qtprofilesetup/templates.qrc b/src/lib/qtprofilesetup/templates.qrc index 66c228e5f..bc326c947 100644 --- a/src/lib/qtprofilesetup/templates.qrc +++ b/src/lib/qtprofilesetup/templates.qrc @@ -2,6 +2,7 @@ templates/core.qbs templates/gui.qbs + templates/phonon.qbs templates/module.qbs templates/QtModule.qbs templates/moc.js diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index 4694dbcb1..2b9b92df4 100644 --- a/src/lib/qtprofilesetup/templates/QtModule.qbs +++ b/src/lib/qtprofilesetup/templates/QtModule.qbs @@ -7,13 +7,14 @@ Module { Depends { name: "Qt.core" } property string qtModuleName + property string qtModulePrefix: 'Qt' property path binPath: Qt.core.binPath property path incPath: Qt.core.incPath property path libPath: Qt.core.libPath property string qtLibInfix: Qt.core.libInfix property string repository: Qt.core.versionMajor === 5 ? 'qtbase' : undefined - property string includeDirName: 'Qt' + qtModuleName - property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix, Qt.core, qbs) + property string includeDirName: qtModulePrefix + qtModuleName + property string internalLibraryName: QtFunctions.getQtLibraryName(qtModuleName + qtLibInfix, Qt.core, qbs, qtModulePrefix) property string qtVersion: Qt.core.version property bool hasLibrary: true diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs new file mode 100644 index 000000000..aa191fbd7 --- /dev/null +++ b/src/lib/qtprofilesetup/templates/phonon.qbs @@ -0,0 +1,8 @@ +import qbs 1.0 +import '../QtModule.qbs' as QtModule + +QtModule { + qtModuleName: "phonon" + Depends { name: "Qt"; submodules: ['core'] } + qtModulePrefix: '' +} diff --git a/src/lib/qtprofilesetup/templates/qtfunctions.js b/src/lib/qtprofilesetup/templates/qtfunctions.js index f50f847b4..144955d5e 100644 --- a/src/lib/qtprofilesetup/templates/qtfunctions.js +++ b/src/lib/qtprofilesetup/templates/qtfunctions.js @@ -18,9 +18,9 @@ function getPlatformLibraryName(name, qtcore, qbs) return libName; } -function getQtLibraryName(qtModule, qtcore, qbs) +function getQtLibraryName(qtModule, qtcore, qbs, prefix) { - var libName = "Qt"; + var libName = (prefix === undefined) ? "Qt" : prefix; if (qtcore.versionMajor >= 5 && !qtcore.frameworkBuild) libName += qtcore.versionMajor; libName += qtModule; -- cgit v1.2.3 From c7a7e03046309a6be11689b62518577bf8c69a61 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 May 2014 17:57:42 +0200 Subject: MSVC: do not use deprecated input.fileName property Change-Id: I3b8528765295dcb38fc651a83bf7b093dc2c6a53 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/windows-msvc.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 1896eb14c..cd4ac01a2 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -167,7 +167,7 @@ CppModule { var result = [] for (var i in inputs.staticlibrary) { var lib = inputs.staticlibrary[i] - result.push(lib.fileName) + result.push(lib.filePath) var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries') result = result.uniqueConcat(impliedLibs); } -- cgit v1.2.3