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
dc215919
Commit
dc215919
authored
May 13, 2020
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
ebf188a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
QGCCommon.pri
QGCCommon.pri
+2
-1
qmlglsink.pri
qmlglsink.pri
+0
-3
SimpleMissionItem.cc
src/MissionManager/SimpleMissionItem.cc
+3
-3
No files found.
QGCCommon.pri
View file @
dc215919
...
...
@@ -250,7 +250,8 @@ WindowsBuild {
/wd4996 \ # silence warnings about deprecated strcpy and whatnot, these come from the shapefile code with is external
/wd4005 \ # silence warnings about macro redefinition, these come from the shapefile code with is external
/wd4290 \ # ignore exception specifications
/wd4267 # silence conversion from 'size_t' to 'int', possible loss of data, these come from gps drivers shared with px4
/wd4267 \ # silence conversion from 'size_t' to 'int', possible loss of data, these come from gps drivers shared with px4
/wd4100 # gst-plugins-good has this error
WarningsAsErrorsOn {
QMAKE_CXXFLAGS_WARN_ON += /WX
}
...
...
qmlglsink.pri
View file @
dc215919
# FIXME: will be fixed after converting qmlglsink into .pro#static lib
QMAKE_CXXFLAGS_WARN_ON =
LinuxBuild {
DEFINES += HAVE_QT_X11 HAVE_QT_EGLFS HAVE_QT_WAYLAND
} else:MacBuild {
...
...
src/MissionManager/SimpleMissionItem.cc
View file @
dc215919
...
...
@@ -1008,8 +1008,8 @@ double SimpleMissionItem::amslEntryAlt(void) const
return
_missionItem
.
param7
();
case
QGroundControlQmlGlobal
:
:
AltitudeModeRelative
:
return
_missionItem
.
param7
()
+
_masterController
->
missionController
()
->
plannedHomePosition
().
altitude
();
case
QGroundControlQmlGlobal
:
:
AltitudeModeNone
:
qWarning
()
<<
"Internal Error SimpleMissionItem::amslEntryAlt: Invalid altitudeMode == AltitudeModeNone"
;
return
qQNaN
();
}
qWarning
()
<<
"Internal Error SimpleMissionItem::amslEntryAlt: Invalid altitudeMode:"
<<
_altitudeMode
;
return
qQNaN
();
}
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