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/quick/items/qquickwindow_p.h | |
parent | a6fe62fcb4ee219cdf0ddea7936545785d896015 (diff) |
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/quick/items/qquickwindow_p.h')
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index ace8d627e1..ef10ba3fe8 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -301,8 +301,10 @@ public: static void contextCreationFailureMessage(const QSurfaceFormat &format, QString *translatedMessage, - QString *untranslatedMessage, - bool isEs); + QString *untranslatedMessage); + static void rhiCreationFailureMessage(const QString &backendName, + QString *translatedMessage, + QString *untranslatedMessage); static void emitBeforeRenderPassRecording(void *ud); static void emitAfterRenderPassRecording(void *ud); |