summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-11 23:07:17 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-11 23:07:17 +1000
commit97eff6f8812af71c9ee08cd015c47197cc6abeae (patch)
tree661e16d2636310ca6ee4b97d84c6e2e61da98300
parent5e23c8dce60032ae7bb148320ed922bc146f9602 (diff)
parent685f4bb703fe721d5c7103c4e5a6ba519572f799 (diff)
downloadqtsvg-97eff6f8812af71c9ee08cd015c47197cc6abeae.tar.gz
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: Add QTSVG_VERSION macro for qtsvg
-rw-r--r--.gitignore2
-rw-r--r--src/svg/svg.pro2
-rw-r--r--sync.profile1
3 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5b4d2f2..1eb7b7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,8 @@ translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
+src/svg/qtsvgversion.h
+
# Test generated files
QObject.log
tst_*
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 16ad9c9..3b25a69 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -16,6 +16,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
include($$QT_SOURCE_TREE/src/qbase.pri)
+HEADERS += qtsvgversion.h
+
HEADERS += \
qsvggraphics_p.h \
qsvghandler_p.h \
diff --git a/sync.profile b/sync.profile
index 6737795..9ba5d54 100644
--- a/sync.profile
+++ b/sync.profile
@@ -4,6 +4,7 @@
%moduleheaders = ( # restrict the module headers to those found in relative path
);
%classnames = (
+ "qtsvgversion.h" => "QtSvgVersion",
);
%mastercontent = (
"core" => "#include <QtCore/QtCore>\n",