Merge branch 'experimental' of git://github.com/Ixchel/qgroundcontrol into experimental

qgcunittest/tst_uasunittest.cc

@@ -24,6 +24,8 @@ private Q_SLOTS:
 
 private:
 
+protected:
+    UAS *prueba;
 };
 
 UASUnitTest::UASUnitTest()

qgroundcontrol.pri

@@ -164,6 +164,8 @@ linux-g++ {
 
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
 
+message("Compiling for linux 32")
+
     INCLUDEPATH += /usr/include \
                    /usr/local/include \
                    /usr/include/qt4/phonon

qgroundcontrol.pro

@@ -55,6 +55,7 @@ exists(user_config.pri) {
     message("Adding support for additional MAVLink messages for: " $$MAVLINK_CONF)
     message("------------------------------------------------------------------------")
 }
+
 INCLUDEPATH += $$BASEDIR/../mavlink/include/common
 contains(MAVLINK_CONF, pixhawk) { 
     # Remove the default set - it is included anyway

src/GAudioOutput.h

@@ -40,8 +40,8 @@ This file is part of the PIXHAWK project
 #endif
 #ifdef Q_OS_LINUX
 //#include <flite/flite.h>
-#include <Phonon/MediaObject>
-#include <Phonon/AudioOutput>
+#include <phonon/MediaObject>
+#include <phonon/AudioOutput>
 #endif
 #ifdef Q_OS_WIN
 #include <Phonon/MediaObject>