diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index c532aae23d8f6fe7099b4fa90dad98e37e302f4a..ad4cbe1dc694c6958d3e53045ace94cc78e0bc58 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -154,15 +154,15 @@ contains (DEFINES, DISABLE_AIRMAP) { } else { AIRMAPD_PATH = $$PWD/libs/airmapd MacBuild|iOSBuild { - exists($${AIRMAPD_PATH}/macOS/Qt.5.9) { + exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) { message("Including support for AirMap for macOS") - LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt + LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.11.0 -lairmap-qt DEFINES += QGC_AIRMAP_ENABLED } } else:LinuxBuild { - exists($${AIRMAPD_PATH}/linux/Qt.5.9) { + exists($${AIRMAPD_PATH}/linux/Qt.5.11.0) { message("Including support for AirMap for Linux") - LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.9 -lairmap-qt + LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt DEFINES += QGC_AIRMAP_ENABLED } } else { diff --git a/QGCSetup.pri b/QGCSetup.pri index e0242f0426985b2716499ae9ef0884d5a4bae68f..508ff1f68314c465952172b3fcc32deb5bbc4b5f 100644 --- a/QGCSetup.pri +++ b/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.9/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/ + QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/Qt.5.11.0/* $$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} } } @@ -170,7 +170,7 @@ LinuxBuild { # Airmap contains (DEFINES, QGC_AIRMAP_ENABLED) { - QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/Qt.5.9/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ + QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/Qt.5.11.0/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ } # QGroundControl start script