build system cleanups

- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL
  - pointless include and depend paths

Change-Id: I2c5062c238c6948f99d72f7c5544095cd30c988d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>

9 files changed, 9 insertions, 22 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
index b45bd84f..4610d197 100644
--- a/src/plugins/sensorgestures/qtsensors/qtsensors.pro
+++ b/src/plugins/sensorgestures/qtsensors/qtsensors.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensorgestures_plugin
 QT = core sensors
diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro
index a7e0b660..685e1ba0 100644
--- a/src/plugins/sensorgestures/shake/shake.pro
+++ b/src/plugins/sensorgestures/shake/shake.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensorgestures_shakeplugin
 QT = core sensors
diff --git a/src/plugins/sensors/blackberry/blackberry.pro b/src/plugins/sensors/blackberry/blackberry.pro
index 1f81e069..a088c1a4 100644
--- a/src/plugins/sensors/blackberry/blackberry.pro
+++ b/src/plugins/sensors/blackberry/blackberry.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensors_blackberry
 QT = sensors core gui gui-private
diff --git a/src/plugins/sensors/dummy/dummy.pro b/src/plugins/sensors/dummy/dummy.pro
index 0a1edd7f..3c30d740 100644
--- a/src/plugins/sensors/dummy/dummy.pro
+++ b/src/plugins/sensors/dummy/dummy.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensors_dummy
 QT += sensors core
diff --git a/src/plugins/sensors/generic/generic.pro b/src/plugins/sensors/generic/generic.pro
index e33ac4eb..57c0960a 100644
--- a/src/plugins/sensors/generic/generic.pro
+++ b/src/plugins/sensors/generic/generic.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensors_generic
 QT = core sensors
diff --git a/src/plugins/sensors/simulator/simulator.pro b/src/plugins/sensors/simulator/simulator.pro
index 75da1cd6..5cafd4cb 100644
--- a/src/plugins/sensors/simulator/simulator.pro
+++ b/src/plugins/sensors/simulator/simulator.pro
@@ -1,4 +1,4 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = qtsensors_simulator
 load(qt_plugin)
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index 7198095b..a0a7ae41 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -1,15 +1,10 @@
-load(qt_module)
+load(qt_build_config)
 
 TARGET = QtSensors
-QPRO_PWD = $$PWD
-
-CONFIG += module
 CONFIG += strict_flags
-CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG
-
 QT = core-private
 
-DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL
+CONFIG(debug,debug|release):DEFINES += ENABLE_RUNTIME_SENSORLOG
 !isEmpty(SENSORS_CONFIG_PATH):DEFINES += "QTSENSORS_CONFIG_PATH=\\\"$$SENSORS_CONFIG_PATH\\\""
 
 simulator {
@@ -18,7 +13,6 @@ simulator {
 }
 
 load(qt_module_config)
-HEADERS += qtsensorsversion.h
 
 QMAKE_DOCS = $$PWD/../../doc/config/qtsensors.qdocconf
 
@@ -78,4 +72,4 @@ for(s,SENSORS) {
     PRIVATE_HEADERS += $${s}_p.h
 }
 
-HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS
+HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$GESTURE_HEADERS
diff --git a/sync.profile b/sync.profile
index f321f770..e1451a65 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,11 +3,6 @@
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
-%classnames = (
-    "qtsensorsversion.h" => "QtSensorsVersion",
-);
-%mastercontent = (
-);
 %dependencies = (
     "qtbase" => "refs/heads/master",
     "qtdeclarative" => "refs/heads/master",
diff --git a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
index 81446925..d10e7688 100644
--- a/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
+++ b/tests/auto/sensors2qmlapi/sensors2qmlapi.pro
@@ -3,8 +3,6 @@ TARGET = tst_sensors2qmlapi
 
 CONFIG += testcase
 QT = core testlib sensors-private qml
-INCLUDEPATH += ./
-DEPENDPATH += ./
 
 SOURCES += tst_sensors2qmlapi.cpp \
            ./../../../src/imports/sensors2/qsensor2ambientlight.cpp \