diff options
| author | Alex <qt-info@nokia.com> | 2011-05-10 17:50:09 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2011-05-10 17:50:09 +1000 |
| commit | e4a26fca13a12398ddf3e7d5da09852f2181357f (patch) | |
| tree | 10093e12502472a0d5865c4bbeff025dd7560d63 | |
| parent | 4f12b1b1e84b0a995ac3c07011c97dcc154a9b5b (diff) | |
| download | qtlocation-e4a26fca13a12398ddf3e7d5da09852f2181357f.tar.gz | |
More project file fixes for QtLocation module
| -rw-r--r-- | modules/qt_location.pri | 8 | ||||
| -rw-r--r-- | src/location/location.pro | 17 | ||||
| -rw-r--r-- | src/plugins/geoservices/nokia/nokia.pro | 4 |
3 files changed, 18 insertions, 11 deletions
diff --git a/modules/qt_location.pri b/modules/qt_location.pri index 7b51943a..ed68ffc8 100644 --- a/modules/qt_location.pri +++ b/modules/qt_location.pri @@ -1,7 +1,7 @@ -QT_LOCATION_VERSION = $$QT_VERSION -QT_LOCATION_MAJOR_VERSION = $$QT_MAJOR_VERSION -QT_LOCATION_MINOR_VERSION = $$QT_MINOR_VERSION -QT_LOCATION_PATCH_VERSION = $$QT_PATCH_VERSION +QT.location.VERSION = 4.8.0 +QT.location.MAJOR_VERSION = 4 +QT.location.MINOR_VERSION = 8 +QT.location.PATCH_VERSION = 0 QT.location.name = QtLocation QT.location.bins = $$QT_MODULE_BIN_BASE diff --git a/src/location/location.pro b/src/location/location.pro index 5e9caf6e..ee53bdb8 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,15 +1,20 @@ -TEMPLATE = lib +load(qt_module) + TARGET = QtLocation -QT = core gui network sql +QPRO_PWD = $$PWD -#include(../../common.pri) +CONFIG += module MODULE_PRI = ../../modules/qt_location.pri +QT = core gui network + DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL +include($$QT_SOURCE_TREE/src/qbase.pri) + INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE -INCLUDEPATH += . -DEPENDPATH += . +#INCLUDEPATH += . +#DEPENDPATH += . include(landmarks/landmarks.pri) include(maps/maps.pri) @@ -194,5 +199,3 @@ simulator { qtAddLibrary(QtMobilitySimulator) } -CONFIG += middleware -include(../../features/deploy.pri) diff --git a/src/plugins/geoservices/nokia/nokia.pro b/src/plugins/geoservices/nokia/nokia.pro index a3cffdf2..dc46130a 100644 --- a/src/plugins/geoservices/nokia/nokia.pro +++ b/src/plugins/geoservices/nokia/nokia.pro @@ -1,3 +1,5 @@ +load(qt_module) + TARGET = qtgeoservices_nokia QT += location network @@ -35,6 +37,8 @@ RESOURCES += resource.qrc INCLUDEPATH += $$QT.location.includes +message($$QT.location.includes) + #INCLUDEPATH += $$SOURCE_DIR/src/location \ # $$SOURCE_DIR/src/location/maps \ # $$SOURCE_DIR/src/location/maps/tiled |