Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

2 files changed, 7 insertions, 8 deletions

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 3854a8bd0b..655923856c 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -500,7 +500,7 @@ QImage QQuickWidgetPrivate::grabFramebuffer()
     \section1 Support when not using OpenGL
 
     In addition to OpenGL, the \c software backend of Qt Quick also supports
-    QQuickWidget. Other backends, for example the Direct 3D 12 one, are not
+    QQuickWidget. Other backends, for example OpenVG, are not
     compatible however and attempting to construct a QQuickWidget will lead to
     problems.
 
@@ -525,7 +525,7 @@ QImage QQuickWidgetPrivate::grabFramebuffer()
 
 */
 QQuickWidget::QQuickWidget(QWidget *parent)
-: QWidget(*(new QQuickWidgetPrivate), parent, nullptr)
+    : QWidget(*(new QQuickWidgetPrivate), parent, {})
 {
     setMouseTracking(true);
     setFocusPolicy(Qt::StrongFocus);
@@ -553,7 +553,7 @@ QQuickWidget::QQuickWidget(const QUrl &source, QWidget *parent)
   \sa Status, status(), errors()
 */
 QQuickWidget::QQuickWidget(QQmlEngine* engine, QWidget *parent)
-    : QWidget(*(new QQuickWidgetPrivate), parent, nullptr)
+    : QWidget(*(new QQuickWidgetPrivate), parent, {})
 {
     setMouseTracking(true);
     setFocusPolicy(Qt::StrongFocus);
@@ -848,13 +848,13 @@ QSize QQuickWidgetPrivate::rootObjectSize() const
     return rootObjectSize;
 }
 
-void QQuickWidgetPrivate::handleContextCreationFailure(const QSurfaceFormat &format, bool isEs)
+void QQuickWidgetPrivate::handleContextCreationFailure(const QSurfaceFormat &format)
 {
     Q_Q(QQuickWidget);
 
     QString translatedMessage;
     QString untranslatedMessage;
-    QQuickWindowPrivate::contextCreationFailureMessage(format, &translatedMessage, &untranslatedMessage, isEs);
+    QQuickWindowPrivate::contextCreationFailureMessage(format, &translatedMessage, &untranslatedMessage);
 
     static const QMetaMethod errorSignal = QMetaMethod::fromSignal(&QQuickWidget::sceneGraphError);
     const bool signalConnected = q->isSignalConnected(errorSignal);
@@ -896,10 +896,9 @@ void QQuickWidgetPrivate::createContext()
             context->setScreen(shareContext->screen());
         }
         if (!context->create()) {
-            const bool isEs = context->isOpenGLES();
             delete context;
             context = nullptr;
-            handleContextCreationFailure(offscreenWindow->requestedFormat(), isEs);
+            handleContextCreationFailure(offscreenWindow->requestedFormat());
             return;
         }
 
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h
index f4f9db7772..881f7f9220 100644
--- a/src/quickwidgets/qquickwidget_p.h
+++ b/src/quickwidgets/qquickwidget_p.h
@@ -97,7 +97,7 @@ public:
     void renderSceneGraph();
     void createContext();
     void destroyContext();
-    void handleContextCreationFailure(const QSurfaceFormat &format, bool isEs);
+    void handleContextCreationFailure(const QSurfaceFormat &format);
 
 #if QT_CONFIG(opengl)
     GLuint textureId() const override;