rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Move #include <QtCore/QByteArray> up

Browse Source 
We have to include it before the X11 headers dragged in by
qglxconvenience_p.h.
This commit is contained in:
Kevin Kofler 2014-01-29 19:07:17 +01:00
parent 41836b065f
commit eea62e9067
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe.patch
View File

@ -1,15 +1,18 @@
diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp
--- qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp 2013-12-08 18:09:47.000000000 +0100 --- qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconvenience.cpp 2013-12-08 18:09:47.000000000 +0100
+++ qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp 2014-01-29 18:18:47.000000000 +0100 +++ qtbase-opensource-src-5.2.0-allow-forcing-llvmpipe/src/platformsupport/glxconvenience/qglxconvenience.cpp 2014-01-29 19:03:23.000000000 +0100
@@ -43,6 +43,7 @@ @@ -39,6 +39,10 @@
**
****************************************************************************/
+// We have to include this before the X11 headers dragged in by
+// qglxconvenience_p.h.
+#include <QtCore/QByteArray>
+
#include "qglxconvenience_p.h"
#include <QtCore/QVector> #include <QtCore/QVector>
#include <QtCore/QVarLengthArray> @@ -116,6 +120,27 @@
+#include <QtCore/QByteArray>
#ifndef QT_NO_XRENDER
#include <X11/extensions/Xrender.h>
@@ -116,6 +117,27 @@
GLXFBConfig qglx_findConfig(Display *display, int screen , const QSurfaceFormat &format, int drawableBit) GLXFBConfig qglx_findConfig(Display *display, int screen , const QSurfaceFormat &format, int drawableBit)
{ {
@ -37,7 +40,7 @@ diff -ur qtbase-opensource-src-5.2.0/src/platformsupport/glxconvenience/qglxconv
bool reduced = true; bool reduced = true;
GLXFBConfig chosenConfig = 0; GLXFBConfig chosenConfig = 0;
QSurfaceFormat reducedFormat = format; QSurfaceFormat reducedFormat = format;
@@ -159,6 +181,10 @@ @@ -159,6 +184,10 @@
reducedFormat = qglx_reduceSurfaceFormat(reducedFormat,&reduced); reducedFormat = qglx_reduceSurfaceFormat(reducedFormat,&reduced);
} }