Commit 768fed96 authored by Mariano Lizarraga's avatar Mariano Lizarraga

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

parents 73e270fe 683fda7c
...@@ -24,6 +24,8 @@ private Q_SLOTS: ...@@ -24,6 +24,8 @@ private Q_SLOTS:
private: private:
protected:
UAS *prueba;
}; };
UASUnitTest::UASUnitTest() UASUnitTest::UASUnitTest()
......
...@@ -164,6 +164,8 @@ linux-g++ { ...@@ -164,6 +164,8 @@ linux-g++ {
QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/. QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
message("Compiling for linux 32")
INCLUDEPATH += /usr/include \ INCLUDEPATH += /usr/include \
/usr/local/include \ /usr/local/include \
/usr/include/qt4/phonon /usr/include/qt4/phonon
......
...@@ -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("Adding support for additional MAVLink messages for: " $$MAVLINK_CONF)
message("------------------------------------------------------------------------") message("------------------------------------------------------------------------")
} }
INCLUDEPATH += $$BASEDIR/../mavlink/include/common INCLUDEPATH += $$BASEDIR/../mavlink/include/common
contains(MAVLINK_CONF, pixhawk) { contains(MAVLINK_CONF, pixhawk) {
# Remove the default set - it is included anyway # Remove the default set - it is included anyway
......
...@@ -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 #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
//#include <flite/flite.h> //#include <flite/flite.h>
#include <Phonon/MediaObject> #include <phonon/MediaObject>
#include <Phonon/AudioOutput> #include <phonon/AudioOutput>
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Phonon/MediaObject> #include <Phonon/MediaObject>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment