diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:34:21 +0100 |
| commit | 865afac25036d58b18794384e37d42931b2164c5 (patch) | |
| tree | e18d31138f1a8b9200764fd3648e58b9dd6b124f /examples/opengl | |
| parent | 01bacdf7abb071198d843acdfb22ce1701766be8 (diff) | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/paintedwindow/paintedwindow.cpp | 1 | ||||
| -rw-r--r-- | examples/opengl/qopenglwindow/main.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/examples/opengl/paintedwindow/paintedwindow.cpp b/examples/opengl/paintedwindow/paintedwindow.cpp index 799431a765..94aa215288 100644 --- a/examples/opengl/paintedwindow/paintedwindow.cpp +++ b/examples/opengl/paintedwindow/paintedwindow.cpp @@ -54,6 +54,7 @@ #include <QOpenGLContext> #include <QOpenGLPaintDevice> #include <QPainter> +#include <QPainterPath> #include <QScreen> #include <QTimer> diff --git a/examples/opengl/qopenglwindow/main.cpp b/examples/opengl/qopenglwindow/main.cpp index 8932269ddf..7ce4dd0977 100644 --- a/examples/opengl/qopenglwindow/main.cpp +++ b/examples/opengl/qopenglwindow/main.cpp @@ -51,6 +51,7 @@ #include <QOpenGLWindow> #include <QScreen> #include <QPainter> +#include <QPainterPath> #include <QGuiApplication> #include <QMatrix4x4> #include <QStaticText> |