From b0ae24095376bf51916f1764a0d48a607bf8bdb2 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 26 May 2011 11:37:34 -0500 Subject: Fix module pri to conform to new versioned private layout --- modules/qt_location.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1 From 323b91f4622ee53db7a2888addce471362a8cb87 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 26 May 2011 11:38:26 -0500 Subject: Fix incorrect mix of private header includes We only use local includes ("") when the private headers are in our current projects relative path, and system includes (<>) when the compiler should find the headers based on projects include paths. --- src/imports/location/qdeclarativelandmarkcategorymodel_p.h | 8 ++++---- src/imports/location/qdeclarativelandmarkfilters_p.h | 4 ++-- src/imports/location/qdeclarativelandmarkmodel_p.h | 4 ++-- src/imports/location/qdeclarativeposition_p.h | 2 +- src/location/landmarks/qlandmark.cpp | 2 +- src/location/landmarks/qlandmark_p.h | 2 +- src/location/maps/qgeomapdata.cpp | 2 +- src/location/maps/qgeomapdata_p.h | 2 +- src/location/maps/qgeomapobject.cpp | 2 +- src/location/maps/qgeomapobjectengine_p.cpp | 4 ++-- src/location/maps/tiled/qgeotiledmapdata.cpp | 2 +- src/location/maps/tiled/qgeotiledmapdata_p.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h index fb0f0f20..7531bb16 100644 --- a/src/imports/location/qdeclarativelandmarkcategorymodel_p.h +++ b/src/imports/location/qdeclarativelandmarkcategorymodel_p.h @@ -42,10 +42,10 @@ #ifndef QDECLARATIVELANDMARKCATEGORYMODEL_P_H #define QDECLARATIVELANDMARKCATEGORYMODEL_P_H -#include -#include -#include -#include +#include "qdeclarativelandmark_p.h" +#include "qdeclarativelandmarkmodel_p.h" +#include "qdeclarativelandmarkcategory_p.h" +#include "qdeclarativelandmarkfilters_p.h" #include #include diff --git a/src/imports/location/qdeclarativelandmarkfilters_p.h b/src/imports/location/qdeclarativelandmarkfilters_p.h index e72599b0..4a9368af 100644 --- a/src/imports/location/qdeclarativelandmarkfilters_p.h +++ b/src/imports/location/qdeclarativelandmarkfilters_p.h @@ -44,13 +44,13 @@ #include #include -#include +#include "qdeclarativecoordinate_p.h" #include #include #include #include #include -#include +#include "qdeclarativelandmarkcategory_p.h" #include #include diff --git a/src/imports/location/qdeclarativelandmarkmodel_p.h b/src/imports/location/qdeclarativelandmarkmodel_p.h index e2f8dd27..7c7e29d2 100644 --- a/src/imports/location/qdeclarativelandmarkmodel_p.h +++ b/src/imports/location/qdeclarativelandmarkmodel_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVELANDMARKMODEL_P_H #define QDECLARATIVELANDMARKMODEL_P_H -#include -#include +#include "qdeclarativelandmark_p.h" +#include "qdeclarativelandmarkfilters_p.h" #include #include diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h index a27931ec..8ae1bf8c 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/location/qdeclarativeposition_p.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include "qdeclarativecoordinate_p.h" #include // Define this to get qDebug messages diff --git a/src/location/landmarks/qlandmark.cpp b/src/location/landmarks/qlandmark.cpp index bfb36fba..87623c45 100644 --- a/src/location/landmarks/qlandmark.cpp +++ b/src/location/landmarks/qlandmark.cpp @@ -51,7 +51,7 @@ #include "qgeocoordinate.h" #include "qgeoplace.h" -#include "qgeoplace_p.h" +#include #include #include diff --git a/src/location/landmarks/qlandmark_p.h b/src/location/landmarks/qlandmark_p.h index 8c66f7bd..68fd4809 100644 --- a/src/location/landmarks/qlandmark_p.h +++ b/src/location/landmarks/qlandmark_p.h @@ -54,7 +54,7 @@ #include "qlandmark.h" #include "qlandmarkid.h" -#include "qgeoplace_p.h" +#include #include #include #include diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp index 47caf1fe..c4e0fdf1 100644 --- a/src/location/maps/qgeomapdata.cpp +++ b/src/location/maps/qgeomapdata.cpp @@ -61,7 +61,7 @@ #include "qgeomapobjectengine_p.h" #include "qgeomapobject_p.h" -#include "projwrapper_p.h" +#include QTM_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h index acd33890..3189799d 100644 --- a/src/location/maps/qgeomapdata_p.h +++ b/src/location/maps/qgeomapdata_p.h @@ -59,7 +59,7 @@ #include #include "qgeocoordinate.h" #include "qgraphicsgeomap.h" -#include "projwrapper_p.h" +#include #include QTM_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeomapobject.cpp b/src/location/maps/qgeomapobject.cpp index 02df4cbe..257dbc07 100644 --- a/src/location/maps/qgeomapobject.cpp +++ b/src/location/maps/qgeomapobject.cpp @@ -47,7 +47,7 @@ #include "qgeomapdata_p.h" #include "qgeoboundingbox.h" #include "qgeocoordinate.h" -#include "projwrapper_p.h" +#include #include diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp index 333a173d..987651e0 100644 --- a/src/location/maps/qgeomapobjectengine_p.cpp +++ b/src/location/maps/qgeomapobjectengine_p.cpp @@ -42,9 +42,9 @@ #include "qgeomapobjectengine_p.h" #include "qgeomaprouteobject.h" #include "qgeomapcircleobject.h" -#include "qgeocoordinate_p.h" +#include #include "qgeoboundingbox.h" -#include "projwrapper_p.h" +#include #include "qgeotiledmapobjectinfo_p.h" #include 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 #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 #include #include -- cgit v1.2.1