Merge pull request #7192 from patrickelectric/airmmap

QGCExternalLibs: Test Qt version before adding AirMap

Merge pull request #7192 from patrickelectric/airmmap
QGCExternalLibs: Test Qt version before adding AirMap
a43b8489 · Gus Grubba · GitHub · f585fd80 · edd2ef28 · a43b8489
Unverified Commit a43b8489 authored Jan 28, 2019 by Gus Grubba Committed by GitHub Jan 28, 2019
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 13 deletions

QGCExternalLibs.pri QGCExternalLibs.pri +15 -13

No files found.
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -170,6 +170,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
    message("Skipping support for AirMap (manual override from user_config.pri)")
 } else {
    AIRMAPD_PATH = $$PWD/libs/airmapd
+    contains(QT_VERSION, ˆ5\\.11\..*) {
        MacBuild {
            exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) {
                message("Including support for AirMap for macOS")
@@ -185,6 +186,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
        } else {
            message("Skipping support for Airmap (unsupported platform)")
        }
+    }
    contains (DEFINES, QGC_AIRMAP_ENABLED) {
        INCLUDEPATH += \
            $${AIRMAPD_PATH}/include