diff options
| -rw-r--r-- | src/location/location.pro | 11 | ||||
| -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 | ||||
| -rw-r--r-- | sync.profile | 8 |
9 files changed, 9 insertions, 26 deletions
diff --git a/src/location/location.pro b/src/location/location.pro index f5f32b39..64a198c8 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,18 +1,11 @@ -load(qt_module) +load(qt_build_config) TARGET = QtLocation -QPRO_PWD = $$PWD - -CONFIG += module - QT = core-private gui -DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL - load(qt_module_config) -HEADERS += qtlocationversion.h \ - qgeopositioninfosource_p.h +HEADERS += qgeopositioninfosource_p.h include(maps/maps.pri) include(places/places.pri) 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 diff --git a/sync.profile b/sync.profile index 2094cb24..71774b99 100644 --- a/sync.profile +++ b/sync.profile @@ -3,14 +3,6 @@ ); %moduleheaders = ( # restrict the module headers to those found in relative path ); -%classnames = ( - "qtlocationversion.h" => "QtLocationVersion", -); -%mastercontent = ( - "gui" => "#include <QtGui/QtGui>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", - "declarative" => "#include <QtQml/qqml.h>\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: |