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
2011-05-11 20:59:54 +10:00
parent aca1b2be8e 95b597c7e1
commit 306424c55f
3 changed files with 5 additions and 0 deletions
--- 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_*
--- 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)

--- 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",