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

* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Add QTDECLARATIVE_VERSION macro for qtdeclarative

.gitignore

@@ -119,6 +119,8 @@ translations/*.qm
 translations/*_untranslated.ts
 qrc_*.cpp
 
+src/declarative/qtdeclarativeversion.h
+
 # Test generated files
 QObject.log
 tst_*

src/declarative/declarative.pro

@@ -21,6 +21,8 @@ exists("qdeclarative_enable_gcov") {
 
 include($$QT_SOURCE_TREE/src/qbase.pri)
 
+HEADERS += qtdeclarativeversion.h
+
 #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
 #DESTDIR=.
 

sync.profile

@@ -4,6 +4,7 @@
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
 %classnames = (
+    "qtdeclarativeversion.h" => "QtDeclarativeVersion",
 );
 %mastercontent = (
     "gui" => "#include <QtGui/QtGui>\n",