From 5ced372f7df0443f96f5c73b081ce3fd7ef3d2d7 Mon Sep 17 00:00:00 2001
From: Philippe Renon <op.filnet@yahoo.fr>
Date: Sun, 15 Sep 2013 22:01:30 +0200
Subject: [PATCH] [OP-835] Qt 5.1.0 - migrated GCS main

---
 ground/openpilotgcs/src/app/app.pro                  |  4 +++-
 ground/openpilotgcs/src/app/main.cpp                 |  9 +++++----
 .../qtsingleapplication/qtsingleapplication.cpp      | 12 ++----------
 .../shared/qtsingleapplication/qtsingleapplication.h |  3 +--
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro
index 2eb1d8dc7..8e0402565 100644
--- a/ground/openpilotgcs/src/app/app.pro
+++ b/ground/openpilotgcs/src/app/app.pro
@@ -4,7 +4,9 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
 TEMPLATE = app
 TARGET = $$GCS_APP_TARGET
 DESTDIR = $$GCS_APP_PATH
-QT += xml
+
+QT += xml widgets
+
 SOURCES += main.cpp \
     gcssplashscreen.cpp
 
diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp
index f58f46077..696fb38e5 100644
--- a/ground/openpilotgcs/src/app/main.cpp
+++ b/ground/openpilotgcs/src/app/main.cpp
@@ -86,6 +86,7 @@
 #include <extensionsystem/iplugin.h>
 
 #include <QtCore/QDir>
+#include <QtCore/QFile>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QTextStream>
 #include <QtCore/QFileInfo>
@@ -96,10 +97,10 @@
 #include <QtCore/QSettings>
 #include <QtCore/QVariant>
 
-#include <QtGui/QMessageBox>
-#include <QtGui/QApplication>
-#include <QtGui/QMainWindow>
-#include <QtGui/QSplashScreen>
+#include <QMessageBox>
+#include <QtWidgets/QApplication>
+#include <QMainWindow>
+#include <QSplashScreen>
 
 namespace {
 typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;
diff --git a/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.cpp b/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.cpp
index 5d1394cac..854526066 100644
--- a/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.cpp
+++ b/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.cpp
@@ -29,8 +29,8 @@
 #include "qtsingleapplication.h"
 #include "qtlocalpeer.h"
 
-#include <QtGui/QWidget>
-#include <QtGui/QFileOpenEvent>
+#include <QWidget>
+#include <QFileOpenEvent>
 
 namespace SharedTools {
 void QtSingleApplication::sysInit(const QString &appId)
@@ -54,14 +54,6 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
     sysInit(appId);
 }
 
-
-QtSingleApplication::QtSingleApplication(int &argc, char * *argv, Type type)
-    : QApplication(argc, argv, type)
-{
-    sysInit();
-}
-
-
 #if defined(Q_WS_X11)
 QtSingleApplication::QtSingleApplication(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
     : QApplication(dpy, visual, colormap)
diff --git a/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.h b/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.h
index 2d1a6d05e..844335c0a 100644
--- a/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.h
+++ b/ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.h
@@ -26,7 +26,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 namespace SharedTools {
 class QtLocalPeer;
@@ -37,7 +37,6 @@ class QtSingleApplication : public QApplication {
 public:
     QtSingleApplication(int &argc, char * *argv, bool GUIenabled = true);
     QtSingleApplication(const QString &id, int &argc, char * *argv);
-    QtSingleApplication(int &argc, char * *argv, Type type);
 #if defined(Q_WS_X11)
     QtSingleApplication(Display *dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
     QtSingleApplication(Display *dpy, int &argc, char * *argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0);