Merge pull request #7258 from mavlink/fixAirmapPath

Airmap path and Qt version detection

QGCExternalLibs.pri

@@ -169,23 +169,23 @@ contains (DEFINES, DISABLE_AIRMAP) {
 } else:exists(user_config.pri):infile(user_config.pri, 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")
-                LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.11.0 -lairmap-qt
-                DEFINES += QGC_AIRMAP_ENABLED
-            }
-        } else:LinuxBuild {
-            exists($${AIRMAPD_PATH}/linux/Qt.5.11.0) {
-                message("Including support for AirMap for Linux")
-                LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt
-                DEFINES += QGC_AIRMAP_ENABLED
-            }
-        } else {
-            message("Skipping support for Airmap (unsupported platform)")
+    AIRMAPD_PATH    = $$PWD/libs/airmapd
+    AIRMAP_QT_PATH  = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
+    message(Looking for Airmap in $$AIRMAP_QT_PATH)
+    MacBuild {
+        exists($${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH) {
+            message("Including support for AirMap for macOS")
+            LIBS += -L$${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH -lairmap-qt
+            DEFINES += QGC_AIRMAP_ENABLED
         }
+    } else:LinuxBuild {
+        exists($${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH) {
+            message("Including support for AirMap for Linux")
+            LIBS += -L$${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH -lairmap-qt
+            DEFINES += QGC_AIRMAP_ENABLED
+        }
+    } else {
+        message("Skipping support for Airmap (unsupported platform)")
     }
     contains (DEFINES, QGC_AIRMAP_ENABLED) {
         INCLUDEPATH += \

QGCSetup.pri

@@ -53,7 +53,7 @@ MacBuild {
     QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
     # AirMap
     contains (DEFINES, QGC_AIRMAP_ENABLED) {
-        QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/Qt.5.11.0/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/
+        QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/$$AIRMAP_QT_PATH/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/
         QMAKE_POST_LINK += && install_name_tool -change "@rpath/libairmap-qt.0.0.1.dylib" "@executable_path/../Frameworks/libairmap-qt.0.0.1.dylib" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
     }
 }