diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:33:58 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:33:58 +1000 |
| commit | aca1b2be8edcd1ccce622f49a2f7d4cec9c32a89 (patch) | |
| tree | 54639b522f439983eec7554cd18bd8c9533d9ef5 | |
| parent | 89d67a2b8060a813c7796861c404de897c3a44ec (diff) | |
| parent | 11999724f013e8493e76c9672520ccad8d4a9089 (diff) | |
| download | qtmultimedia-aca1b2be8edcd1ccce622f49a2f7d4cec9c32a89.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging:
Added .tag file with Git revision.
Use private headers
Add module.prf, and install MODULE_PRI for each module
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .tag | 1 | ||||
| -rw-r--r-- | modules/qt_multimedia.pri | 10 | ||||
| -rw-r--r-- | src/multimedia/multimedia.pro | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a3c610837 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident @@ -0,0 +1 @@ +$Id$ 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 781a29a8a..405c51c1d 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -2,7 +2,10 @@ load(qt_module) TARGET = QtMultimedia QPRO_PWD = $$PWD -QT = core gui +QT = core-private gui + +CONFIG += module +MODULE_PRI = ../../modules/qt_multimedia.pri DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE |