diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:12 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:57:27 +0100 |
| commit | a1dbdcbd6e818118f5fc28cdd39e47a02380adbd (patch) | |
| tree | 0d813d9d72baeb1b5f7be048e775896c73f134f5 /src/opengl/qopenglwidget.cpp | |
| parent | 67ea445f09db9feea4e863faa12c45fb007f53a4 (diff) | |
| parent | 4cbadf699838406d14366ce61deec03cf45113f7 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
src/corelib/Qt5CoreConfigExtras.cmake.in
src/corelib/Qt5CoreMacros.cmake
src/dbus/Qt5DBusConfigExtras.cmake.in
src/widgets/Qt5WidgetsConfigExtras.cmake.in
Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7
Diffstat (limited to 'src/opengl/qopenglwidget.cpp')
| -rw-r--r-- | src/opengl/qopenglwidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/opengl/qopenglwidget.cpp b/src/opengl/qopenglwidget.cpp index a6c63ae034..91e9fd545d 100644 --- a/src/opengl/qopenglwidget.cpp +++ b/src/opengl/qopenglwidget.cpp @@ -45,14 +45,16 @@ #include <QtGui/QWindow> #include <QtGui/QGuiApplication> #include <QtGui/QScreen> -#include <QtGui/QOpenGLPaintDevice> #include <QtGui/qpa/qplatformwindow.h> #include <QtGui/qpa/qplatformintegration.h> +#include <QtOpenGL/QOpenGLPaintDevice> + #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qopenglextensions_p.h> #include <QtGui/private/qfont_p.h> -#include <QtGui/private/qopenglpaintdevice_p.h> #include <QtGui/private/qopenglcontext_p.h> +#include <QtOpenGL/private/qopenglpaintdevice_p.h> + #include <QtWidgets/private/qwidget_p.h> QT_BEGIN_NAMESPACE |