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 /src/location/maps/tiled | |
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 'src/location/maps/tiled')
-rw-r--r-- | src/location/maps/tiled/qgeotiledmapdata.cpp | 2 | ||||
-rw-r--r-- | src/location/maps/tiled/qgeotiledmapdata_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp index 2532a2fd..fbe91b48 100644 --- a/src/location/maps/tiled/qgeotiledmapdata.cpp +++ b/src/location/maps/tiled/qgeotiledmapdata.cpp @@ -48,7 +48,7 @@ #include "qgeocoordinate.h" #include "qgeoboundingbox.h" #include "qgeomapoverlay.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include "qgeomapobjectengine_p.h" #include "qgeotiledmapobjectinfo_p.h" diff --git a/src/location/maps/tiled/qgeotiledmapdata_p.h b/src/location/maps/tiled/qgeotiledmapdata_p.h index 088b732a..3ff60f3a 100644 --- a/src/location/maps/tiled/qgeotiledmapdata_p.h +++ b/src/location/maps/tiled/qgeotiledmapdata_p.h @@ -56,7 +56,7 @@ #include "qgeomapdata_p.h" #include "qgeomapobject.h" #include "qgeomapobject_p.h" -#include "projwrapper_p.h" +#include <private/projwrapper_p.h> #include <QRectF> #include <QHash> |