diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:37:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-23 13:36:31 +0200 |
| commit | 9408173d32ff75723f41081edf5e3d9be9732378 (patch) | |
| tree | 597edffe0b47ba368ff47040db937686f5f0a06a | |
| parent | 13d4ea7f6912c73907884174da46f95a233ecb2a (diff) | |
| download | qtsvg-9408173d32ff75723f41081edf5e3d9be9732378.tar.gz | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- setup of PKGCONFIG* variables (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- pointless and commented out include and depend paths
Change-Id: I6397e2606f741de2d756886a029956682ab09161
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/svgiconengine.pro | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/svg/svg.pro | 2 | ||||
| -rw-r--r-- | src/svg/svg.pro | 12 | ||||
| -rw-r--r-- | sync.profile | 7 |
4 files changed, 3 insertions, 20 deletions
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 9626593..ee48a83 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qsvgicon load(qt_plugin) diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro index 31f6925..04842e1 100644 --- a/src/plugins/imageformats/svg/svg.pro +++ b/src/plugins/imageformats/svg/svg.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qsvg load(qt_plugin) diff --git a/src/svg/svg.pro b/src/svg/svg.pro index f3ae643..09bef40 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -1,23 +1,15 @@ -load(qt_module) +load(qt_build_config) TARGET = QtSvg -QPRO_PWD = $$PWD QT = core-private gui-private !contains(QT_CONFIG, no-widgets): QT += widgets-private -CONFIG += module - -DEFINES += QT_BUILD_SVG_LIB DEFINES += QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - load(qt_module_config) -HEADERS += qtsvgversion.h - HEADERS += \ qsvggraphics_p.h \ qsvghandler_p.h \ @@ -45,8 +37,6 @@ SOURCES += \ qgraphicssvgitem.cpp \ qsvggenerator.cpp -INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - symbian:TARGET.UID3=0x2001B2E2 contains(QT_CONFIG, system-zlib) { diff --git a/sync.profile b/sync.profile index 801d5c5..f8ac926 100644 --- a/sync.profile +++ b/sync.profile @@ -3,13 +3,6 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtsvgversion.h" => "QtSvgVersion", -); -%mastercontent = ( - "core" => "#include <QtCore/QtCore>\n", - "gui" => "#include <QtGui/QtGui>\n", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |