diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 44a5498..3db7b0f 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -158,9 +158,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) , _logOutput (false) , _fakeMobile (false) , _settingsUpgraded (false) -#ifdef QT_DEBUG - , _testHighDPI (false) -#endif , _toolbox (nullptr) , _bluetoothAvailable (false) { @@ -239,9 +236,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting) { "--logging", &logging, &loggingOptions }, { "--fake-mobile", &_fakeMobile, nullptr }, { "--log-output", &_logOutput, nullptr }, - #ifdef QT_DEBUG - { "--test-high-dpi", &_testHighDPI, nullptr }, - #endif // Add additional command line option flags here }; diff --git a/src/QGCApplication.h b/src/QGCApplication.h index a78c6ea..5c86cd5 100644 --- a/src/QGCApplication.h +++ b/src/QGCApplication.h @@ -85,10 +85,6 @@ public: /// @return true: Fake ui into showing mobile interface bool fakeMobile(void) { return _fakeMobile; } -#ifdef QT_DEBUG - bool testHighDPI(void) { return _testHighDPI; } -#endif - // Still working on getting rid of this and using dependency injection instead for everything QGCToolbox* toolbox(void) { return _toolbox; } @@ -171,10 +167,6 @@ private: bool _fakeMobile; ///< true: Fake ui into displaying mobile interface bool _settingsUpgraded; ///< true: Settings format has been upgrade to new version -#ifdef QT_DEBUG - bool _testHighDPI; ///< true: double fonts sizes for simulating high dpi devices -#endif - QGCToolbox* _toolbox; QTranslator _QGCTranslator; diff --git a/src/QmlControls/ScreenToolsController.h b/src/QmlControls/ScreenToolsController.h index 670b998..b9fc5e0 100644 --- a/src/QmlControls/ScreenToolsController.h +++ b/src/QmlControls/ScreenToolsController.h @@ -32,7 +32,6 @@ public: Q_PROPERTY(bool isAndroid READ isAndroid CONSTANT) Q_PROPERTY(bool isiOS READ isiOS CONSTANT) Q_PROPERTY(bool isMobile READ isMobile CONSTANT) - Q_PROPERTY(bool testHighDPI READ testHighDPI CONSTANT) Q_PROPERTY(bool isDebug READ isDebug CONSTANT) Q_PROPERTY(bool isMacOS READ isMacOS CONSTANT) Q_PROPERTY(bool isLinux READ isLinux CONSTANT) @@ -89,11 +88,9 @@ public: #endif #ifdef QT_DEBUG - bool testHighDPI () { return qgcApp()->testHighDPI(); } bool isDebug () { return true; } #else bool isDebug () { return false; } - bool testHighDPI () { return false; } #endif QString iOSDevice () const;