diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-04 11:28:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 12:27:11 +0100 |
| commit | fb81479a16e5a96b87c53c7eaaaa74871cd7d0f7 (patch) | |
| tree | 01853049c9c7c77dca1d7a1c1c9d64c8775ba63b /src | |
| parent | 61900c3fc8ee06ae64f1a8b7c76afd9ebcab04f8 (diff) | |
Remove isES() usage in scenegraph
The error signal patch added some usages of QOpenGLFunctions::isES().
These need to be temporarily removed.
Change-Id: Ibd1d8094059020708aefe4b3502ba56d624928b3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgthreadedrenderloop.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgwindowsrenderloop.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 9ff34f92b8..644a674749 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -287,7 +287,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window) gl = 0; QString formatStr; QDebug(&formatStr) << window->requestedFormat(); - QString contextType = QLatin1String(QOpenGLFunctions::isES() ? "EGL" : "OpenGL"); + QString contextType = QLatin1String("OpenGL"); const char *msg = QT_TRANSLATE_NOOP("QSGGuiThreadRenderLoop", "Failed to create %1 context for format %2"); QString translatedMsg = tr(msg).arg(contextType).arg(formatStr); QString nonTranslatedMsg = QString(QLatin1String(msg)).arg(contextType).arg(formatStr); diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp index 0db5e3f88c..0d98fc6464 100644 --- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp +++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp @@ -943,7 +943,7 @@ void QSGThreadedRenderLoop::handleExposure(Window *w) w->thread->gl = 0; QString formatStr; QDebug(&formatStr) << w->window->requestedFormat(); - QString contextType = QLatin1String(QOpenGLFunctions::isES() ? "EGL" : "OpenGL"); + QString contextType = QLatin1String("OpenGL"); const char *msg = QT_TRANSLATE_NOOP("QSGThreadedRenderLoop", "Failed to create %1 context for format %2"); QString translatedMsg = tr(msg).arg(contextType).arg(formatStr); diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp index b3def43514..31012c7589 100644 --- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp +++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp @@ -186,7 +186,7 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window) const bool isDebug = QLibraryInfo::isDebugBuild(); QString eglLibName = QLatin1String(isDebug ? "libEGLd.dll" : "libEGL.dll"); QString glesLibName = QLatin1String(isDebug ? "libGLESv2d.dll" : "libGLESv2.dll"); - QString contextType = QLatin1String(QOpenGLFunctions::isES() ? "EGL" : "OpenGL"); + QString contextType = QLatin1String("OpenGL"); const char *msg = QT_TRANSLATE_NOOP( "QSGWindowsRenderLoop", "Failed to create %1 context. " |