Recovering lost initial changes

.gitignore

@@ -55,6 +55,7 @@ thirdParty/qserialport/bin/
 thirdParty/qserialport/lib/
 libs/thirdParty/libxbee/lib/
 GeneratedFiles/
+gstreamer-1.0-android*
 
 *.autosave
 .settings/

QGCSetup.pri

@@ -19,10 +19,6 @@
 
 QMAKE_POST_LINK += echo "Copying files"
 
-AndroidBuild {
-    INSTALLS += $$DESTDIR
-}
-
 #
 # Copy the application resources to the associated place alongside the application
 #

src/Vehicle/Vehicle.cc

@@ -899,10 +899,9 @@ void Vehicle::setJoystickEnabled(bool enabled)
 
 void Vehicle::_startJoystick(bool start)
 {
+#ifndef __mobile__
     Joystick* joystick = JoystickManager::instance()->activeJoystick();
-    
     if (joystick) {
-#ifndef __mobile__
         if (start) {
             if (_joystickEnabled) {
                 joystick->startPolling(this);
@@ -910,8 +909,10 @@ void Vehicle::_startJoystick(bool start)
         } else {
             joystick->stopPolling();
         }
-#endif
     }
+#else
+    Q_UNUSED(start);
+#endif
 }
 
 bool Vehicle::active(void)

src/VideoStreaming/VideoStreaming.pri

@@ -56,7 +56,26 @@ LinuxBuild {
         INCLUDEPATH += \
             $$GST_ROOT/include/gstreamer-1.0 \
             $$GST_ROOT/include/glib-2.0 \
-            $$GST_ROOT/lib/gstreamer-1.0\include \
+            $$GST_ROOT/lib/gstreamer-1.0/include \
+            $$GST_ROOT/lib/glib-2.0/include
+    }
+} else:AndroidBuild {
+    #- gstreamer assumed to be installed in $$PWD/../../android/gstreamer-1.0-android-armv7-1.5.2
+    GST_ROOT = $$PWD/../../gstreamer-1.0-android-armv7-1.5.2
+    exists($$GST_ROOT) {
+        QMAKE_CXXFLAGS  += -pthread
+        CONFIG          += VideoEnabled
+        LIBS            += -L$$GST_ROOT/lib \
+            -lgstvideo-1.0 \
+            -lgstfft-1.0 -lm  \
+            -lgstnet-1.0 -lgio-2.0 \
+            -lgstaudio-1.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 \
+            -Wl,--export-dynamic -lgmodule-2.0 -pthread -lglib-2.0 -lorc-0.4 -liconv -lffi -lintl
+
+        INCLUDEPATH += \
+            $$GST_ROOT/include/gstreamer-1.0 \
+            $$GST_ROOT/lib/gstreamer-1.0/include \
+            $$GST_ROOT/include/glib-2.0 \
             $$GST_ROOT/lib/glib-2.0/include
     }
 }
@@ -138,6 +157,10 @@ VideoEnabled {
             message("  Select the devel AND runtime packages and install them (x86, not the 64-Bit)")
             message("  It will be installed in C:/gstreamer. You need to update you PATH to point to the bin directory.")
         }
+        AndroidBuild {
+            message("  You can download it from http://gstreamer.freedesktop.org/data/pkg/android/")
+            message("  Uncompress the archive into the qgc root source directory (same directory where qgroundcontrol.pro is found.")
+        }
     } else {
         message("Skipping support for video streaming (Unsupported platform)")
     }