diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-10-05 23:48:47 -0700 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 10:50:02 +0000 |
| commit | 467cede61e1bd8754d1e4df0fc2f281ee9082f18 (patch) | |
| tree | 2fc50c463486474e2ac429c293a1121900560685 /src | |
| parent | 6486a4bd196ca2bf0047ae80e78eee06e5e18e18 (diff) | |
Fix build with -no-opengl and on watchOS in general
This fixes a regression introduced in 8e70241dcc.
Task-number: QTBUG-63631
Change-Id: I5a2c23e06b790a482e1542ac2db3dcf25927caf2
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindow_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
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; } |