Commit 7f89c8eb authored by Gus Grubba's avatar Gus Grubba

Deal with build issues

parent 1e079309
...@@ -54,6 +54,7 @@ MacBuild { ...@@ -54,6 +54,7 @@ MacBuild {
# AirMap # AirMap
contains (DEFINES, QGC_AIRMAP_ENABLED) { 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.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}
} }
} }
......
...@@ -2,4 +2,5 @@ import QtQuick 2.3 ...@@ -2,4 +2,5 @@ import QtQuick 2.3
Item { Item {
property bool colapsed: true property bool colapsed: true
property bool showColapse: false property bool showColapse: false
property bool planView: false
} }
...@@ -49,6 +49,10 @@ public: ...@@ -49,6 +49,10 @@ public:
virtual QString providerName () const { return QString("None"); } virtual QString providerName () const { return QString("None"); }
virtual bool airspaceVisible () { return false; } virtual bool airspaceVisible () { return false; }
signals:
void airspaceVisibleChanged ();
private: private:
QObject _dummy; QObject _dummy;
}; };
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
virtual AirspaceVehicleManager* instantiateVehicle (const Vehicle& vehicle) = 0; virtual AirspaceVehicleManager* instantiateVehicle (const Vehicle& vehicle) = 0;
signals: signals:
void airspaceVisibleChanged (); void airspaceVisibleChanged ();
protected: protected:
/** /**
......
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