Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meta-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
meta-nemo
Commits
b48a26b9
Commit
b48a26b9
authored
Dec 18, 2015
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "qtbase: update patch to 5.5"
This reverts commit
5027055e
.
parent
fe505799
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
0001-Forces-GLES2-the-dirty-way.patch
recipes-qt/qt5/qtbase/0001-Forces-GLES2-the-dirty-way.patch
+8
-8
No files found.
recipes-qt/qt5/qtbase/0001-Forces-GLES2-the-dirty-way.patch
View file @
b48a26b9
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 +01
00
Date:
Thu, 20 Aug 2015 20:22:21 +02
00
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment