Merge pull request #2093 from dogmaphobic/gitVersion

Some work for iOS

QGCApplication.pro

@@ -18,7 +18,6 @@
 # -------------------------------------------------
 
 include(QGCCommon.pri)
-include(git_version.pri)
 
 TARGET = qgroundcontrol
 TEMPLATE = app

QGCCommon.pri

@@ -69,6 +69,16 @@ MobileBuild {
     DEFINES += __mobile__
 }
 
+# set the QGC version from git
+
+exists ($$PWD/.git) {
+  GIT_DESCRIBE = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
+} else {
+  GIT_DESCRIBE = None
+}
+
+DEFINES += GIT_VERSION=\"\\\"$$GIT_DESCRIBE\\\"\"
+
 # Installer configuration
 
 installer {

git_version.pri

@@ -1,30 +0,0 @@
-# set the QGC version from git
-
-exists ($$PWD/.git) {
-  GIT_DESCRIBE = $$system(git --git-dir $$PWD/.git --work-tree $$PWD describe --always --tags)
-  WindowsBuild {
-    QGC_GIT_VER = echo extern \"C\" { const char *git_version() { return \"$$GIT_DESCRIBE\"; } } > git_version.cpp
-    LIBS += git_version.obj
-  } else {
-    QGC_GIT_VER = echo \"extern \\\"C\\\" { const char *git_version() { return \\\"$$GIT_DESCRIBE\\\"; } }\" > git_version.cpp
-    LIBS += git_version.o
-  }
-}
-
-WindowsBuild {
-  LIBS += git_version.obj
-} else {
-  LIBS += git_version.o
-}
-
-CONFIG(debug) {
-  GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
-} else {
-  GIT_VERSION_CXXFLAGS = $$QMAKE_CXXFLAGS_RELEASE
-}
-
-MacBuild {
-    QMAKE_PRE_LINK += $$QGC_GIT_VER && $$QMAKE_CXX -mmacosx-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET -c $$GIT_VERSION_CXXFLAGS git_version.cpp
-} else {
-    QMAKE_PRE_LINK += $$QGC_GIT_VER && $$QMAKE_CXX -c $$GIT_VERSION_CXXFLAGS git_version.cpp
-}

qgroundcontrol.pro

@@ -22,8 +22,6 @@ CONFIG  +=  ordered
 SUBDIRS  =  ./QGCLocationPlugin.pro
 SUBDIRS +=  ./QGCApplication.pro
 
-include(git_version.pri)
-
 QGCApplication.depends = QGCLocationPlugin
 
 message(Qt version $$[QT_VERSION])

src/GAudioOutput.cc

@@ -95,6 +95,7 @@ bool GAudioOutput::say(const QString& inText, int severity)
     if (!muted) {
 #if defined __android__
 #if defined QGC_SPEECH_ENABLED
+        Q_UNUSED(severity);
         static const char V_jniClassName[] {"org/qgroundcontrol/qgchelper/UsbDeviceJNI"};
         QAndroidJniEnvironment env;
         if (env->ExceptionCheck()) {

src/QGCApplication.cc

@@ -41,7 +41,6 @@
 
 #include "VideoStreaming.h"
 
-#include "git_version.h"
 #include "QGC.h"
 #include "QGCApplication.h"
 #include "MainWindow.h"
@@ -283,7 +282,7 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     setOrganizationName(QGC_ORG_NAME);
     setOrganizationDomain(QGC_ORG_DOMAIN);
 
-    QString versionString(git_version());
+    QString versionString(GIT_VERSION);
     // stable versions are on tags (v1.2.3)
     // development versions are full git describe versions (v1.2.3-18-g879e8b3)
     if (versionString.length() > 8) {

src/VideoStreaming/gstqtvideosink/utils/glutils.h

@@ -30,7 +30,7 @@ This file is part of the QGROUNDCONTROL project
 #ifndef GLUTILS_H
 #define GLUTILS_H
 
-#ifdef __android__
+#ifdef __mobile__
 #include <QOpenGLFunctions>
 #define getQOpenGLFunctions() QOpenGLContext::currentContext()->functions()
 #define QOpenGLFunctionsDef QOpenGLFunctions

src/git_version.h

@@ -1,3 +0,0 @@
-extern "C" {
-	const char *git_version();
-}