Merge branch 'master' of pixhawk.ethz.ch:qgroundcontrol

.gitignore

@@ -8,7 +8,7 @@ obj
 bin/*.exe
 bin/*.txt
 bin/mac
-*pro.user
+*pro.user*
 qrc_*.cpp
 *.Debug
 *.Release

qgroundcontrol.pri

@@ -108,8 +108,49 @@ linux-g++ {
     LIBS += \
         -L/usr/lib \
         -lm \
+        -lflite_cmu_us_kal16 \
+        -lflite_usenglish \
+        -lflite_cmulex \
+        -lflite \
+        -lSDL \
+        -lSDLmain \
+        -lglut
+
         #-lflite_cmu_us_rms \
         #-lflite_cmu_us_slt \
+}
+
+linux-g++-64 {
+    CONFIG += debug
+
+    debug {
+        DESTDIR = $$BASEDIR
+    }
+
+    release {
+        DESTDIR = $$BASEDIR
+    }
+    INCLUDEPATH += /usr/include \
+                   /usr/include/qt4/phonon
+              # $$BASEDIR/lib/flite/include \
+              # $$BASEDIR/lib/flite/lang
+
+
+    HARDWARE_PLATFORM = $$system(uname -a)
+    contains( HARDWARE_PLATFORM, x86_64 ) {
+        # 64-bit Linux
+        #LIBS += \
+            #-L$$BASEDIR/lib/flite/linux64
+        message(Building for GNU/Linux 64bit/x64)
+    } else {
+        # 32-bit Linux
+        #LIBS += \
+           #-L$$BASEDIR/lib/flite/linux32
+        message(Building for GNU/Linux 32bit/i386)
+    }
+    LIBS += \
+        -L/usr/lib \
+        -lm \
         -lflite_cmu_us_kal16 \
         -lflite_usenglish \
         -lflite_cmulex \

qgroundcontrol.pro

@@ -55,7 +55,7 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/UASControl.ui \
     src/ui/UASList.ui \
     src/ui/UASInfo.ui \
-    src/ui/LineChart.ui \
+    src/ui/Linechart.ui \
     src/ui/UASView.ui \
     src/ui/ParameterInterface.ui \
     src/ui/WaypointList.ui \

src/comm/SerialLink.h

@@ -57,7 +57,7 @@ class SerialLink : public SerialLinkInterface {
     //Q_INTERFACES(SerialLinkInterface:LinkInterface)
 
 public:
-    SerialLink(QString portname=NULL, BaudRateType baudrate=BAUD57600, FlowType flow=FLOW_OFF, ParityType parity=PAR_NONE, DataBitsType dataBits=DATA_8, StopBitsType stopBits=STOP_1);
+    SerialLink(QString portname = "", BaudRateType baudrate=BAUD57600, FlowType flow=FLOW_OFF, ParityType parity=PAR_NONE, DataBitsType dataBits=DATA_8, StopBitsType stopBits=STOP_1);
     ~SerialLink();
 
     static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in configuration.h