aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-17 14:07:56 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-17 13:53:22 +0000
commit0ba653daf4661f16d3e4e644df60424c24f81862 (patch)
tree69aa3b73635d29a9e3026a19a0da9aa507b6aa89 /src
parentf7b0dcb8e965a8a152738a507118c3dc4d70401c (diff)
Qt templates: Remove phonon.qbs
This is just a generic module with no special contents. Change-Id: Ifa123d0c3ab07bdaab3252cd96ce6d68f2d74034 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp2
-rw-r--r--src/lib/qtprofilesetup/templates.qrc1
-rw-r--r--src/lib/qtprofilesetup/templates/phonon.qbs28
3 files changed, 0 insertions, 31 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index c4ac50a26..63a51838c 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -570,8 +570,6 @@ static void createModules(Profile &profile, Settings *settings,
qbsQtModuleBaseDir + QLatin1Char('/') + qmlcacheStr, profile,
qtEnvironment, &allFiles);
}
- } else if (module.qbsName == QLatin1String("phonon")) {
- moduleTemplateFileName = QLatin1String("phonon.qbs");
} else if (module.qbsName == QLatin1String("quick")) {
moduleTemplateFileName = QLatin1String("quick.qbs");
copyTemplateFile(QLatin1String("quick.js"), qbsQtModuleDir, profile,
diff --git a/src/lib/qtprofilesetup/templates.qrc b/src/lib/qtprofilesetup/templates.qrc
index 5257eccec..3c6922862 100644
--- a/src/lib/qtprofilesetup/templates.qrc
+++ b/src/lib/qtprofilesetup/templates.qrc
@@ -2,7 +2,6 @@
<qresource prefix="/">
<file>templates/core.qbs</file>
<file>templates/gui.qbs</file>
- <file>templates/phonon.qbs</file>
<file>templates/module.qbs</file>
<file>templates/QtModule.qbs</file>
<file>templates/moc.js</file>
diff --git a/src/lib/qtprofilesetup/templates/phonon.qbs b/src/lib/qtprofilesetup/templates/phonon.qbs
deleted file mode 100644
index 34bd51d9e..000000000
--- a/src/lib/qtprofilesetup/templates/phonon.qbs
+++ /dev/null
@@ -1,28 +0,0 @@
-import qbs 1.0
-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@
-}