Merge remote-tracking branch 'origin/5.10' into dev

Change-Id: I59e9e2044184f96f1e66577f6f639d028a825b9e

1 files changed, 5 insertions, 3 deletions

diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml
index 9c19c045..913e23f1 100644
--- a/src/imports/controls/Dialog.qml
+++ b/src/imports/controls/Dialog.qml
@@ -57,7 +57,8 @@ T.Dialog {
     padding: 12
 
     background: Rectangle {
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     header: Label {
@@ -70,6 +71,7 @@ T.Dialog {
             x: 1; y: 1
             width: parent.width - 2
             height: parent.height - 1
+            color: control.palette.window
         }
     }
 
@@ -78,10 +80,10 @@ T.Dialog {
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }