Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next

ground/openpilotgcs/copydata.pro

@@ -19,7 +19,10 @@ equals(copydata, 1) {
                   QtSql4.dll \
                   QtSvg4.dll \
                   QtTest4.dll \
-                  QtXml4.dll
+                  QtXml4.dll \
+                  QtDeclarative4.dll \
+                  QtXmlPatterns4.dll \
+                  QtScript4.dll
         for(dll, QT_DLLS) {
             data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline()
         }

ground/openpilotgcs/src/app/Info.plist

@@ -172,7 +172,7 @@
 		</dict>
 	</array>
 	<key>CFBundleGetInfoString</key>
-	<string>Qt Creator; Copyright Nokia Corporation</string>
+	<string>OpenPilot GCS; Copyright OpenPilot</string>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
@@ -182,7 +182,7 @@
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.nokia.qtcreator</string>
+	<string>org.openpilot.openpilotgcs</string>
 	<key>CFBundleVersion</key>
 	<string>1.3.1</string>
 	<key>CFBundleShortVersionString</key>

ground/openpilotgcs/src/libs/glc_lib/glc_ext.h

@@ -35,6 +35,11 @@
 #include "glu.h"
 #endif
 
+#if defined(Q_OS_WIN32)
+#include "GL/gl.h"
+#include "GL/glu.h"
+#endif
+
 #if !defined(Q_OS_MAC)
 // ARB_vertex_buffer_object
 extern PFNGLBINDBUFFERARBPROC			glBindBuffer;

ground/openpilotgcs/src/libs/glc_lib/viewport/glc_camera.cpp

@@ -30,6 +30,11 @@
 #include "glu.h"
 #endif
 
+#if defined(Q_OS_WIN32)
+#include "GL/gl.h"
+#include "GL/glu.h"
+#endif
+
 #include <QtDebug>
 
 using namespace glc;