diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 10:16:31 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 10:16:31 +1000 |
| commit | bfb0c949d5fe915be3a4ade70f58d028b063e230 (patch) | |
| tree | 3fe8429574c90750664f10e1a853dfaff4c5d7b6 | |
| parent | 9b0d684b569e32dc9b8e13ebeeb3544d86871fff (diff) | |
| parent | 0ccafc2effaab52c370e7f2240682906ad9b2d9f (diff) | |
| download | qtlocation-bfb0c949d5fe915be3a4ade70f58d028b063e230.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtlocation-staging:
Update sync.profile for QtLocation
Update module version number to 5.0.0
Add QTLOCATION_VERSION macro for qtlocation
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | modules/qt_location.pri | 6 | ||||
| -rw-r--r-- | src/location/location.pro | 1 | ||||
| -rw-r--r-- | sync.profile | 3 |
4 files changed, 9 insertions, 3 deletions
@@ -119,6 +119,8 @@ translations/*.qm translations/*_untranslated.ts qrc_*.cpp +src/location/qtlocationversion.h + # Test generated files QObject.log tst_* diff --git a/modules/qt_location.pri b/modules/qt_location.pri index ed68ffc8..ba8c8fec 100644 --- a/modules/qt_location.pri +++ b/modules/qt_location.pri @@ -1,6 +1,6 @@ -QT.location.VERSION = 4.8.0 -QT.location.MAJOR_VERSION = 4 -QT.location.MINOR_VERSION = 8 +QT.location.VERSION = 5.0.0 +QT.location.MAJOR_VERSION = 5 +QT.location.MINOR_VERSION = 0 QT.location.PATCH_VERSION = 0 QT.location.name = QtLocation diff --git a/src/location/location.pro b/src/location/location.pro index b4aec374..299e8849 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -12,6 +12,7 @@ DEFINES += QT_BUILD_LOCATION_LIB QT_MAKEDLL include($$QT_SOURCE_TREE/src/qbase.pri) +HEADERS += qtlocationversion.h include(landmarks/landmarks.pri) include(maps/maps.pri) diff --git a/sync.profile b/sync.profile index 1dbdaeda..db13b435 100644 --- a/sync.profile +++ b/sync.profile @@ -4,10 +4,12 @@ %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 <QtDeclarative/qdeclarative.h>\n", ); %modulepris = ( "QtLocation" => "$basedir/modules/qt_location.pri", @@ -23,5 +25,6 @@ "QtGui" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", "QtNetwork" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", "QtCore" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", + "QtDeclarative" => "0c637cb07ba3c9b353e7e483a209537485cc4e2a", }, ); |