Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7f89c8eb
Commit
7f89c8eb
authored
Mar 07, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deal with build issues
parent
1e079309
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletion
+7
-1
QGCSetup.pri
QGCSetup.pri
+1
-0
AirspaceControl.qml
src/Airmap/dummy/AirspaceControl.qml
+1
-0
AirspaceManager.h
src/Airmap/dummy/AirspaceManager.h
+4
-0
AirspaceManager.h
src/AirspaceManagement/AirspaceManager.h
+1
-1
No files found.
QGCSetup.pri
View file @
7f89c8eb
...
@@ -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}
}
}
}
}
...
...
src/Airmap/dummy/AirspaceControl.qml
View file @
7f89c8eb
...
@@ -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
}
}
src/Airmap/dummy/AirspaceManager.h
View file @
7f89c8eb
...
@@ -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
;
};
};
src/AirspaceManagement/AirspaceManager.h
View file @
7f89c8eb
...
@@ -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:
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment