diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-08-09 09:34:42 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-08-12 08:37:04 +0200 |
commit | b3ab05a86bbc6aa2643ba0e0512cdb0f69f29fb4 (patch) | |
tree | f9683f761facea9becad6f0fa3735291dd21be6e | |
parent | e0053372b6641914c8340a67bb2d8a90173bf721 (diff) | |
download | qtquickcontrols-b3ab05a86bbc6aa2643ba0e0512cdb0f69f29fb4.tar.gz |
Replace usage of Item.window with OpenGLInfo attached property
Change-Id: I53224e2abb2820f3fc472b8b4b42a4cac59d79f5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r-- | src/controls/Private/FastGlow.qml | 8 | ||||
-rw-r--r-- | src/dialogs/DefaultColorDialog.qml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/controls/Private/FastGlow.qml b/src/controls/Private/FastGlow.qml index 6fcb6d4b..79a9a92a 100644 --- a/src/controls/Private/FastGlow.qml +++ b/src/controls/Private/FastGlow.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.4 Item { id: rootItem @@ -64,7 +64,7 @@ Item { hideSource: visible } - property string __internalBlurVertexShader: rootItem.window.glslIsCoreProfile ? "#version 150 + property string __internalBlurVertexShader: OpenGLInfo.profile === OpenGLInfo.CoreProfile ? "#version 150 in vec4 qt_Vertex; in vec2 qt_MultiTexCoord0; uniform mat4 qt_Matrix; @@ -101,7 +101,7 @@ Item { gl_Position = qt_Matrix * qt_Vertex; } " - property string __internalBlurFragmentShader: rootItem.window.glslIsCoreProfile ? "#version 150 + property string __internalBlurFragmentShader: OpenGLInfo.profile === OpenGLInfo.CoreProfile ? "#version 150 uniform sampler2D source; uniform float qt_Opacity; in vec2 qt_TexCoord0; @@ -392,7 +392,7 @@ Item { onLodChanged: calculateWeights() - fragmentShader: rootItem.window.glslIsCoreProfile ? "#version 150 + fragmentShader: rootItem.OpenGLInfo.profile === OpenGLInfo.CoreProfile ? "#version 150 uniform sampler2D source1; uniform sampler2D source2; uniform sampler2D source3; diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml index f0f021b1..efb893b6 100644 --- a/src/dialogs/DefaultColorDialog.qml +++ b/src/dialogs/DefaultColorDialog.qml @@ -38,7 +38,7 @@ ** *****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.4 import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.0 import QtQuick.Window 2.1 @@ -136,7 +136,7 @@ AbstractColorDialog { anchors.centerIn: parent property real hue: hueSlider.value - fragmentShader: content.window && content.window.glslIsCoreProfile ? "#version 150 + fragmentShader: content.OpenGLInfo.profile === OpenGLInfo.CoreProfile ? "#version 150 in vec2 qt_TexCoord0; uniform float qt_Opacity; uniform float hue; |