From 67325c67d0849941442f31e18596f1547a77940e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 4 Mar 2020 14:21:50 +0100
Subject: Qt Designer: Fix build with regards to QOpenGLWidget

QOpenGLWidget is now in QtOpenGLWidgets.

Change-Id: I9815cf484cdf29cfa3511e400e39fc6731be1291
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/designer/src/lib/lib.pro                  | 1 +
 src/designer/src/lib/shared/widgetfactory.cpp | 4 ++--
 src/designer/src/lib/uilib/formbuilder.cpp    | 4 ++--
 src/designer/src/lib/uilib/uilib.pri          | 1 +
 src/designer/src/lib/uilib/widgets.table      | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro
index de0dc7389..870f752e8 100644
--- a/src/designer/src/lib/lib.pro
+++ b/src/designer/src/lib/lib.pro
@@ -2,6 +2,7 @@ TARGET = QtDesigner
 MODULE = designer
 
 QT = core-private gui-private widgets-private xml uiplugin
+qtHaveModule(openglwidgets): QT += openglwidgets
 
 DEFINES += \
     QDESIGNER_SDK_LIBRARY \
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index fb1073d5b..026fe1817 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -71,8 +71,8 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qpointer.h>
 
-#if QT_CONFIG(opengl)
-#include <QtOpenGL/qopenglwidget.h>
+#ifdef QT_OPENGLWIDGETS_LIB
+#  include <QtOpenGLWidgets/qopenglwidget.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index a7dd144b3..590fe2b3a 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -44,8 +44,8 @@
 #include <QtUiPlugin/customwidget.h>
 #include <QtWidgets/QtWidgets>
 
-#if QT_CONFIG(opengl)
-#include <QtOpenGL/qopenglwidget.h>
+#ifdef QT_OPENGLWIDGETS_LIB
+#  include <QtOpenGLWidgets/qopenglwidget.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/uilib/uilib.pri b/src/designer/src/lib/uilib/uilib.pri
index 602bd61d2..4d668eebe 100644
--- a/src/designer/src/lib/uilib/uilib.pri
+++ b/src/designer/src/lib/uilib/uilib.pri
@@ -4,6 +4,7 @@ INCLUDEPATH += $$PWD
 DEFINES += QT_DESIGNER QT_USE_QSTRINGBUILDER
 
 QT += widgets
+qtHaveModule(openglwidgets): QT += openglwidgets
 QT_PRIVATE += uiplugin
 
 qtConfig(opengl): \
diff --git a/src/designer/src/lib/uilib/widgets.table b/src/designer/src/lib/uilib/widgets.table
index 3dbb7aff2..546197ebc 100644
--- a/src/designer/src/lib/uilib/widgets.table
+++ b/src/designer/src/lib/uilib/widgets.table
@@ -111,7 +111,7 @@ DECLARE_WIDGET(QWidget, "")
 #if QT_CONFIG(keysequenceedit)
 DECLARE_WIDGET(QKeySequenceEdit, "")
 #endif
-#if QT_CONFIG(opengl)
+#ifdef QT_OPENGLWIDGETS_LIB
 DECLARE_WIDGET(QOpenGLWidget, "")
 #endif
 #if QT_CONFIG(splitter)
-- 
cgit v1.2.1