From a50233a763eabcd5aa2d9cc2baa4f4d9221b5d7f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 12 Apr 2012 12:45:48 +0200
Subject: [PATCH] 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

Change-Id: Ie8a638b3c3a1a6a3d37fc410435bbc2b4a068ecf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
 src/xmlpatterns/xmlpatterns.pro                    | 13 ++++---------
 sync.profile                                       |  7 -------
 tests/auto/xmlpatternsschema/xmlpatternsschema.pro |  2 +-
 tests/auto/xmlpatternssdk/xmlpatternssdk.pro       |  2 +-
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index bf88d0e..1a06231 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -1,18 +1,13 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtXmlPatterns
-QPRO_PWD   = $$PWD
-
-CONFIG += module exceptions
-
+CONFIG += exceptions
 QT = core-private network
 
-DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE
+DEFINES += QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork
-load(qt_module_config)
 
-HEADERS += qtxmlpatternsversion.h
+load(qt_module_config)
 
 include($$PWD/common.pri)
 include($$PWD/acceltree/acceltree.pri)
diff --git a/sync.profile b/sync.profile
index a5ce4fa..5242ded 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,13 +3,6 @@
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
-%classnames = (
-    "qtxmlpatternsversion.h" => "QtXmlPatternsVersion",
-);
-%mastercontent = (
-    "core" => "#include <QtCore/QtCore>\n",
-    "network" => "#include <QtNetwork/QtNetwork>\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:
diff --git a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
index df0853b..19f738f 100644
--- a/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
+++ b/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
@@ -1,7 +1,7 @@
 TARGET = tst_xmlpatternsschema
 CONFIG += testcase
 QT += testlib
-load(qt_module)
+load(qt_build_config)
 
 SOURCES += tst_xmlpatternsschema.cpp \
 
diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index e2c84b2..4ede97a 100644
--- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 include (../xmlpatterns.pri)
 
-- 
2.7.4