From dc215919dadf9b38dfe0d3ab88cd1bb201a56d97 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 13 May 2020 08:59:02 -0700 Subject: [PATCH] Turn warnings back on, silence warnings we can't fix --- QGCCommon.pri | 3 ++- qmlglsink.pri | 3 --- src/MissionManager/SimpleMissionItem.cc | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/QGCCommon.pri b/QGCCommon.pri index 996b7d6..caaa0a2 100644 --- a/QGCCommon.pri +++ b/QGCCommon.pri @@ -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 } diff --git a/qmlglsink.pri b/qmlglsink.pri index a6a07df..80c5622 100644 --- a/qmlglsink.pri +++ b/qmlglsink.pri @@ -1,6 +1,3 @@ -# 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 { diff --git a/src/MissionManager/SimpleMissionItem.cc b/src/MissionManager/SimpleMissionItem.cc index 7f61f97..918a46c 100644 --- a/src/MissionManager/SimpleMissionItem.cc +++ b/src/MissionManager/SimpleMissionItem.cc @@ -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(); }