aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/context2d
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@theqtcompany.com>2016-05-08 20:17:35 +0200
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-05-08 20:04:37 +0000
commitddbe4ec52b747b3504180a15c7e5a2da3a6332c8 (patch)
treeaa8c9aa421856db1fdebd5817f665f892bc37440 /src/quick/items/context2d
parent92da3afdb69c52b955f3828ec10574031f094c7d (diff)
Fix build with QT_NO_OPENGL after rebase
Change-Id: Ia4243de07ec75030bb98f4f6d95f70d88e29fdba Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/items/context2d')
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index ed3eaf0703..b43adac0c5 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -4099,12 +4099,14 @@ void QQuickContext2D::init(QQuickCanvasItem *canvasItem, const QVariantMap &args
case QQuickCanvasItem::Image:
m_texture = new QQuickContext2DImageTexture;
break;
-#ifndef QT_NO_OPENGL
case QQuickCanvasItem::FramebufferObject:
-
+#ifndef QT_NO_OPENGL
m_texture = new QQuickContext2DFBOTexture;
- break;
+#else
+ // It shouldn't be possible to use a FramebufferObject without OpenGL
+ m_texture = nullptr;
#endif
+ break;
}
m_texture->setItem(canvasItem);