diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:37 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:39 +0200 |
commit | c3c943545eb7f084da314486524e8c9bb2fab431 (patch) | |
tree | 6add1fea19fdec25af587e2f38c788c391501b7a /examples/quick/dialogs/systemdialogs/ColorDialogs.qml | |
parent | cf62652614676f58f9c45102a67a497c81805a36 (diff) | |
parent | e443c7ba5552e5c88c331b370cc7a338d8672494 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/ColorDialogs.qml')
-rw-r--r-- | examples/quick/dialogs/systemdialogs/ColorDialogs.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml index 6a0af7f730..cd74dd6766 100644 --- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml @@ -40,11 +40,11 @@ import QtQuick 2.0 import QtQuick.Dialogs 1.0 -import "../shared" +import "../../shared" Rectangle { width: 320 - height: 200 + height: 240 color: palette.window SystemPalette { id: palette } clip: true |