Commit dc215919 authored by DonLakeFlyer's avatar DonLakeFlyer

parent ebf188a0
...@@ -250,7 +250,8 @@ WindowsBuild { ...@@ -250,7 +250,8 @@ WindowsBuild {
/wd4996 \ # silence warnings about deprecated strcpy and whatnot, these come from the shapefile code with is external /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 /wd4005 \ # silence warnings about macro redefinition, these come from the shapefile code with is external
/wd4290 \ # ignore exception specifications /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 { WarningsAsErrorsOn {
QMAKE_CXXFLAGS_WARN_ON += /WX QMAKE_CXXFLAGS_WARN_ON += /WX
} }
......
# FIXME: will be fixed after converting qmlglsink into .pro#static lib
QMAKE_CXXFLAGS_WARN_ON =
LinuxBuild { LinuxBuild {
DEFINES += HAVE_QT_X11 HAVE_QT_EGLFS HAVE_QT_WAYLAND DEFINES += HAVE_QT_X11 HAVE_QT_EGLFS HAVE_QT_WAYLAND
} else:MacBuild { } else:MacBuild {
......
...@@ -1008,8 +1008,8 @@ double SimpleMissionItem::amslEntryAlt(void) const ...@@ -1008,8 +1008,8 @@ double SimpleMissionItem::amslEntryAlt(void) const
return _missionItem.param7(); return _missionItem.param7();
case QGroundControlQmlGlobal::AltitudeModeRelative: case QGroundControlQmlGlobal::AltitudeModeRelative:
return _missionItem.param7() + _masterController->missionController()->plannedHomePosition().altitude(); 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();
} }
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