Merge branch 'v10release' of github.com:pixhawk/qgroundcontrol into v10release

qgroundcontrol.pri

@@ -190,6 +190,8 @@ macx|macx-g++42|macx-g++: {
 # GNU/Linux
 linux-g++ {
 
+    CONFIG -= console
+
     debug {
         #DESTDIR = $$TARGETDIR/debug
         #CONFIG += debug console
@@ -274,6 +276,8 @@ message("Compiling for linux 32")
 
 linux-g++-64 {
 
+    CONFIG -= console
+
     debug {
         #DESTDIR = $$TARGETDIR/debug
         #CONFIG += debug console

src/ui/linechart/LinechartPlot.cc

@@ -132,7 +132,29 @@ LinechartPlot::LinechartPlot(QWidget *parent, int plotid, quint64 interval): Qwt
 
 LinechartPlot::~LinechartPlot()
 {
-    removeAllData();
+//    datalock.lock();
+//    // Delete curves
+//    QMap<QString, QwtPlotCurve*>::iterator i;
+//    for(i = curves.begin(); i != curves.end(); ++i) {
+//        // Remove from curve list
+//        QwtPlotCurve* curve = curves.take(i.key());
+//        // Delete the object
+//        delete curve;
+//        // Set the pointer null
+//        curve = NULL;
+//    }
+
+//    // Delete data
+//    QMap<QString, TimeSeriesData*>::iterator j;
+//    for(j = data.begin(); j != data.end(); ++j) {
+//        // Remove from data list
+//        TimeSeriesData* d = data.take(j.key());
+//        // Delete the object
+//        delete d;
+//        // Set the pointer null
+//        d = NULL;
+//    }
+//    datalock.unlock();
 }
 
 void LinechartPlot::showEvent(QShowEvent* event)

src/ui/linechart/LinechartWidget.cc

@@ -153,6 +153,8 @@ LinechartWidget::~LinechartWidget()
 {
     writeSettings();
     stopLogging();
+    if (activePlot) delete activePlot;
+    activePlot = NULL;
     delete listedCurves;
     listedCurves = NULL;
 }