diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-12-11 12:20:06 +0100 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2020-01-15 15:38:59 +0100 |
| commit | 4772a2da15ae0624633f3fc4d029d5f0e1e33892 (patch) | |
| tree | 387247b0fd4d4f80f65e82c49ca3720bae28c311 /examples/widgets | |
| parent | d14fd32d403bd8d120fbe92dae06e9cb187c01c8 (diff) | |
Move QOpenGLWindow from QtGui to QtOpenGL
Task-number: QTBUG-74409
Change-Id: If7d27cdfa2c6cd5b167887ad77b9cfe413cb106a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/painting/shared/arthurwidgets.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/painting/shared/hoverpoints.cpp | 4 | ||||
| -rw-r--r-- | examples/widgets/painting/shared/shared.pri | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/examples/widgets/painting/shared/arthurwidgets.cpp b/examples/widgets/painting/shared/arthurwidgets.cpp index 40d712c9e3..c7c851270b 100644 --- a/examples/widgets/painting/shared/arthurwidgets.cpp +++ b/examples/widgets/painting/shared/arthurwidgets.cpp @@ -63,7 +63,9 @@ #include <QOffscreenSurface> #include <QOpenGLContext> #include <QOpenGLPaintDevice> -#include <QOpenGLWindow> +#if QT_CONFIG(opengl) +#include <QtOpenGL/QOpenGLWindow> +#endif extern QPixmap cached(const QString &img); diff --git a/examples/widgets/painting/shared/hoverpoints.cpp b/examples/widgets/painting/shared/hoverpoints.cpp index 2bf3963e9e..f834f315f9 100644 --- a/examples/widgets/painting/shared/hoverpoints.cpp +++ b/examples/widgets/painting/shared/hoverpoints.cpp @@ -53,6 +53,10 @@ #include <algorithm> +#if QT_CONFIG(opengl) +#include <QtOpenGL/QOpenGLWindow> +#endif + #define printf HoverPoints::HoverPoints(QWidget *widget, PointShape shape) diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index cb08b00348..7e2b4df8cb 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/examples/widgets/painting/shared/shared.pri @@ -1,6 +1,7 @@ INCLUDEPATH += $$PWD qtConfig(opengl) { + QT += opengl SOURCES += $$PWD/fbopaintdevice.cpp HEADERS += $$PWD/fbopaintdevice.h } |