QGuiApplication::primaryScreenChanged was only added in Qt 5.6

iBelieve · iBelieve · commit 089cd306af54 · 2016-03-22T22:41:07.000-05:00
diff --git a/src/core/device.cpp b/src/core/device.cpp
@@ -16,8 +16,10 @@ Device::Device(QObject *parent)
     QGuiApplication *app = (QGuiApplication *) QGuiApplication::instance();
     m_screen = app->primaryScreen();
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     connect(app, &QGuiApplication::primaryScreenChanged,
             this, &Device::screenChanged);
+#endif
 }
 
 QObject *Device::qmlSingleton(QQmlEngine *engine, QJSEngine *scriptEngine)
diff --git a/src/core/units.cpp b/src/core/units.cpp
@@ -64,13 +64,11 @@ void UnitsAttached::screenChanged(QScreen *screen)
 }
 
 int UnitsAttached::dp() const {
-    QString qtVersion = qVersion();
-
-    if (qtVersion > "5.6") {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
         return 1;
-    } else {
+#else
         return dpi()/160;
-    }
+#endif
 }
 
 int UnitsAttached::dpi() const

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,10 @@ Device::Device(QObject *parent)`
`16`	`16`	`QGuiApplication app = (QGuiApplication ) QGuiApplication::instance();`
`17`	`17`	`m_screen = app->primaryScreen();`
`18`	`18`
	`19`	`+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)`
`19`	`20`	`connect(app, &QGuiApplication::primaryScreenChanged,`
`20`	`21`	`this, &Device::screenChanged);`
	`22`	`+#endif`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`QObject Device::qmlSingleton(QQmlEngine engine, QJSEngine *scriptEngine)`