From 7f89c8ebca6ae83d9e53d78012311a449226f5b0 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Wed, 7 Mar 2018 16:50:07 -0500 Subject: [PATCH] Deal with build issues --- QGCSetup.pri | 1 + src/Airmap/dummy/AirspaceControl.qml | 1 + src/Airmap/dummy/AirspaceManager.h | 4 ++++ src/AirspaceManagement/AirspaceManager.h | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 4c4edbc..754222c 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -54,6 +54,7 @@ MacBuild { # 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 += && 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} } } diff --git a/src/Airmap/dummy/AirspaceControl.qml b/src/Airmap/dummy/AirspaceControl.qml index 4a3fbc6..ca9b339 100644 --- a/src/Airmap/dummy/AirspaceControl.qml +++ b/src/Airmap/dummy/AirspaceControl.qml @@ -2,4 +2,5 @@ import QtQuick 2.3 Item { property bool colapsed: true property bool showColapse: false + property bool planView: false } diff --git a/src/Airmap/dummy/AirspaceManager.h b/src/Airmap/dummy/AirspaceManager.h index cd762d0..6dd37fb 100644 --- a/src/Airmap/dummy/AirspaceManager.h +++ b/src/Airmap/dummy/AirspaceManager.h @@ -49,6 +49,10 @@ public: virtual QString providerName () const { return QString("None"); } virtual bool airspaceVisible () { return false; } + +signals: + void airspaceVisibleChanged (); + private: QObject _dummy; }; diff --git a/src/AirspaceManagement/AirspaceManager.h b/src/AirspaceManagement/AirspaceManager.h index e833544..7991aac 100644 --- a/src/AirspaceManagement/AirspaceManager.h +++ b/src/AirspaceManagement/AirspaceManager.h @@ -86,7 +86,7 @@ public: virtual AirspaceVehicleManager* instantiateVehicle (const Vehicle& vehicle) = 0; signals: - void airspaceVisibleChanged (); + void airspaceVisibleChanged (); protected: /**