diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-17 11:51:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-17 13:45:41 +0200 |
| commit | 6fcc8e7ffa5a09b912f5ca74cb8b4cf979686b47 (patch) | |
| tree | 6a8006003895c1f73b4e324f9b04397ae8a03960 | |
| parent | 8f7dd0001c45e6e1bfada1944867a3489d62351b (diff) | |
remove unused property qtModulePrefix from Qt modules
This was used to calculate include and library names.
That's done in setup-qt now.
Change-Id: Ief2b17e9fdf65e829dc563dac49e70d8dcbaebee
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -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/phonon.qbs | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index bb8cceedc..064d47128 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -138,11 +138,6 @@ static void replaceSpecialValues(QByteArray *content, const Profile &profile, content->replace("@defaultQpaPlugin@", utf8JSLiteral(defaultQpaPlugin(profile, module, qtEnvironment))); } - if (!module.modulePrefix.isEmpty()) { - if (!propertiesString.isEmpty()) - propertiesString += "\n "; - propertiesString += "qtModulePrefix: " + utf8JSLiteral(module.modulePrefix); - } if (module.isStaticLibrary) { if (!propertiesString.isEmpty()) propertiesString += "\n "; diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index c7548012b..0aba7d398 100644 --- a/src/lib/qtprofilesetup/templates/QtModule.qbs +++ b/src/lib/qtprofilesetup/templates/QtModule.qbs @@ -6,7 +6,6 @@ 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 diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs index 46a3371db..ea8434783 100644 --- a/src/lib/qtprofilesetup/templates/phonon.qbs +++ b/src/lib/qtprofilesetup/templates/phonon.qbs @@ -4,7 +4,6 @@ import '../QtModule.qbs' as QtModule QtModule { qtModuleName: "phonon" Depends { name: "Qt"; submodules: ['core'] } - qtModulePrefix: '' cpp.defines: @defines@ cpp.includePaths: @includes@ } |