Commit b48a26b9 authored by Florent Revest's avatar Florent Revest

Revert "qtbase: update patch to 5.5"

This reverts commit 5027055e.
parent fe505799
From 8231557cb3d2ee01382ceae0e76d74358a40afc0 Mon Sep 17 00:00:00 2001 From d742716a87b867900b26e4be4508f0045345406c Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com> From: Florent Revest <revestflo@gmail.com>
Date: Sat, 12 Dec 2015 18:50:02 +0100 Date: Thu, 20 Aug 2015 20:22:21 +0200
Subject: [PATCH] Forces GLES2 the dirty way Subject: [PATCH] Forces GLES2 the dirty way
--- ---
...@@ -8,18 +8,18 @@ Subject: [PATCH] Forces GLES2 the dirty way ...@@ -8,18 +8,18 @@ Subject: [PATCH] Forces GLES2 the dirty way
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index bffb0eb..cdd482b 100644 index 7cc3300..0beda2c 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -306,6 +306,8 @@ void QEGLPlatformContext::updateFormatFromGL() @@ -273,6 +273,8 @@ void QEGLPlatformContext::updateFormatFromGL()
minor = 0; QByteArray version = QByteArray(reinterpret_cast<const char *>(s));
} int major, minor;
#endif if (QPlatformOpenGLContext::parseOpenGLVersion(version, major, minor)) {
+ major = 2; + major = 2;
+ minor = 0; + minor = 0;
m_format.setMajorVersion(major); m_format.setMajorVersion(major);
m_format.setMinorVersion(minor); m_format.setMinorVersion(minor);
} }
-- --
2.6.2 2.5.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment