Commit d35b1789 authored by Don Gagne's avatar Don Gagne

Merge pull request #2013 from dogmaphobic/qt551Fixes

Adding Qt Location headers for Qt 5.5.1
parents ddfdfa44 1b146272
...@@ -8,7 +8,20 @@ PLUGIN_TYPE = geoservices ...@@ -8,7 +8,20 @@ PLUGIN_TYPE = geoservices
DESTDIR = $${LOCATION_PLUGIN_DESTDIR} DESTDIR = $${LOCATION_PLUGIN_DESTDIR}
INCLUDEPATH += $$QT.location.includes contains(QT_VERSION, 5.5.1) {
message(Using Local QtLocation headers for Qt 5.5.1)
INCLUDEPATH += \
libs/qtlocation/include \
} else {
message(Using Default QtLocation headers)
INCLUDEPATH += $$QT.location.includes
}
HEADERS += \ HEADERS += \
src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h \ src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h \
......
# QGroundControl
## Qt Location Headers for Qt 5.5.1
Qt version 5.5.1 did not include the headers for QtLocation. It's included here so we can build our location plugin. This is only needed for Qt 5.5.1. The qmake file handles it automatically. Once we move past 5.5.1 we can delete this directory.
The bug has been reported here:
https://bugreports.qt.io/browse/QTBUG-48812
#include "../../../../../src/location/maps/qcache3q_p.h"
#include "../../../../../src/location/maps/qgeocameracapabilities_p.h"
#include "../../../../../src/location/maps/qgeocameradata_p.h"
#include "../../../../../src/location/maps/qgeocameratiles_p.h"
#include "../../../../../src/location/maps/qgeocodereply_p.h"
#include "../../../../../src/location/maps/qgeocodingmanager_p.h"
#include "../../../../../src/location/maps/qgeocodingmanagerengine_p.h"
#include "../../../../../src/location/maps/qgeomaneuver_p.h"
#include "../../../../../src/location/maps/qgeomap_p.h"
#include "../../../../../src/location/maps/qgeomap_p_p.h"
#include "../../../../../src/location/maps/qgeomapcontroller_p.h"
#include "../../../../../src/location/maps/qgeomappingmanager_p.h"
#include "../../../../../src/location/maps/qgeomappingmanager_p_p.h"
#include "../../../../../src/location/maps/qgeomappingmanagerengine_p.h"
#include "../../../../../src/location/maps/qgeomappingmanagerengine_p_p.h"
#include "../../../../../src/location/maps/qgeomapscene_p.h"
#include "../../../../../src/location/maps/qgeomaptype_p.h"
#include "../../../../../src/location/maps/qgeomaptype_p_p.h"
#include "../../../../../src/location/maps/qgeoroute_p.h"
#include "../../../../../src/location/maps/qgeoroutereply_p.h"
#include "../../../../../src/location/maps/qgeorouterequest_p.h"
#include "../../../../../src/location/maps/qgeoroutesegment_p.h"
#include "../../../../../src/location/maps/qgeoroutingmanager_p.h"
#include "../../../../../src/location/maps/qgeoroutingmanagerengine_p.h"
#include "../../../../../src/location/maps/qgeoserviceprovider_p.h"
#include "../../../../../src/location/maps/qgeotilecache_p.h"
#include "../../../../../src/location/maps/qgeotiledmap_p.h"
#include "../../../../../src/location/maps/qgeotiledmap_p_p.h"
#include "../../../../../src/location/maps/qgeotiledmappingmanagerengine_p.h"
#include "../../../../../src/location/maps/qgeotiledmappingmanagerengine_p_p.h"
#include "../../../../../src/location/maps/qgeotiledmapreply_p.h"
#include "../../../../../src/location/maps/qgeotiledmapreply_p_p.h"
#include "../../../../../src/location/maps/qgeotilefetcher_p.h"
#include "../../../../../src/location/maps/qgeotilefetcher_p_p.h"
#include "../../../../../src/location/maps/qgeotilerequestmanager_p.h"
#include "../../../../../src/location/maps/qgeotilespec_p.h"
#include "../../../../../src/location/maps/qgeotilespec_p_p.h"
#include "../../../../../src/location/places/qplace_p.h"
#include "../../../../../src/location/places/qplaceattribute_p.h"
#include "../../../../../src/location/places/qplacecategory_p.h"
#include "../../../../../src/location/places/qplacecontactdetail_p.h"
#include "../../../../../src/location/places/qplacecontent_p.h"
#include "../../../../../src/location/places/qplacecontentrequest_p.h"
#include "../../../../../src/location/places/qplaceeditorial_p.h"
#include "../../../../../src/location/places/qplaceicon_p.h"
#include "../../../../../src/location/places/qplaceimage_p.h"
#include "../../../../../src/location/places/qplacemanagerengine_p.h"
#include "../../../../../src/location/places/qplaceproposedsearchresult_p.h"
#include "../../../../../src/location/places/qplaceratings_p.h"
#include "../../../../../src/location/places/qplacereply_p.h"
#include "../../../../../src/location/places/qplaceresult_p.h"
#include "../../../../../src/location/places/qplacereview_p.h"
#include "../../../../../src/location/places/qplacesearchresult_p.h"
#include "../../../../../src/location/places/qplacesupplier_p.h"
#include "../../../../../src/location/places/qplaceuser_p.h"
#include "../../../../../src/location/places/unsupportedreplies_p.h"
#ifndef QT_QTLOCATION_MODULE_H
#define QT_QTLOCATION_MODULE_H
#include <QtLocation/QtLocationDepends>
#include "qlocation.h"
#include "qlocationglobal.h"
#include "qgeocodereply.h"
#include "qgeocodingmanager.h"
#include "qgeocodingmanagerengine.h"
#include "qgeomaneuver.h"
#include "qgeoroute.h"
#include "qgeoroutereply.h"
#include "qgeorouterequest.h"
#include "qgeoroutesegment.h"
#include "qgeoroutingmanager.h"
#include "qgeoroutingmanagerengine.h"
#include "qgeoserviceprovider.h"
#include "qgeoserviceproviderfactory.h"
#include "placemacro.h"
#include "qplace.h"
#include "qplaceattribute.h"
#include "qplacecategory.h"
#include "qplacecontactdetail.h"
#include "qplacecontent.h"
#include "qplacecontentreply.h"
#include "qplacecontentrequest.h"
#include "qplacedetailsreply.h"
#include "qplaceeditorial.h"
#include "qplaceicon.h"
#include "qplaceidreply.h"
#include "qplaceimage.h"
#include "qplacemanager.h"
#include "qplacemanagerengine.h"
#include "qplacematchreply.h"
#include "qplacematchrequest.h"
#include "qplaceproposedsearchresult.h"
#include "qplaceratings.h"
#include "qplacereply.h"
#include "qplaceresult.h"
#include "qplacereview.h"
#include "qplacesearchreply.h"
#include "qplacesearchrequest.h"
#include "qplacesearchresult.h"
#include "qplacesearchsuggestionreply.h"
#include "qplacesupplier.h"
#include "qplaceuser.h"
#include "qtlocationversion.h"
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment