summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-10-06 14:31:58 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-07 06:16:34 +0200
commit03f22bcdaf1f80083618856d6e4140d3062f175b (patch)
treefdfbf0895f4fbd91fb1f4a247cf09e28a1056096 /modules
parent55bc4f2b46b0099d187db16e049d760cd55626e6 (diff)
Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'modules')
-rw-r--r--modules/qt_multimedia.pri17
-rw-r--r--modules/qt_multimediakit.pri17
-rw-r--r--modules/qt_multimediakitwidgets.pri17
-rw-r--r--modules/qt_multimediawidgets.pri17
4 files changed, 34 insertions, 34 deletions
diff --git a/modules/qt_multimedia.pri b/modules/qt_multimedia.pri
new file mode 100644
index 000000000..cb87b0ae7
--- /dev/null
+++ b/modules/qt_multimedia.pri
@@ -0,0 +1,17 @@
+QT.multimedia.VERSION = 5.0.0
+QT.multimedia.MAJOR_VERSION = 5
+QT.multimedia.MINOR_VERSION = 0
+QT.multimedia.PATCH_VERSION = 0
+
+QT.multimedia.name = QtMultimedia
+QT.multimedia.bins = $$QT_MODULE_BIN_BASE
+QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia
+QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/$$QT.multimedia.VERSION
+QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia
+QT.multimedia.libs = $$QT_MODULE_LIB_BASE
+QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
+QT.multimedia.depends = gui network
+QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
+
+QT_CONFIG += multimedia
diff --git a/modules/qt_multimediakit.pri b/modules/qt_multimediakit.pri
deleted file mode 100644
index 3400e1480..000000000
--- a/modules/qt_multimediakit.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.multimediakit.VERSION = 5.0.0
-QT.multimediakit.MAJOR_VERSION = 5
-QT.multimediakit.MINOR_VERSION = 0
-QT.multimediakit.PATCH_VERSION = 0
-
-QT.multimediakit.name = QtMultimediaKit
-QT.multimediakit.bins = $$QT_MODULE_BIN_BASE
-QT.multimediakit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit
-QT.multimediakit.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKit/$$QT.multimediakit.VERSION
-QT.multimediakit.sources = $$QT_MODULE_BASE/src/multimediakit
-QT.multimediakit.libs = $$QT_MODULE_LIB_BASE
-QT.multimediakit.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.multimediakit.imports = $$QT_MODULE_IMPORT_BASE
-QT.multimediakit.depends = gui network
-QT.multimediakit.DEFINES = QT_MULTIMEDIAKIT_LIB
-
-QT_CONFIG += multimediakit
diff --git a/modules/qt_multimediakitwidgets.pri b/modules/qt_multimediakitwidgets.pri
deleted file mode 100644
index 55faee924..000000000
--- a/modules/qt_multimediakitwidgets.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-QT.multimediakitwidgets.VERSION = 5.0.0
-QT.multimediakitwidgets.MAJOR_VERSION = 5
-QT.multimediakitwidgets.MINOR_VERSION = 0
-QT.multimediakitwidgets.PATCH_VERSION = 0
-
-QT.multimediakitwidgets.name = QtMultimediaKitWidgets
-QT.multimediakitwidgets.bins = $$QT_MODULE_BIN_BASE
-QT.multimediakitwidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets
-QT.multimediakitwidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaKitWidgets/$$QT.multimediakitwidgets.VERSION
-QT.multimediakitwidgets.sources = $$QT_MODULE_BASE/src/multimediakitwidgets
-QT.multimediakitwidgets.libs = $$QT_MODULE_LIB_BASE
-QT.multimediakitwidgets.plugins = $$QT_MODULE_PLUGIN_BASE
-QT.multimediakitwidgets.imports = $$QT_MODULE_IMPORT_BASE
-QT.multimediakitwidgets.depends = gui network
-QT.multimediakitwidgets.DEFINES = QT_MULTIMEDIAKITWIDGETS_LIB
-
-QT_CONFIG += multimediakitwidgets
diff --git a/modules/qt_multimediawidgets.pri b/modules/qt_multimediawidgets.pri
new file mode 100644
index 000000000..4dcbf4143
--- /dev/null
+++ b/modules/qt_multimediawidgets.pri
@@ -0,0 +1,17 @@
+QT.multimediawidgets.VERSION = 5.0.0
+QT.multimediawidgets.MAJOR_VERSION = 5
+QT.multimediawidgets.MINOR_VERSION = 0
+QT.multimediawidgets.PATCH_VERSION = 0
+
+QT.multimediawidgets.name = QtMultimediaWidgets
+QT.multimediawidgets.bins = $$QT_MODULE_BIN_BASE
+QT.multimediawidgets.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets
+QT.multimediawidgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimediaWidgets/$$QT.multimediawidgets.VERSION
+QT.multimediawidgets.sources = $$QT_MODULE_BASE/src/multimediawidgets
+QT.multimediawidgets.libs = $$QT_MODULE_LIB_BASE
+QT.multimediawidgets.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.multimediawidgets.imports = $$QT_MODULE_IMPORT_BASE
+QT.multimediawidgets.depends = gui network
+QT.multimediawidgets.DEFINES = QT_MULTIMEDIAWIDGETS_LIB
+
+QT_CONFIG += multimediawidgets