diff options
author | Andy Nichols <andy.nichols@qt.io> | 2016-04-25 12:09:08 +0200 |
---|---|---|
committer | Andy Nichols <andy.nichols@qt.io> | 2016-05-06 19:17:20 +0000 |
commit | 53c5398529f852903fb6774210573a25f5ea144a (patch) | |
tree | 211365b42b91087ba6e8dee80d532fb01ac03889 /src/quick/items/qquickshadereffect.cpp | |
parent | 3fdaa13f7f0a4f0eeff2e7450df2df0df824b72a (diff) |
Fix building with QT_NO_OPENGL defined
Change-Id: Ice6c47f766899e7313b9dde8cfcd6d81eeaf52f5
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
-rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 560c49fb7c..1fbc9c201f 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -364,7 +364,9 @@ QSGContextFactoryInterface::Flags qsg_backend_flags(); QQuickShaderEffect::QQuickShaderEffect(QQuickItem *parent) : QQuickItem(parent), +#ifndef QT_NO_OPENGL m_glImpl(nullptr), +#endif m_impl(nullptr) { setFlag(QQuickItem::ItemHasContents); @@ -372,8 +374,9 @@ QQuickShaderEffect::QQuickShaderEffect(QQuickItem *parent) #ifndef QT_NO_OPENGL if (!qsg_backend_flags().testFlag(QSGContextFactoryInterface::SupportsShaderEffectNode)) m_glImpl = new QQuickOpenGLShaderEffect(this, this); -#endif + if (!m_glImpl) +#endif m_impl = new QQuickGenericShaderEffect(this, this); } |