diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 20:59:54 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 20:59:54 +1000 |
| commit | 306424c55f9df61b686754591006b9e7e54a13d4 (patch) | |
| tree | 59282edf3252c347cda3f47453ad2998cd491c6c | |
| parent | aca1b2be8edcd1ccce622f49a2f7d4cec9c32a89 (diff) | |
| parent | 95b597c7e1ea743211fd8b7d485bdca50fcdf46b (diff) | |
| download | qtmultimedia-306424c55f9df61b686754591006b9e7e54a13d4.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:
Add QTMULTIMEDIA_VERSION macro for qtmultimedia
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | src/multimedia/multimedia.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 5b4d2f244..0435348ec 100644 --- a/.gitignore +++ b/.gitignore @@ -119,6 +119,8 @@ translations/*.qm translations/*_untranslated.ts qrc_*.cpp +src/multimedia/qtmultimediaversion.h + # Test generated files QObject.log tst_* diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 405c51c1d..bfb5654a9 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -13,6 +13,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include($$QT_SOURCE_TREE/src/qbase.pri) +HEADERS += qtmultimediaversion.h + include(audio/audio.pri) include(video/video.pri) diff --git a/sync.profile b/sync.profile index 60ba40257..d0feebbfa 100644 --- a/sync.profile +++ b/sync.profile @@ -4,6 +4,7 @@ %moduleheaders = ( # restrict the module headers to those found in relative path ); %classnames = ( + "qtmultimediaversion.h" => "QtMultimediaVersion", ); %mastercontent = ( "gui" => "#include <QtGui/QtGui>\n", |