Merge branch 'features-2989' into 'develop'

Features 2989 See merge request !39

Merge branch 'features-2989' into 'develop'
Features 2989 See merge request !39
bba9a5c3 · andrey.daragan · b6e833c2 · 1364f74d · bba9a5c3
Commit bba9a5c3 authored 5 years ago by andrey.daragan
--- a/Device.qml
+++ b/Device.qml
@@ -4,7 +4,9 @@ import QtQuick.Window 2.0
 Item {
    id: dapDevice
    
-    property string device: dp()
+//    property string device: dp()
+    //TODO: Temporary editing
+    property string device: "desktop"
    property int dpi: Screen.pixelDensity * 25.4
    
    function dp(){