From ddbe4ec52b747b3504180a15c7e5a2da3a6332c8 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Sun, 8 May 2016 20:17:35 +0200 Subject: Fix build with QT_NO_OPENGL after rebase Change-Id: Ia4243de07ec75030bb98f4f6d95f70d88e29fdba Reviewed-by: Laszlo Agocs --- src/quick/items/context2d/qquickcontext2d.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/quick/items/context2d') 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); -- cgit v1.2.3