From 746b7b74060a7c833ff55faa7750678ccb2047c3 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Wed, 14 Jul 2010 14:12:13 +0200 Subject: [PATCH] Removed last warning, fixed Mac auto-configuration for 32/64bit environments --- qgroundcontrol.pri | 9 +++++---- src/ui/linechart/LinechartWidget.cc | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index b7d6a3307..04fb7a478 100644 --- a/qgroundcontrol.pri +++ b/qgroundcontrol.pri @@ -37,16 +37,17 @@ message(Qt version $$[QT_VERSION]) macx { HARDWARE_PLATFORM = $$system(uname -a) - contains( HARDWARE_PLATFORM, 9.8.0 ) { + contains( HARDWARE_PLATFORM, 9.6.0 ) || contains( HARDWARE_PLATFORM, 9.7.0 ) || contains( HARDWARE_PLATFORM, 9.8.0 ) || || contains( HARDWARE_PLATFORM, 9.9.0 ) + { # x86 Mac OS X Leopard 10.5 and earlier CONFIG += x86 cocoa phonon message(Building for Mac OS X 32bit/Leopard 10.5 and earlier) - # Enable function-profiling with the OS X saturn tool - debug { + # Enable function-profiling with the OS X saturn tool + debug { #QMAKE_CXXFLAGS += -finstrument-functions #LIBS += -lSaturn - } + } } else { # x64 Mac OS X Snow Leopard 10.6 and later CONFIG += x86_64 cocoa diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index b23175eba..c02f64f4b 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -415,6 +415,7 @@ QWidget* LinechartWidget::createCurveItem(QString curve) **/ void LinechartWidget::removeCurve(QString curve) { + Q_UNUSED(curve) //TODO @todo Ensure that the button for a curve gets deleted when the original curve is deleted // Remove name } -- 2.22.0