From 464b50b58d1ff5240a97b0c7fa88ce8c42ca0801 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Wed, 25 Oct 2017 14:24:16 +0200
Subject: Fix -no-opengl build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A follow-up patch for 8e70241dccaf5a9e5c79c8d6da5665b881c5914d:
Make 'shareContext' conditionally included/compiled
(protected by QT_CONFIG(opengl)).

Change-Id: Ieaeea6b146b47fba7a77e2576ae0a33042280199
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
---
 src/widgets/kernel/qwidgetwindow.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/widgets/kernel')

diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
index 319eccf223..d8d6eab7b1 100644
--- a/src/widgets/kernel/qwidgetwindow.cpp
+++ b/src/widgets/kernel/qwidgetwindow.cpp
@@ -96,7 +96,9 @@ public:
     }
 
     QRectF closestAcceptableGeometry(const QRectF &rect) const Q_DECL_OVERRIDE;
+#if QT_CONFIG(opengl)
     QOpenGLContext *shareContext() const override;
+#endif
 };
 
 QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
@@ -128,12 +130,14 @@ QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const
     return result;
 }
 
+#if QT_CONFIG(opengl)
 QOpenGLContext *QWidgetWindowPrivate::shareContext() const
 {
     Q_Q(const QWidgetWindow);
     const QWidgetPrivate *widgetPrivate = QWidgetPrivate::get(q->widget());
     return widgetPrivate->shareContext();
 }
+#endif // opengl
 
 QWidgetWindow::QWidgetWindow(QWidget *widget)
     : QWindow(*new QWidgetWindowPrivate(), 0)
-- 
cgit v1.2.3