diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:33:58 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 14:33:58 +1000 |
| commit | 5e23c8dce60032ae7bb148320ed922bc146f9602 (patch) | |
| tree | cd5f0299e8eb3ca7cabf4749f8474dae7cee3712 | |
| parent | 1a71611b6ceaf6cdb24ea485a818fc56c956b5f8 (diff) | |
| parent | 5538a16bb504a36554f023a4f3b6a7bf1f5df0b8 (diff) | |
| download | qtsvg-5e23c8dce60032ae7bb148320ed922bc146f9602.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:
Added .tag file with Git revision.
Use private headers
Add module.prf, and install MODULE_PRI for each module
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .tag | 1 | ||||
| -rw-r--r-- | modules/qt_svg.pri | 10 | ||||
| -rw-r--r-- | src/svg/svg.pro | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a3c6108 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident @@ -0,0 +1 @@ +$Id$ diff --git a/modules/qt_svg.pri b/modules/qt_svg.pri index bec1718..9474c04 100644 --- a/modules/qt_svg.pri +++ b/modules/qt_svg.pri @@ -1,12 +1,12 @@ -QT_SVG_VERSION = $$QT_VERSION -QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION -QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION -QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION +QT.svg.VERSION = 4.8.0 +QT.svg.MAJOR_VERSION = 4 +QT.svg.MINOR_VERSION = 8 +QT.svg.PATCH_VERSION = 0 QT.svg.name = QtSvg QT.svg.bins = $$QT_MODULE_BIN_BASE QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg -QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private +QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/$$QT.svg.VERSION QT.svg.sources = $$QT_MODULE_BASE/src/svg QT.svg.libs = $$QT_MODULE_LIB_BASE QT.svg.plugins = $$QT_MODULE_PLUGIN_BASE diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 3572d59..16ad9c9 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -2,7 +2,11 @@ load(qt_module) TARGET = QtSvg QPRO_PWD = $$PWD -QT = core gui +QT = core-private gui-private + +CONFIG += module +MODULE_PRI = ../../modules/qt_svg.pri + DEFINES += QT_BUILD_SVG_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 |