summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/qt_multimedia.pri17
-rw-r--r--modules/qt_multimediawidgets.pri17
-rw-r--r--src/multimedia/multimedia.pro1
-rw-r--r--src/multimediawidgets/multimediawidgets.pro6
-rw-r--r--sync.profile5
5 files changed, 3 insertions, 43 deletions
diff --git a/modules/qt_multimedia.pri b/modules/qt_multimedia.pri
deleted file mode 100644
index cb87b0ae7..000000000
--- a/modules/qt_multimedia.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-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_multimediawidgets.pri b/modules/qt_multimediawidgets.pri
deleted file mode 100644
index 669a58bcb..000000000
--- a/modules/qt_multimediawidgets.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-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 widgets
-QT.multimediawidgets.DEFINES = QT_MULTIMEDIAWIDGETS_LIB
-
-QT_CONFIG += multimediawidgets
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 82b58e9f4..d43af113b 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -5,7 +5,6 @@ QPRO_PWD = $$PWD
QT = core-private network gui
CONFIG += module
-MODULE_PRI += ../../modules/qt_multimedia.pri
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
} else {
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index c130bc846..10d8b7458 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -6,8 +6,10 @@ QPRO_PWD = $$PWD
QT = core gui multimedia-private widgets-private
CONFIG += module no_private_qt_headers_warning
-MODULE_PRI += ../../modules/qt_multimediawidgets.pri
+load(qt_module_config)
+
+# private dependencies
contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
QT += opengl
} else {
@@ -17,8 +19,6 @@ contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
!static:DEFINES += QT_MAKEDLL
DEFINES += QT_BUILD_MULTIMEDIAWIDGETS_LIB
-load(qt_module_config)
-
PRIVATE_HEADERS += \
qvideowidget_p.h \
qpaintervideosurface_p.h \
diff --git a/sync.profile b/sync.profile
index b35442ee2..bd11bf899 100644
--- a/sync.profile
+++ b/sync.profile
@@ -17,11 +17,6 @@
"core" => "#include <QtCore/QtCore>\n",
);
-%modulepris = (
- "QtMultimedia" => "$basedir/modules/qt_multimedia.pri",
- "QtMultimediaWidgets" => "$basedir/modules/qt_multimediawidgets.pri",
-);
-
# Module dependencies.
# Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values: