diff --git a/qgcunittest/tst_uasunittest.cc b/qgcunittest/tst_uasunittest.cc index 82f4fe2c6b655ffcd4f0d3465b08ee6a90336afe..8fcb1ba37bb359092cf640e12444ba6dac43c114 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 f9725737bc3e8d51732ea873746b5ebca0509925..0f8c74f54d4e10ddb6c6de069ea8ca70cc37e049 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 81789c578fd371c80201dc868715b0724ecb4b6a..19e2483ffc384d264f48fd88fcd9670269b7e122 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 a4889829d3ddcb14c8964b8ca616bc930fccf396..b30a26c7b34eab9987bac77f7c094a9e6016a0dd 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 -#include -#include +#include +#include #endif #ifdef Q_OS_WIN #include