diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-12 12:18:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 05:38:57 +0200 |
| commit | e3687ef7c770df713ac5a793112c200e2fe23f23 (patch) | |
| tree | 02a0bd2a4414680c79e51cb16c68b1a8203f19c2 /src/plugins | |
| parent | 252a1332355a1d25c2e9d05295c3f22e9351c575 (diff) | |
| download | qtlocation-e3687ef7c770df713ac5a793112c200e2fe23f23.tar.gz | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- abuse of QMAKE_PKGCONFIG_REQUIRES
- QT_BUILD_*_LIB defines (automated now)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- pointless QPRO_PWD assignments
- pointless DEFINES+=QT_MAKEDLL
Change-Id: I3f129ee42289aa409418eb9d29b1902cc40370f9
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 2 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/position/geoclue/geoclue.pro | 3 | ||||
| -rw-r--r-- | src/plugins/position/gypsy/gypsy.pro | 3 | ||||
| -rw-r--r-- | src/plugins/position/maemo/maemo.pro | 2 | ||||
| -rw-r--r-- | src/plugins/position/npe_backend/npe_backend.pro | 2 | ||||
| -rw-r--r-- | src/plugins/position/simulator/simulator.pro | 2 |
7 files changed, 7 insertions, 9 deletions
diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index f96c3638..7ed91a55 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtgeoservices_nokia QT += location-private network diff --git a/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro b/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro index b483ebe4..2f0bff06 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro +++ b/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtgeoservices_nokia_places_jsondb QT += location gui diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index 1cd099d7..ea0522ab 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtposition_geoclue QT += location gui @@ -21,7 +21,6 @@ INCLUDEPATH += $$QT.location.includes CONFIG += qdbus link_pkgconfig DEFINES += GEOCLUE_MASTER_AVAILABLE=1 PKGCONFIG += geoclue -QMAKE_PKGCONFIG_REQUIRES += geoclue target.path += $$[QT_INSTALL_PLUGINS]/position INSTALLS += target diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index bf463379..16141bb9 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtposition_gypsy QT += location gui @@ -21,7 +21,6 @@ INCLUDEPATH += $$QT.location.includes CONFIG += qdbus link_pkgconfig DEFINES += GYPSY_AVAILABLE=1 PKGCONFIG += gypsy -QMAKE_PKGCONFIG_REQUIRES += gypsy target.path += $$[QT_INSTALL_PLUGINS]/position INSTALLS += target diff --git a/src/plugins/position/maemo/maemo.pro b/src/plugins/position/maemo/maemo.pro index da35fe89..238a81fb 100644 --- a/src/plugins/position/maemo/maemo.pro +++ b/src/plugins/position/maemo/maemo.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtposition_maemo QT += location gui diff --git a/src/plugins/position/npe_backend/npe_backend.pro b/src/plugins/position/npe_backend/npe_backend.pro index ca2122eb..f1c2ac1c 100644 --- a/src/plugins/position/npe_backend/npe_backend.pro +++ b/src/plugins/position/npe_backend/npe_backend.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtposition_npe_backend QT += location gui diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro index f2c59635..a17e87c3 100644 --- a/src/plugins/position/simulator/simulator.pro +++ b/src/plugins/position/simulator/simulator.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtposition_simulator QT += location gui |