diff options
| author | Thomas Epting <thomas.epting@stryker.com> | 2014-05-14 07:52:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-16 14:00:34 +0200 |
| commit | aab816ce003dc4c4d03f7f6be2aa84c0e730c3da (patch) | |
| tree | 38082a8119cc7217358a48381edf5d3ef9acae2c /src/lib/qtprofilesetup/templates/QtModule.qbs | |
| parent | f01c91d2804deae604c46bf455864e32fce3e755 (diff) | |
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 <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/qtprofilesetup/templates/QtModule.qbs')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
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 |