Commit 746b7b74 authored by pixhawk's avatar pixhawk

Removed last warning, fixed Mac auto-configuration for 32/64bit environments

parent 29da5425
...@@ -37,16 +37,17 @@ message(Qt version $$[QT_VERSION]) ...@@ -37,16 +37,17 @@ message(Qt version $$[QT_VERSION])
macx { macx {
HARDWARE_PLATFORM = $$system(uname -a) 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 # x86 Mac OS X Leopard 10.5 and earlier
CONFIG += x86 cocoa phonon CONFIG += x86 cocoa phonon
message(Building for Mac OS X 32bit/Leopard 10.5 and earlier) message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
# Enable function-profiling with the OS X saturn tool # Enable function-profiling with the OS X saturn tool
debug { debug {
#QMAKE_CXXFLAGS += -finstrument-functions #QMAKE_CXXFLAGS += -finstrument-functions
#LIBS += -lSaturn #LIBS += -lSaturn
} }
} else { } else {
# x64 Mac OS X Snow Leopard 10.6 and later # x64 Mac OS X Snow Leopard 10.6 and later
CONFIG += x86_64 cocoa CONFIG += x86_64 cocoa
......
...@@ -415,6 +415,7 @@ QWidget* LinechartWidget::createCurveItem(QString curve) ...@@ -415,6 +415,7 @@ QWidget* LinechartWidget::createCurveItem(QString curve)
**/ **/
void LinechartWidget::removeCurve(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 //TODO @todo Ensure that the button for a curve gets deleted when the original curve is deleted
// Remove name // Remove name
} }
......
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