From 467cede61e1bd8754d1e4df0fc2f281ee9082f18 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 5 Oct 2017 23:48:47 -0700 Subject: Fix build with -no-opengl and on watchOS in general MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a regression introduced in 8e70241dcc. Task-number: QTBUG-63631 Change-Id: I5a2c23e06b790a482e1542ac2db3dcf25927caf2 Reviewed-by: Timur Pocheptsov Reviewed-by: Tor Arne Vestbø --- src/gui/kernel/qwindow.cpp | 2 ++ src/gui/kernel/qwindow_p.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 42b54bf98a..9969124339 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2634,10 +2634,12 @@ QWindow *QWindowPrivate::topLevelWindow() const return window; } +#if QT_CONFIG(opengl) QOpenGLContext *QWindowPrivate::shareContext() const { return qt_gl_global_share_context(); }; +#endif /*! Creates a local representation of a window created by another process or by diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index bf6be1bb98..2de5aab2c4 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -130,7 +130,9 @@ public: QWindow *topLevelWindow() const; +#if QT_CONFIG(opengl) virtual QOpenGLContext *shareContext() const; +#endif virtual QWindow *eventReceiver() { Q_Q(QWindow); return q; } -- cgit v1.2.3