summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-04-21 07:55:55 -0500
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-02 15:30:43 +0200
commita9f96c8d712eb878ad83556993f3316a58056b89 (patch)
tree43c931059a128cf32c99fd2a6490ecfdf5b7096a
parent0710f1743d24b0d7f0ab0e93a0a0435e572a092d (diff)
downloadqtmultimedia-a9f96c8d712eb878ad83556993f3316a58056b89.tar.gz
Use private headers
-rw-r--r--modules/qt_multimedia.pri10
-rw-r--r--src/multimedia/multimedia.pro2
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/qt_multimedia.pri b/modules/qt_multimedia.pri
index 469e5c8c1..481886f07 100644
--- a/modules/qt_multimedia.pri
+++ b/modules/qt_multimedia.pri
@@ -1,12 +1,12 @@
-QT_MULTIMEDIA_VERSION = $$QT_VERSION
-QT_MULTIMEDIA_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_MULTIMEDIA_MINOR_VERSION = $$QT_MINOR_VERSION
-QT_MULTIMEDIA_PATCH_VERSION = $$QT_PATCH_VERSION
+QT.multimedia.VERSION = 4.8.0
+QT.multimedia.MAJOR_VERSION = 4
+QT.multimedia.MINOR_VERSION = 8
+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/private
+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
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 8d7483ee1..405c51c1d 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -2,7 +2,7 @@ load(qt_module)
TARGET = QtMultimedia
QPRO_PWD = $$PWD
-QT = core gui
+QT = core-private gui
CONFIG += module
MODULE_PRI = ../../modules/qt_multimedia.pri