• Koen Kooi's avatar
    fix qmin/qmax types · 0c66e26a
    Koen Kooi authored
    qreal is a double on some platforms (x86) and a float on others (e.g. ARM), cast it to fix build errors like these:
    
    src/ui/designer/QGCXYPlot.cc: In member function 'int
    XYPlotCurve::appendData(const QPointF&)':
    src/ui/designer/QGCXYPlot.cc:41:39: error: no matching function for call
    to 'qMin(double&, qreal)'
                 xmin = qMin(xmin, data.x());
                                           ^
    src/ui/designer/QGCXYPlot.cc:41:39: note: candidate is:
    In file included from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qnamespace.h:45:0,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qobjectdefs.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwindowdefs.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qwidget.h:46,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/qdockwidget.h:45,
                     from
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtGui/QDockWidget:1,
                     from src/ui/designer/QGCXYPlot.cc:1:
    /build/v2013.12/build/tmp-angstrom_v2013_12-eglibc/sysroots/sama5d3_xplained/usr/include/qt4/QtCore/qglobal.h:1213:34:
    note: template<class T> const T& qMin(const T&, const T&)
     Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return
    (a < b) ? a : b; }
                                      ^
    
    See http://www.qtcentre.org/archive/index.php/t-45475.html for some
    background.
    
    This fixes #625
    Signed-off-by: 's avatarKoen Kooi <koen@dominion.thruhere.net>
    0c66e26a
Name
Last commit
Last update
..
RadioCalibration Loading commit data...
configuration Loading commit data...
designer Loading commit data...
firmwareupdate Loading commit data...
generated Loading commit data...
linechart Loading commit data...
main Loading commit data...
map Loading commit data...
map3D Loading commit data...
mavlink Loading commit data...
mission Loading commit data...
px4_configuration Loading commit data...
uas Loading commit data...
watchdog Loading commit data...
AudioOutputWidget.cc Loading commit data...
AudioOutputWidget.h Loading commit data...
AudioOutputWidget.ui Loading commit data...
CameraView.cc Loading commit data...
CameraView.h Loading commit data...
CommConfigurationWindow.cc Loading commit data...
CommConfigurationWindow.h Loading commit data...
CommSettings.ui Loading commit data...
DebugConsole.cc Loading commit data...
DebugConsole.h Loading commit data...
DebugConsole.ui Loading commit data...
HDDisplay.cc Loading commit data...
HDDisplay.h Loading commit data...
HDDisplay.ui Loading commit data...
HSIDisplay.cc Loading commit data...
HSIDisplay.h Loading commit data...
HUD.cc Loading commit data...
HUD.h Loading commit data...
InputConfiguration.cc Loading commit data...
JoystickAxis.cc Loading commit data...
JoystickAxis.h Loading commit data...
JoystickAxis.ui Loading commit data...
JoystickButton.cc Loading commit data...
JoystickButton.h Loading commit data...
JoystickButton.ui Loading commit data...
JoystickWidget.cc Loading commit data...
JoystickWidget.h Loading commit data...
JoystickWidget.ui Loading commit data...
Linechart.ui Loading commit data...
MAVLinkDecoder.cc Loading commit data...
MAVLinkDecoder.h Loading commit data...
MAVLinkSettingsWidget.cc Loading commit data...
MAVLinkSettingsWidget.h Loading commit data...
MAVLinkSettingsWidget.ui Loading commit data...
MainWindow.cc Loading commit data...
MainWindow.h Loading commit data...
MainWindow.ui Loading commit data...
MapWidget.cc Loading commit data...
MapWidget.h Loading commit data...
MapWidget.ui Loading commit data...
ObjectDetectionView.cc Loading commit data...
ObjectDetectionView.h Loading commit data...
ObjectDetectionView.ui Loading commit data...
OgreWidget.cc Loading commit data...
OgreWidget.h Loading commit data...
OpalLinkConfigurationWindow.cc Loading commit data...
OpalLinkConfigurationWindow.h Loading commit data...
OpalLinkSettings.ui Loading commit data...
PX4FirmwareUpgrader.cc Loading commit data...
PX4FirmwareUpgrader.h Loading commit data...
PX4FirmwareUpgrader.ui Loading commit data...
ParameterInterface.cc Loading commit data...
ParameterInterface.h Loading commit data...
ParameterInterface.ui Loading commit data...
ParameterView.ui Loading commit data...
PrimaryFlightDisplay.cc Loading commit data...
PrimaryFlightDisplay.h Loading commit data...
QGCBaseParamWidget.cc Loading commit data...
QGCBaseParamWidget.h Loading commit data...
QGCConfigView.cc Loading commit data...
QGCConfigView.h Loading commit data...
QGCConfigView.ui Loading commit data...
QGCDataPlot2D.cc Loading commit data...
QGCDataPlot2D.h Loading commit data...
QGCDataPlot2D.ui Loading commit data...
QGCFirmwareUpdate.cc Loading commit data...
QGCFirmwareUpdate.h Loading commit data...
QGCFirmwareUpdate.ui Loading commit data...
QGCHilConfiguration.cc Loading commit data...
QGCHilConfiguration.h Loading commit data...
QGCHilConfiguration.ui Loading commit data...
QGCHilFlightGearConfiguration.cc Loading commit data...
QGCHilFlightGearConfiguration.h Loading commit data...
QGCHilFlightGearConfiguration.ui Loading commit data...
QGCHilJSBSimConfiguration.cc Loading commit data...
QGCHilJSBSimConfiguration.h Loading commit data...
QGCHilJSBSimConfiguration.ui Loading commit data...
QGCHilXPlaneConfiguration.cc Loading commit data...
QGCHilXPlaneConfiguration.h Loading commit data...
QGCHilXPlaneConfiguration.ui Loading commit data...
QGCMAVLinkInspector.cc Loading commit data...
QGCMAVLinkInspector.h Loading commit data...
QGCMAVLinkInspector.ui Loading commit data...
QGCMAVLinkLogPlayer.cc Loading commit data...
QGCMAVLinkLogPlayer.h Loading commit data...
QGCMAVLinkLogPlayer.ui Loading commit data...
QGCMainWindowAPConfigurator.cc Loading commit data...
QGCMainWindowAPConfigurator.h Loading commit data...
QGCPX4VehicleConfig.cc Loading commit data...
QGCPX4VehicleConfig.h Loading commit data...
QGCPX4VehicleConfig.ui Loading commit data...
QGCParamWidget.cc Loading commit data...
QGCParamWidget.h Loading commit data...
QGCPendingParamWidget.cc Loading commit data...
QGCPendingParamWidget.h Loading commit data...
QGCPluginHost.cc Loading commit data...
QGCPluginHost.h Loading commit data...
QGCPluginHost.ui Loading commit data...
QGCPxImuFirmwareUpdate.cc Loading commit data...
QGCPxImuFirmwareUpdate.h Loading commit data...
QGCPxImuFirmwareUpdate.ui Loading commit data...
QGCRGBDView.cc Loading commit data...
QGCRGBDView.h Loading commit data...
QGCRemoteControlView.cc Loading commit data...
QGCRemoteControlView.h Loading commit data...
QGCRemoteControlView.ui Loading commit data...
QGCSensorSettingsWidget.cc Loading commit data...
QGCSensorSettingsWidget.h Loading commit data...
QGCSensorSettingsWidget.ui Loading commit data...
QGCSettingsWidget.cc Loading commit data...
QGCSettingsWidget.h Loading commit data...
QGCSettingsWidget.ui Loading commit data...
QGCStatusBar.cc Loading commit data...
QGCStatusBar.h Loading commit data...
QGCTCPLinkConfiguration.cc Loading commit data...
QGCTCPLinkConfiguration.h Loading commit data...
QGCTCPLinkConfiguration.ui Loading commit data...
QGCTabbedInfoView.cpp Loading commit data...
QGCTabbedInfoView.h Loading commit data...
QGCTabbedInfoView.ui Loading commit data...
QGCToolBar.cc Loading commit data...
QGCToolBar.h Loading commit data...
QGCUDPLinkConfiguration.cc Loading commit data...
QGCUDPLinkConfiguration.h Loading commit data...
QGCUDPLinkConfiguration.ui Loading commit data...
QGCVehicleConfig.cc Loading commit data...
QGCVehicleConfig.h Loading commit data...
QGCVehicleConfig.ui Loading commit data...
QGCWaypointListMulti.cc Loading commit data...
QGCWaypointListMulti.h Loading commit data...
QGCWaypointListMulti.ui Loading commit data...
QGCWebView.cc Loading commit data...
QGCWebView.h Loading commit data...
QGCWebView.ui Loading commit data...
QGCWelcomeWidget.cc Loading commit data...
QGCWelcomeWidget.h Loading commit data...
QGCWelcomeWidget.ui Loading commit data...
QMap3D.ui Loading commit data...
SerialConfigurationWindow.cc Loading commit data...
SerialConfigurationWindow.h Loading commit data...
SerialSettings.ui Loading commit data...
SlugsDataSensorView.cc Loading commit data...
SlugsDataSensorView.h Loading commit data...
SlugsDataSensorView.ui Loading commit data...
SlugsHilSim.cc Loading commit data...
SlugsHilSim.h Loading commit data...
SlugsHilSim.ui Loading commit data...
SlugsPadCameraControl.cpp Loading commit data...
SlugsPadCameraControl.h Loading commit data...
SlugsPadCameraControl.ui Loading commit data...
SlugsVideoCamControl.cpp Loading commit data...
UASControl.ui Loading commit data...
UASControlParameters.ui Loading commit data...
UASInfo.ui Loading commit data...
UASList.ui Loading commit data...
UASRawStatusView.cpp Loading commit data...
UASRawStatusView.h Loading commit data...
UASRawStatusView.ui Loading commit data...
UASView.ui Loading commit data...
WaypointEditableView.cc Loading commit data...
WaypointEditableView.h Loading commit data...
WaypointEditableView.ui Loading commit data...
WaypointList.cc Loading commit data...
WaypointList.cc.orig Loading commit data...
WaypointList.h Loading commit data...
WaypointList.ui Loading commit data...
WaypointViewOnlyView.cc Loading commit data...
WaypointViewOnlyView.h Loading commit data...
WaypointViewOnlyView.ui Loading commit data...
XbeeConfigurationWindow.cpp Loading commit data...
XbeeConfigurationWindow.h Loading commit data...
apmtoolbar.cpp Loading commit data...
apmtoolbar.h Loading commit data...
dongfang-scrapyard.txt Loading commit data...
menuactionhelper.cpp Loading commit data...
menuactionhelper.h Loading commit data...
submainwindow.cpp Loading commit data...
submainwindow.h Loading commit data...