Merge branch 'my_qt5' of https://github.com/mavlink/qgroundcontrol into my_qt5

src/GAudioOutput.cc

@@ -221,7 +221,7 @@ bool GAudioOutput::say(QString text, int severity)
             // Slashes necessary to have the right start to the sentence
             // copying data prevents SpeakString from reading additional chars
             text = "\\" + text;
-            QStdWString str = text.toStdWString();
+            std::wstring str = text.toStdWString();
             unsigned char str2[1024] = {};
             memcpy(str2, text.toLatin1().data(), str.length());
             SpeakString(str2);

src/GAudioOutput.h

@@ -36,8 +36,8 @@ This file is part of the PIXHAWK project
 #include <QTimer>
 #include <QStringList>
 #ifdef Q_OS_MAC
-#include <MediaObject>
-#include <AudioOutput>
+//#include <MediaObject>
+//#include <AudioOutput>
 #endif
 #ifdef Q_OS_LINUX
 //#include <phonon/MediaObject>

src/uas/QGCUASFileManager.cc

@@ -448,7 +448,7 @@ bool QGCUASFileManager::_sendOpcodeOnlyCmd(uint8_t opcode, OperationState newOpS
     
     _sendRequest(&request);
     
-    return TRUE;
+    return true;
 }
 
 /// @brief Starts the ack timeout timer