slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging

Browse Source 
* '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
This commit is contained in:
Qt Continuous Integration System
2011-05-05 14:33:58 +10:00
parent 89d67a2b80 11999724f0
commit aca1b2be8e
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
.tag ident

1
.tag Normal file
View File

@@ -0,0 +1 @@
$Id$

10
modules/qt_multimedia.pri
View File

@@ -1,12 +1,12 @@
QT_MULTIMEDIA_VERSION = $$QT_VERSION QT.multimedia.VERSION = 4.8.0
QT_MULTIMEDIA_MAJOR_VERSION = $$QT_MAJOR_VERSION QT.multimedia.MAJOR_VERSION = 4
QT_MULTIMEDIA_MINOR_VERSION = $$QT_MINOR_VERSION QT.multimedia.MINOR_VERSION = 8
QT_MULTIMEDIA_PATCH_VERSION = $$QT_PATCH_VERSION QT.multimedia.PATCH_VERSION = 0
QT.multimedia.name = QtMultimedia QT.multimedia.name = QtMultimedia
QT.multimedia.bins = $$QT_MODULE_BIN_BASE QT.multimedia.bins = $$QT_MODULE_BIN_BASE
QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia 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.sources = $$QT_MODULE_BASE/src/multimedia
QT.multimedia.libs = $$QT_MODULE_LIB_BASE QT.multimedia.libs = $$QT_MODULE_LIB_BASE
QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE

5
src/multimedia/multimedia.pro
View File

@@ -2,7 +2,10 @@ load(qt_module)
TARGET = QtMultimedia TARGET = QtMultimedia
QPRO_PWD = $$PWD 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 DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE