diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-06 14:55:21 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-10-20 15:18:56 +0200 |
| commit | 013f5ca939e5d86061af1f9056e3d844c3eb8e59 (patch) | |
| tree | b17a4e04aa68d58c1a426a47d90921f5d83b70d2 | |
| parent | 016c7940a55f472e5c6222a37c059d1e859d135d (diff) | |
Fix building of snippets on 5.15
OpenGLWidgets wasn't a separate module in 5.15, it was part of Widgets.
It's been split out on dev, as part of the RHI work.
So a recent cherry-pick back from dev broke the build for snippets.
Change-Id: Ia076a0d6db835b3c11d59ffe320a25bb2c849870
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/widgets/doc/snippets/graphicsview/graphicsview.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/doc/snippets/graphicsview/graphicsview.pro | 2 | ||||
| -rw-r--r-- | src/widgets/doc/snippets/mdiarea/mdiarea.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp index b85c6fc169..f35bc3b4db 100644 --- a/src/widgets/doc/snippets/graphicsview/graphicsview.cpp +++ b/src/widgets/doc/snippets/graphicsview/graphicsview.cpp @@ -50,12 +50,12 @@ #include <QStandardItem> #include <QtCore/qmimedata.h> #include <QtGui/qdrag.h> -#include <QtOpenGLWidgets/qopenglwidget.h> #include <QtPrintSupport/qprintdialog.h> #include <QtPrintSupport/qprinter.h> #include <QtWidgets/QGraphicsSceneMouseEvent> #include <QtWidgets/qdialog.h> #include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qopenglwidget.h> void graphicsview_snippet_main() { diff --git a/src/widgets/doc/snippets/graphicsview/graphicsview.pro b/src/widgets/doc/snippets/graphicsview/graphicsview.pro index a76ceb149c..508896331f 100644 --- a/src/widgets/doc/snippets/graphicsview/graphicsview.pro +++ b/src/widgets/doc/snippets/graphicsview/graphicsview.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = widgets_graphicsview_snippets -QT = core widgets printsupport openglwidgets +QT = core widgets printsupport SOURCES = \ graphicsview.cpp diff --git a/src/widgets/doc/snippets/mdiarea/mdiarea.pro b/src/widgets/doc/snippets/mdiarea/mdiarea.pro index 23c5682999..925c162180 100644 --- a/src/widgets/doc/snippets/mdiarea/mdiarea.pro +++ b/src/widgets/doc/snippets/mdiarea/mdiarea.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = mdiarea_snippets -QT += printsupport opengl openglwidgets +QT += printsupport opengl widgets SOURCES = \ mdiareasnippets.cpp |