diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 09:46:51 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-06 14:25:20 +0000 |
| commit | 8e860f836bce8fd70a90798f8817a1410d8d8414 (patch) | |
| tree | 9cd4ddc95f3f1e46fd66ee2ddef2d264cac019e1 /src/widgets/kernel/qwidgetwindow.cpp | |
| parent | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (diff) | |
| parent | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qwidgetwindow.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 2b703e8ff2..ac32c32e12 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -96,7 +96,9 @@ public: } QRectF closestAcceptableGeometry(const QRectF &rect) const 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) |