Commit d56b4d8b authored by DonLakeFlyer's avatar DonLakeFlyer

parent aa26bcb0
...@@ -158,12 +158,8 @@ static QObject* shapeFileHelperSingletonFactory(QQmlEngine*, QJSEngine*) ...@@ -158,12 +158,8 @@ static QObject* shapeFileHelperSingletonFactory(QQmlEngine*, QJSEngine*)
} }
QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
#if defined(__mobile__) : QGuiApplication (argc, argv)
: QGuiApplication (argc, argv) , _runningUnitTests (unitTesting)
#else
: QApplication (argc, argv)
#endif
, _runningUnitTests (unitTesting)
{ {
_app = this; _app = this;
_msecsElapsedTime.start(); _msecsElapsedTime.start();
......
...@@ -7,17 +7,7 @@ ...@@ -7,17 +7,7 @@
* *
****************************************************************************/ ****************************************************************************/
#pragma once
/**
* @file
* @brief Definition of main class
*
* @author Lorenz Meier <mavteam@student.ethz.ch>
*
*/
#ifndef QGCAPPLICATION_H
#define QGCAPPLICATION_H
#include <QApplication> #include <QApplication>
#include <QTimer> #include <QTimer>
...@@ -45,21 +35,7 @@ class QGCSingleton; ...@@ -45,21 +35,7 @@ class QGCSingleton;
class QGCToolbox; class QGCToolbox;
class QGCFileDownload; class QGCFileDownload;
/** class QGCApplication : public QGuiApplication
* @brief The main application and management class.
*
* This class is started by the main method and provides
* the central management unit of the groundstation application.
*
* Needs QApplication base to support QtCharts drawing module and
* avoid application crashing on 5.12. Enforce no widget on mobile
**/
class QGCApplication :
#if defined(__mobile__)
public QGuiApplication
#else
public QApplication
#endif
{ {
Q_OBJECT Q_OBJECT
...@@ -214,5 +190,3 @@ private: ...@@ -214,5 +190,3 @@ private:
/// @brief Returns the QGCApplication object singleton. /// @brief Returns the QGCApplication object singleton.
QGCApplication* qgcApp(void); QGCApplication* qgcApp(void);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment