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

14 years ago · 768fed9642
4 changed files with 8 additions and 3 deletions
--- a/qgcunittest/tst_uasunittest.cc
+++ b/qgcunittest/tst_uasunittest.cc
@ -24,6 +24,8 @@ private Q_SLOTS:
				@@ -24,6 +24,8 @@ private Q_SLOTS:

 private:

+protected:
+    UAS *prueba;
 };

 UASUnitTest::UASUnitTest()
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@ -164,8 +164,10 @@ linux-g++ {
				@@ -164,8 +164,10 @@ linux-g++ {

    QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.

+message("Compiling for linux 32")
+
    INCLUDEPATH += /usr/include \
-                                   /usr/local/include \
+                   /usr/local/include \
                   /usr/include/qt4/phonon
              # $$BASEDIR/lib/flite/include \
              # $$BASEDIR/lib/flite/lang
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -55,6 +55,7 @@ exists(user_config.pri) {
				@@ -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
--- a/src/GAudioOutput.h
+++ b/src/GAudioOutput.h
@ -40,8 +40,8 @@ This file is part of the PIXHAWK project
				@@ -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>