diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-13 11:24:57 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 03:24:56 +0200 |
commit | e26050930648772adc027be2ac6409f43e0a8b66 (patch) | |
tree | f949eeb11388166c4795fa43297bd57ec2b30e3a /src | |
parent | 4a54f0fabbb7133cd5b076383b717739da1bf85c (diff) | |
download | qtsensors-e26050930648772adc027be2ac6409f43e0a8b66.tar.gz |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qtsensors.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/shake.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensors/blackberry/blackberry.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummy.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensors/generic/generic.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensors/simulator/simulator.pro | 2 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 12 |
7 files changed, 9 insertions, 15 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qtsensors.pro b/src/plugins/sensorgestures/qtsensors/qtsensors.pro index b45bd84..4610d19 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 a7e0b66..685e1ba 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 1f81e06..a088c1a 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 0a1edd7..3c30d74 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 e33ac4e..57c0960 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 75da1cd..5cafd4c 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 7198095..a0a7ae4 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 |