diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-11-27 14:10:38 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-11-28 13:44:16 +0100 |
commit | d4cab2523cae58bd864770552da0332afe45585c (patch) | |
tree | 077b78e2061a7598f4bb3cdafd524d1f6d82e9ed /src/quickwidgets/qquickwidget.cpp | |
parent | a6fe62fcb4ee219cdf0ddea7936545785d896015 (diff) | |
download | qtdeclarative-d4cab2523cae58bd864770552da0332afe45585c.tar.gz |
Make the initialization failure dialog sensible with QRhi
So on Windows one now gets a message box with a reasonable message,
instead of the OpenGL nonsense. Then the application closes when pressing
Abort etc.
On other platforms there is a qFatal, printing the same message.
Involves simplifying the OpenGL version a bit since passing isES type of
flags through multiple layers is not justified here.
Task-number: QTBUG-80365
Change-Id: Ie3ea1e9395a283f7e95eda78c1d3894797ff0acf
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 253cf5a050..bfcc0b1403 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -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; } |