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
  - qmake -project boilerplate

Change-Id: I618bc1db930a372e7f713f21f21b2cfedc839258
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

5 files changed, 3 insertions, 31 deletions

diff --git a/examples/script/qsdbg/qsdbg.pro b/examples/script/qsdbg/qsdbg.pro
index 3b06661..1e2a2c8 100644
--- a/examples/script/qsdbg/qsdbg.pro
+++ b/examples/script/qsdbg/qsdbg.pro
@@ -1,6 +1,3 @@
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += script
 win32: CONFIG += console
 mac: CONFIG -= app_bundle
diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro
index c42f9fc..b7f0886 100644
--- a/src/plugins/script/qtdbus/qtdbus.pro
+++ b/src/plugins/script/qtdbus/qtdbus.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET  = qtscriptdbus
 DESTDIR = $$QT.script.plugins/script
diff --git a/src/script/script.pro b/src/script/script.pro
index f534b57..ba99f39 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -1,23 +1,15 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtScript
-QPRO_PWD   = $$PWD
 QT         = core-private
 
-CONFIG += module
-
 DEFINES   += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF
-DEFINES   += QT_BUILD_SCRIPT_LIB
 DEFINES   += QT_NO_USING_NAMESPACE
 DEFINES   += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO
 #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000       ### FIXME
 
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
-
 load(qt_module_config)
 
-HEADERS += qtscriptversion.h
-
 CONFIG += building-libs
 
 QMAKE_DOCS = $$PWD/doc/qtscript.qdocconf
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro
index d2f61ee..84f6d87 100644
--- a/src/scripttools/scripttools.pro
+++ b/src/scripttools/scripttools.pro
@@ -1,21 +1,13 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET     = QtScriptTools
-QPRO_PWD   = $$PWD
 QT         = core-private
 
-CONFIG += module
-
-DEFINES   += QT_BUILD_SCRIPTTOOLS_LIB
 DEFINES   += QT_NO_USING_NAMESPACE
 #win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
 
-unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript
-
 load(qt_module_config)
 
-HEADERS += qtscripttoolsversion.h
-
 # private dependencies
 QT += gui widgets-private script
 
diff --git a/sync.profile b/sync.profile
index f4cb26a..1b155a1 100644
--- a/sync.profile
+++ b/sync.profile
@@ -4,15 +4,6 @@
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
-%classnames = (
-    "qtscriptversion.h" => "QtScriptVersion",
-    "qtscripttoolsversion.h" => "QtScriptToolsVersion",
-);
-%mastercontent = (
-    "core" => "#include <QtCore/QtCore>\n",
-    "gui" => "#include <QtGui/QtGui>\n",
-    "script" => "#include <QtScript/QtScript>\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: