diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 02:44:58 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 02:44:58 +1000 |
| commit | 1dd8b4805d108931a41eb2d58874a598281ee2c4 (patch) | |
| tree | 58f6f3d191f3976d3e02495ca7faa43a971ed859 /modules/qt_location.pri | |
| parent | 4dc9b15e46f4e32e3dea66b2bfe7c691c4fb35f5 (diff) | |
| parent | 323b91f4622ee53db7a2888addce471362a8cb87 (diff) | |
| download | qtlocation-1dd8b4805d108931a41eb2d58874a598281ee2c4.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:
Fix incorrect mix of private header includes
Fix module pri to conform to new versioned private layout
Diffstat (limited to 'modules/qt_location.pri')
| -rw-r--r-- | modules/qt_location.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/qt_location.pri b/modules/qt_location.pri index ba8c8fec..7877c90c 100644 --- a/modules/qt_location.pri +++ b/modules/qt_location.pri @@ -6,7 +6,7 @@ QT.location.PATCH_VERSION = 0 QT.location.name = QtLocation QT.location.bins = $$QT_MODULE_BIN_BASE QT.location.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtLocation -QT.location.private_includes = $$QT_MODULE_INCLUDE_BASE/QtLocation/private +QT.location.private_includes = $$QT_MODULE_INCLUDE_BASE/QtLocation/$$QT.location.VERSION QT.location.sources = $$QT_MODULE_BASE/src/location QT.location.libs = $$QT_MODULE_LIB_BASE QT.location.plugins = $$QT_MODULE_PLUGIN_BASE |