rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

[OP-835] Qt 5.1.0 - migrated GCS main

Browse Source
This commit is contained in:
Philippe Renon 2013-09-15 22:01:30 +02:00
parent 4fd04d38f3
commit 5ced372f7d
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/app/app.pro
View File

@ -4,7 +4,9 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE = app TEMPLATE = app
TARGET = $$GCS_APP_TARGET TARGET = $$GCS_APP_TARGET
DESTDIR = $$GCS_APP_PATH DESTDIR = $$GCS_APP_PATH
QT += xml
QT += xml widgets
SOURCES += main.cpp \ SOURCES += main.cpp \
gcssplashscreen.cpp gcssplashscreen.cpp

9
ground/openpilotgcs/src/app/main.cpp
View File

@ -86,6 +86,7 @@
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QElapsedTimer> #include <QtCore/QElapsedTimer>
#include <QtCore/QTextStream> #include <QtCore/QTextStream>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
@ -96,10 +97,10 @@
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QMessageBox> #include <QMessageBox>
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
#include <QtGui/QMainWindow> #include <QMainWindow>
#include <QtGui/QSplashScreen> #include <QSplashScreen>
namespace { namespace {
typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet; typedef QList<ExtensionSystem::PluginSpec *> PluginSpecSet;

12
ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.cpp
View File

@ -29,8 +29,8 @@
#include "qtsingleapplication.h" #include "qtsingleapplication.h"
#include "qtlocalpeer.h" #include "qtlocalpeer.h"
#include <QtGui/QWidget> #include <QWidget>
#include <QtGui/QFileOpenEvent> #include <QFileOpenEvent>
namespace SharedTools { namespace SharedTools {
void QtSingleApplication::sysInit(const QString &appId) void QtSingleApplication::sysInit(const QString &appId)
@ -54,14 +54,6 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
sysInit(appId); sysInit(appId);
} }
QtSingleApplication::QtSingleApplication(int &argc, char * *argv, Type type)
: QApplication(argc, argv, type)
{
sysInit();
}
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
QtSingleApplication::QtSingleApplication(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) QtSingleApplication::QtSingleApplication(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
: QApplication(dpy, visual, colormap) : QApplication(dpy, visual, colormap)

3
ground/openpilotgcs/src/shared/qtsingleapplication/qtsingleapplication.h
View File

@ -26,7 +26,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <QtGui/QApplication> #include <QtWidgets/QApplication>
namespace SharedTools { namespace SharedTools {
class QtLocalPeer; class QtLocalPeer;
@ -37,7 +37,6 @@ class QtSingleApplication : public QApplication {
public: public:
QtSingleApplication(int &argc, char * *argv, bool GUIenabled = true); QtSingleApplication(int &argc, char * *argv, bool GUIenabled = true);
QtSingleApplication(const QString &id, int &argc, char * *argv); QtSingleApplication(const QString &id, int &argc, char * *argv);
QtSingleApplication(int &argc, char * *argv, Type type);
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
QtSingleApplication(Display *dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); 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); QtSingleApplication(Display *dpy, int &argc, char * *argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap = 0);