diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:41:59 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-29 16:52:58 +0100 |
| commit | b684ba219493fb7b0108ae367d6d033aaa28053b (patch) | |
| tree | f1fec8922da198e231416b50ef8f441ef6db065b /src/quickwidgets | |
| parent | 97a5cf86345fd72cdff83c03664c19a8f5cdf79a (diff) | |
| parent | 8354851b628ebae567a9125cbd0ba69268470c1b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 655923856c..dbb103973c 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -59,9 +59,9 @@ #include <QtGui/qpa/qplatformintegration.h> #if QT_CONFIG(opengl) -#include <QtGui/QOpenGLContext> -#include <QtGui/QOpenGLFunctions> -#include <QtGui/private/qopenglextensions_p.h> +#include <QOpenGLContext> +#include <QOpenGLFunctions> +#include <private/qopenglextensions_p.h> #endif #include <QtGui/QPainter> |