From 683fda7c2857c6f0da5a88bb9c06bdec5f85a428 Mon Sep 17 00:00:00 2001
From: INIDETAM <inidetam@inidetam-desktop.(none)>
Date: Wed, 12 Jan 2011 10:14:03 -0600
Subject: [PATCH] Changes in TestUnit

---
 qgcunittest/tst_uasunittest.cc | 7 ++++++-
 qgroundcontrol.pri             | 4 +++-
 qgroundcontrol.pro             | 1 +
 src/GAudioOutput.h             | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/qgcunittest/tst_uasunittest.cc b/qgcunittest/tst_uasunittest.cc
index 82f4fe2..8fcb1ba 100644
--- a/qgcunittest/tst_uasunittest.cc
+++ b/qgcunittest/tst_uasunittest.cc
@@ -14,6 +14,9 @@ private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void testCase1();
+
+protected:
+    UAS *prueba;
 };
 
 UASUnitTest::UASUnitTest()
@@ -23,7 +26,7 @@ UASUnitTest::UASUnitTest()
 void UASUnitTest::initTestCase()
 {
   MAVLinkProtocol *mav= new MAVLinkProtocol();
-  UAS *prueba=new UAS(mav,0);
+   prueba=new UAS(mav,0);
 }
 
 void UASUnitTest::cleanupTestCase()
@@ -32,7 +35,9 @@ void UASUnitTest::cleanupTestCase()
 
 void UASUnitTest::testCase1()
 {
+
     QVERIFY2(true, "Failure");
+
 }
 
 QTEST_APPLESS_MAIN(UASUnitTest);
diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index f972573..0f8c74f 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -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
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 81789c5..19e2483 100644
--- a/qgroundcontrol.pro
+++ b/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
diff --git a/src/GAudioOutput.h b/src/GAudioOutput.h
index a488982..b30a26c 100644
--- a/src/GAudioOutput.h
+++ b/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>