diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 40c3a62d9dadb43ea2f377048b0ea78eb913e59c..c2b744209e1121622c442896f9d6541bec7de1cf 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -158,12 +158,8 @@ static QObject* shapeFileHelperSingletonFactory(QQmlEngine*, QJSEngine*) } QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) - #if defined(__mobile__) - : QGuiApplication (argc, argv) - #else - : QApplication (argc, argv) - #endif - , _runningUnitTests (unitTesting) + : QGuiApplication (argc, argv) + , _runningUnitTests (unitTesting) { _app = this; _msecsElapsedTime.start(); diff --git a/src/QGCApplication.h b/src/QGCApplication.h index 19b293883e9d3ea0a28a9d4e961bf3068c55bef3..364da2d10866ba52ff126b0b678e7fae543af5cd 100644 --- a/src/QGCApplication.h +++ b/src/QGCApplication.h @@ -7,17 +7,7 @@ * ****************************************************************************/ - -/** - * @file - * @brief Definition of main class - * - * @author Lorenz Meier - * - */ - -#ifndef QGCAPPLICATION_H -#define QGCAPPLICATION_H +#pragma once #include #include @@ -45,21 +35,7 @@ class QGCSingleton; class QGCToolbox; class QGCFileDownload; -/** - * @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 +class QGCApplication : public QGuiApplication { Q_OBJECT @@ -214,5 +190,3 @@ private: /// @brief Returns the QGCApplication object singleton. QGCApplication* qgcApp(void); - -#endif