diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-12 01:00:07 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-12 10:06:06 +0100 |
commit | 1196b1ef6c5d2cb05ceba5d6f178dc7e2432ed61 (patch) | |
tree | 2a99ee28d15d8ee51fc28096e5559bfc2d453e3f /src/quickwidgets | |
parent | fb54af6638dcbeae8ad21249fe234ef4d82c005b (diff) | |
parent | ca206bceaff3667469986402e6143bf4c666b228 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/qml/types/qqmlbind.cpp
Change-Id: Ib992d1a7ac6c1a96d39819be6f23955dc31b44b2
Diffstat (limited to 'src/quickwidgets')
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 11 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 3854a8bd0b..8ecfbf65dd 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -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; |