summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2014-07-31 17:18:48 +0200
committerShawn Rutledge <shawn.rutledge@digia.com>2014-08-01 16:49:58 +0200
commit1930d82d3aa2f552f5936612d3e937e4ead5e56f (patch)
tree4fabe573b3e771185edc0c911949be48400b84a7
parentac00282aaaa930c4b6af92a5df3bf5b2e63f229c (diff)
fix ColorDialog rendering on non-windowing platforms
Need to check the content Item's window rather than the Dialog's window. Change-Id: I56dbaf163212f1deb68f6b9a984194ab1fbc3b98 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-rw-r--r--src/dialogs/DefaultColorDialog.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml
index dc0594451..f0f021b1a 100644
--- a/src/dialogs/DefaultColorDialog.qml
+++ b/src/dialogs/DefaultColorDialog.qml
@@ -136,7 +136,7 @@ AbstractColorDialog {
anchors.centerIn: parent
property real hue: hueSlider.value
- fragmentShader: root.window.glslIsCoreProfile ? "#version 150
+ fragmentShader: content.window && content.window.glslIsCoreProfile ? "#version 150
in vec2 qt_TexCoord0;
uniform float qt_Opacity;
uniform float hue;