Browse Source

Deal with build issues

QGC4.4
Gus Grubba 7 years ago
parent
commit
7f89c8ebca
  1. 1
      QGCSetup.pri
  2. 1
      src/Airmap/dummy/AirspaceControl.qml
  3. 4
      src/Airmap/dummy/AirspaceManager.h
  4. 2
      src/AirspaceManagement/AirspaceManager.h

1
QGCSetup.pri

@ -54,6 +54,7 @@ MacBuild { @@ -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}
}
}

1
src/Airmap/dummy/AirspaceControl.qml

@ -2,4 +2,5 @@ import QtQuick 2.3 @@ -2,4 +2,5 @@ import QtQuick 2.3
Item {
property bool colapsed: true
property bool showColapse: false
property bool planView: false
}

4
src/Airmap/dummy/AirspaceManager.h

@ -49,6 +49,10 @@ public: @@ -49,6 +49,10 @@ public:
virtual QString providerName () const { return QString("None"); }
virtual bool airspaceVisible () { return false; }
signals:
void airspaceVisibleChanged ();
private:
QObject _dummy;
};

2
src/AirspaceManagement/AirspaceManager.h

@ -86,7 +86,7 @@ public: @@ -86,7 +86,7 @@ public:
virtual AirspaceVehicleManager* instantiateVehicle (const Vehicle& vehicle) = 0;
signals:
void airspaceVisibleChanged ();
void airspaceVisibleChanged ();
protected:
/**

Loading…
Cancel
Save