diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-15 15:29:18 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-16 09:38:36 +0200 |
commit | 538374debeaddf5b32978d9e1aca5175fa9b6a86 (patch) | |
tree | 9e6d8cb8ceffe4869e99874035d0fcda6a8b9f9e /src/quick/items/qquickwindow.cpp | |
parent | dd8e9f3fae84da3dd40b94122ad54d74d329163f (diff) |
Remove the GL/ANGLE-ish QQuickWindowPrivate::contextCreationFailureMessage
Not called in practice anymore, remove the corresponding condition in
the basic render loop as well.
Change-Id: I22d6091c900ce36665b9e7f6dc91cc9276528ff6
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow.cpp')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index aaf89b27e9..b3daec3328 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3496,35 +3496,6 @@ bool QQuickWindowPrivate::isRenderable() const return ((q->isExposed() && q->isVisible())) && q->geometry().isValid(); } -void QQuickWindowPrivate::contextCreationFailureMessage(const QSurfaceFormat &format, - QString *translatedMessage, - QString *untranslatedMessage) -{ - const QString contextType = QLatin1String("OpenGL"); - QString formatStr; - QDebug(&formatStr) << format; -#if defined(Q_OS_WIN32) - const bool isDebug = QLibraryInfo::isDebugBuild(); - const QString eglLibName = QLatin1String(isDebug ? "libEGLd.dll" : "libEGL.dll"); - const QString glesLibName = QLatin1String(isDebug ? "libGLESv2d.dll" : "libGLESv2.dll"); - //: %1 Context type (Open GL, EGL), %2 format, ANGLE %3, %4 library names - const char msg[] = QT_TRANSLATE_NOOP("QQuickWindow", - "Failed to create %1 context for format %2.\n" - "This is most likely caused by not having the necessary graphics drivers installed.\n\n" - "Install a driver providing OpenGL 2.0 or higher, or, if this is not possible, " - "make sure the ANGLE Open GL ES 2.0 emulation libraries (%3, %4 and d3dcompiler_*.dll) " - "are available in the application executable's directory or in a location listed in PATH."); - *translatedMessage = QQuickWindow::tr(msg).arg(contextType, formatStr, eglLibName, glesLibName); - *untranslatedMessage = QString::fromLatin1(msg).arg(contextType, formatStr, eglLibName, glesLibName); -#else // Q_OS_WIN32 - //: %1 Context type (Open GL, EGL), %2 format specification - const char msg[] = QT_TRANSLATE_NOOP("QQuickWindow", - "Failed to create %1 context for format %2"); - *translatedMessage = QQuickWindow::tr(msg).arg(contextType, formatStr); - *untranslatedMessage = QString::fromLatin1(msg).arg(contextType, formatStr); -#endif // !Q_OS_WIN32 -} - void QQuickWindowPrivate::rhiCreationFailureMessage(const QString &backendName, QString *translatedMessage, QString *untranslatedMessage) |