Skip to content

Q
qgroundcontrol
Commit dd8a2dab authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Fix iOS Build.

parent 045e3f5a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 224 additions and 160 deletions
QGCApplication.pro
View file @ dd8a2dab
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
include(QGCCommon.pri) include(QGCCommon.pri)
TARGET = qgroundcontrol TARGET = qgroundcontrol
TEMPLATE = app TEMPLATE = app
DESTDIR = $${OUT_PWD}/build
# Load additional config flags from user_config.pri # Load additional config flags from user_config.pri
exists(user_config.pri):infile(user_config.pri, CONFIG) { exists(user_config.pri):infile(user_config.pri, CONFIG) {
...@@ -34,13 +35,9 @@ LinuxBuild { ...@@ -34,13 +35,9 @@ LinuxBuild {
# QGC QtLocation plugin # QGC QtLocation plugin
LIBS += -L$${LOCATION_PLUGIN_DESTDIR} !ios {
LIBS += -l$${LOCATION_PLUGIN_NAME} LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
LIBS += -l$${LOCATION_PLUGIN_NAME}
WindowsBuild {
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
} else {
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
} }
# Qt configuration # Qt configuration
...@@ -88,8 +85,12 @@ MacBuild { ...@@ -88,8 +85,12 @@ MacBuild {
iOSBuild { iOSBuild {
QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
ICON = $${BASEDIR}/resources/icons/macx.icns OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
OTHER_FILES += $${BASEDIR}/iOS-Info.plist ios_icon.files = $$files($$PWD/ios/AppIcon*.png)
QMAKE_BUNDLE_DATA += ios_icon
app_launch_images.files = $$PWD/ios/LaunchScreen.xib
QMAKE_BUNDLE_DATA += app_launch_images
#-- TODO: Add iTunesArtwork
} }
LinuxBuild { LinuxBuild {
...@@ -278,7 +279,6 @@ WindowsBuild { ...@@ -278,7 +279,6 @@ WindowsBuild {
HEADERS += src/stable_headers.h HEADERS += src/stable_headers.h
} }
!iOSBuild { !iOSBuild {
HEADERS += \ HEADERS += \
src/comm/SerialLink.h \ src/comm/SerialLink.h \
......
QGCCommon.pri
View file @ dd8a2dab
...@@ -30,10 +30,13 @@ linux { ...@@ -30,10 +30,13 @@ linux {
linux-g++ | linux-g++-64 { linux-g++ | linux-g++-64 {
message("Linux build") message("Linux build")
CONFIG += LinuxBuild CONFIG += LinuxBuild
DEFINES += __STDC_LIMIT_MACROS
} else : android-g++ { } else : android-g++ {
message("Android build") message("Android build")
CONFIG += AndroidBuild MobileBuild CONFIG += AndroidBuild MobileBuild
DEFINES += __android__ DEFINES += __android__
DEFINES += __STDC_LIMIT_MACROS
target.path = $$DESTDIR
warning("Android build is experimental and not fully functional") warning("Android build is experimental and not fully functional")
} else { } else {
error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported") error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
...@@ -42,6 +45,7 @@ linux { ...@@ -42,6 +45,7 @@ linux {
win32-msvc2010 | win32-msvc2012 | win32-msvc2013 { win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
message("Windows build") message("Windows build")
CONFIG += WindowsBuild CONFIG += WindowsBuild
DEFINES += __STDC_LIMIT_MACROS
} else { } else {
error("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported") error("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported")
} }
...@@ -49,6 +53,10 @@ linux { ...@@ -49,6 +53,10 @@ linux {
macx-clang | macx-llvm { macx-clang | macx-llvm {
message("Mac build") message("Mac build")
CONFIG += MacBuild CONFIG += MacBuild
CONFIG += x86_64
CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_MAC_SDK = macosx10.11
QMAKE_CXXFLAGS += -fvisibility=hidden QMAKE_CXXFLAGS += -fvisibility=hidden
} else { } else {
error("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported") error("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported")
...@@ -60,6 +68,9 @@ linux { ...@@ -60,6 +68,9 @@ linux {
message("iOS build") message("iOS build")
CONFIG += iOSBuild MobileBuild app_bundle CONFIG += iOSBuild MobileBuild app_bundle
DEFINES += __ios__ DEFINES += __ios__
QMAKE_IOS_DEPLOYMENT_TARGET = 8.0
QMAKE_IOS_TARGETED_DEVICE_FAMILY = 2 #- iPad only for now
QMAKE_LFLAGS += -Wl,-no_pie
warning("iOS build is experimental and not yet fully functional") warning("iOS build is experimental and not yet fully functional")
} else { } else {
error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported") error("Unsupported build platform, only Linux, Windows, Android and Mac (Mac OS and iOS) are supported")
...@@ -109,76 +120,22 @@ win32:debug_and_release { ...@@ -109,76 +120,22 @@ win32:debug_and_release {
# Setup our build directories # Setup our build directories
BASEDIR = $$IN_PWD BASEDIR = $$IN_PWD
DESTDIR = $${OUT_PWD}/debug
BUILDDIR = $${OUT_PWD}/build-debug
ReleaseBuild { !ios {
DESTDIR = $${OUT_PWD}/release OBJECTS_DIR = $${OUT_PWD}/obj
BUILDDIR = $${OUT_PWD}/build-release MOC_DIR = $${OUT_PWD}/moc
} UI_DIR = $${OUT_PWD}/ui
RCC_DIR = $${OUT_PWD}/rcc
iOSBuild {
# For whatever reason, the iOS build fails with these set. Some files have the full,
# properly concatenaded path and file name while others have only the second portion,
# as if BUILDDIR was empty.
OBJECTS_DIR = $$(HOME)/tmp/qgcfoo
MOC_DIR = $$(HOME)/tmp/qgcfoo
UI_DIR = $$(HOME)/tmp/qgcfoo
RCC_DIR = $$(HOME)/tmp/qgcfoo
} else {
OBJECTS_DIR = $${BUILDDIR}/obj
MOC_DIR = $${BUILDDIR}/moc
UI_DIR = $${BUILDDIR}/ui
RCC_DIR = $${BUILDDIR}/rcc
} }
LANGUAGE = C++ LANGUAGE = C++
AndroidBuild { LOCATION_PLUGIN_DESTDIR = $${OUT_PWD}/src/QtLocationPlugin
target.path = $$DESTDIR LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC
}
# We place the created plugin lib into the objects dir so that make clean will clean it as well
iOSBuild {
LOCATION_PLUGIN_DESTDIR = $$(HOME)/tmp/qgcfoo
} else {
LOCATION_PLUGIN_DESTDIR = $$OBJECTS_DIR
}
LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC
message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET OUTPUT $$OUT_PWD)
# Turn off serial port warnings # Turn off serial port warnings
DEFINES += _TTY_NOWARN_ DEFINES += _TTY_NOWARN_
#
# OS Specific settings
#
AndroidBuild {
DEFINES += __STDC_LIMIT_MACROS
}
iOSBuild {
QMAKE_IOS_DEPLOYMENT_TARGET = 7.0
}
MacBuild {
CONFIG += x86_64
CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_MAC_SDK = macosx10.11
}
LinuxBuild {
DEFINES += __STDC_LIMIT_MACROS
}
WindowsBuild {
DEFINES += __STDC_LIMIT_MACROS
}
# #
# By default warnings as errors are turned off. Even so, in order for a pull request # By default warnings as errors are turned off. Even so, in order for a pull request
# to be accepted you must compile cleanly with warnings as errors turned on the default # to be accepted you must compile cleanly with warnings as errors turned on the default
......
QGCLocationPlugin.pro deleted 100644 → 0
View file @ 045e3f5a
include(QGCCommon.pri)
TEMPLATE = lib
TARGET = QGeoServiceProviderFactoryQGC
CONFIG += plugin static
QT += location-private positioning-private network
PLUGIN_TYPE = geoservices
DESTDIR = $${LOCATION_PLUGIN_DESTDIR}
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 += \
src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h \
src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.h \
src/QtLocationPlugin/qgeotilefetcherqgc.h \
src/QtLocationPlugin/qgeomapreplyqgc.h \
src/QtLocationPlugin/qgeocodingmanagerengineqgc.h \
src/QtLocationPlugin/qgeocodereplyqgc.h \
src/QtLocationPlugin/OpenPilotMaps.h
SOURCES += \
src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp \
src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp \
src/QtLocationPlugin/qgeotilefetcherqgc.cpp \
src/QtLocationPlugin/qgeomapreplyqgc.cpp \
src/QtLocationPlugin/qgeocodingmanagerengineqgc.cpp \
src/QtLocationPlugin/qgeocodereplyqgc.cpp \
src/QtLocationPlugin/OpenPilotMaps.cc
OTHER_FILES += \
src/QtLocationPlugin/qgc_maps_plugin.json
ios/LaunchScreen.xib 0 → 100644
View file @ dd8a2dab
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="14F1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
<variation key="widthClass=compact">
<fontDescription key="fontDescription" type="system" pointSize="11"/>
</variation>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QGroundControl" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
</subviews>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="Kid-kn-2rF"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="404" y="445"/>
</view>
</objects>
</document>
ios/iOS-Info.plist
View file @ dd8a2dab
...@@ -2,36 +2,82 @@ ...@@ -2,36 +2,82 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>CFBundleIconFile</key> <key>CFBundleDisplayName</key>
<string></string> <string>QGroundControl</string>
<key>CFBundlePackageType</key> <key>CFBundleExecutable</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
<string>qgroundcontrol</string> <string>qgroundcontrol</string>
<key>CFBundleIdentifier</key> <key>CFBundleGetInfoString</key>
<string>org.qgroundcontrol.${PRODUCT_NAME:rfc1034identifier}</string> <string>Created by Qt/QMake</string>
<key>CFBundleDisplayName</key> <key>CFBundleIconFile</key>
<string>${PRODUCT_NAME}</string> <string></string>
<key>CFBundleName</key> <key>CFBundleIdentifier</key>
<string>${PRODUCT_NAME}</string> <string>com.grubba.qgroundcontrol</string>
<key>CFBundleShortVersionString</key> <key>CFBundleName</key>
<string>1.0</string> <string>QGroundControl</string>
<key>CFBundleVersion</key> <key>CFBundlePackageType</key>
<string>1.0</string> <string>APPL</string>
<key>LSRequiresIPhoneOS</key> <key>CFBundleShortVersionString</key>
<true/> <string>1.0</string>
<key>UILaunchStoryboardName</key> <key>CFBundleSignature</key>
<string>LaunchScreen</string> <string>????</string>
<key>UISupportedInterfaceOrientations</key> <key>CFBundleVersion</key>
<array> <string>1.0</string>
<string>UIInterfaceOrientationLandscapeLeft</string> <key>LSRequiresIPhoneOS</key>
<string>UIInterfaceOrientationLandscapeRight</string> <true/>
</array> <key>NOTE</key>
<key>NOTE</key> <string>This file was generated by Qt/QMake.</string>
<string>This file was generated by Qt/QMake.</string> <key>UILaunchStoryboardName</key>
<string>LaunchScreen.xib</string>
<key>UIRequiresFullScreen</key>
<true/>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>ForAppStore</key>
<string>Yes</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>AppIcon29x29.png</string>
<string>AppIcon29x29@2x.png</string>
<string>AppIcon40x40@2x.png</string>
<string>AppIcon57x57.png</string>
<string>AppIcon57x57@2x.png</string>
<string>AppIcon60x60@2x.png</string>
</array>
</dict>
</dict>
<key>CFBundleIcons~ipad</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>AppIcon29x29.png</string>
<string>AppIcon29x29@2x.png</string>
<string>AppIcon40x40@2x.png</string>
<string>AppIcon57x57.png</string>
<string>AppIcon57x57@2x.png</string>
<string>AppIcon60x60@2x.png</string>
<string>AppIcon29x29~ipad.png</string>
<string>AppIcon29x29@2x~ipad.png</string>
<string>AppIcon40x40~ipad.png</string>
<string>AppIcon40x40@2x~ipad.png</string>
<string>AppIcon50x50~ipad.png</string>
<string>AppIcon50x50@2x~ipad.png</string>
<string>AppIcon72x72~ipad.png</string>
<string>AppIcon72x72@2x~ipad.png</string>
<string>AppIcon76x76~ipad.png</string>
<string>AppIcon76x76@2x~ipad.png</string>
</array>
</dict>
</dict>
</dict> </dict>
</plist> </plist>
qgroundcontrol.pro
View file @ dd8a2dab
...@@ -17,12 +17,9 @@ ...@@ -17,12 +17,9 @@
# along with QGroundControl. If not, see <http://www.gnu.org/licenses/>. # along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
# ------------------------------------------------- # -------------------------------------------------
TEMPLATE = subdirs equals(OUT_PWD, $$IN_PWD) {
CONFIG += ordered error("You must use shadow build.")
SUBDIRS = ./QGCLocationPlugin.pro }
SUBDIRS += ./QGCApplication.pro
QGCApplication.depends = QGCLocationPlugin
message(Qt version $$[QT_VERSION]) message(Qt version $$[QT_VERSION])
...@@ -30,3 +27,12 @@ message(Qt version $$[QT_VERSION]) ...@@ -30,3 +27,12 @@ message(Qt version $$[QT_VERSION])
error("Unsupported Qt version, 5.4+ is required") error("Unsupported Qt version, 5.4+ is required")
} }
ios {
include($$PWD/src/QtLocationPlugin/QGCLocationPlugin.pro)
include($$PWD/QGCApplication.pro)
} else {
TEMPLATE = subdirs
SUBDIRS = ./src/QtLocationPlugin/QGCLocationPlugin.pro
SUBDIRS += ./QGCApplication.pro
QGCApplication.depends = QGCLocationPlugin
}
src/QtLocationPlugin/QGCLocationPlugin.pro 0 → 100644
View file @ dd8a2dab
!ios {
include($$PWD/../../QGCCommon.pri)
TEMPLATE = lib
TARGET = QGeoServiceProviderFactoryQGC
CONFIG += plugin static
PLUGIN_TYPE = geoservices
}
QT += location-private positioning-private network
contains(QT_VERSION, 5.5.1) {
message(Using Local QtLocation headers for Qt 5.5.1)
INCLUDEPATH += \
$$PWD/qtlocation/include \
} else {
message(Using Default QtLocation headers)
INCLUDEPATH += $$QT.location.includes
}
HEADERS += \
$$PWD/qgeoserviceproviderpluginqgc.h \
$$PWD/qgeotiledmappingmanagerengineqgc.h \
$$PWD/qgeotilefetcherqgc.h \
$$PWD/qgeomapreplyqgc.h \
$$PWD/qgeocodingmanagerengineqgc.h \
$$PWD/qgeocodereplyqgc.h \
$$PWD/OpenPilotMaps.h
SOURCES += \
$$PWD/qgeoserviceproviderpluginqgc.cpp \
$$PWD/qgeotiledmappingmanagerengineqgc.cpp \
$$PWD/qgeotilefetcherqgc.cpp \
$$PWD/qgeomapreplyqgc.cpp \
$$PWD/qgeocodingmanagerengineqgc.cpp \
$$PWD/qgeocodereplyqgc.cpp \
$$PWD/OpenPilotMaps.cc
OTHER_FILES += \
$$PWD/qgc_maps_plugin.json
src/QtLocationPlugin/qgeoserviceproviderpluginqgc.cpp
View file @ dd8a2dab
...@@ -51,6 +51,16 @@ ...@@ -51,6 +51,16 @@
#include "qgeotiledmappingmanagerengineqgc.h" #include "qgeotiledmappingmanagerengineqgc.h"
#include "qgeocodingmanagerengineqgc.h" #include "qgeocodingmanagerengineqgc.h"
#if defined (__ios__)
Q_EXTERN_C Q_DECL_EXPORT const char *qt_plugin_query_metadata();
Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance();
const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_QGeoServiceProviderFactoryQGC()
{
QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance, qt_plugin_query_metadata};
return plugin;
}
#endif
QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine( QGeoCodingManagerEngine *QGeoServiceProviderFactoryQGC::createGeocodingManagerEngine(
const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
{ {
......
src/QtLocationPlugin/qgeoserviceproviderpluginqgc.h
View file @ dd8a2dab
...@@ -58,10 +58,10 @@ class QGeoServiceProviderFactoryQGC: public QObject, public QGeoServiceProviderF ...@@ -58,10 +58,10 @@ class QGeoServiceProviderFactoryQGC: public QObject, public QGeoServiceProviderF
Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" FILE "qgc_maps_plugin.json") Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0" FILE "qgc_maps_plugin.json")
public: public:
QGeoCodingManagerEngine* createGeocodingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const; QGeoCodingManagerEngine* createGeocodingManagerEngine (const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const;
QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const; QGeoMappingManagerEngine* createMappingManagerEngine (const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const;
QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const; QGeoRoutingManagerEngine* createRoutingManagerEngine (const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const;
QPlaceManagerEngine* createPlaceManagerEngine(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const; QPlaceManagerEngine* createPlaceManagerEngine (const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const;
}; };
#endif // QGEOSERVICEPROVIDER_GOOGLE_H #endif // QGEOSERVICEPROVIDER_GOOGLE_H
src/QtLocationPlugin/qgeotiledmappingmanagerengineqgc.cpp
View file @ dd8a2dab
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include "qgeotilefetcherqgc.h" #include "qgeotilefetcherqgc.h"
#include "OpenPilotMaps.h" #include "OpenPilotMaps.h"
#if QT_VERSION >= 0x050500 #if QT_VERSION >= 0x050500
QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent) QGeoTiledMapQGC::QGeoTiledMapQGC(QGeoTiledMappingManagerEngine *engine, QObject *parent)
: QGeoTiledMap(engine, parent) : QGeoTiledMap(engine, parent)
......
src/main.cc
View file @ dd8a2dab
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