summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
index 51a244d7..986d2a93 100644
--- a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
1From e7b9af7232c4f7eb50933dde208e58438bedd964 Mon Sep 17 00:00:00 2001 1From 46074ffb4525e8217acd78c9cbe29f3d62f85c78 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21 6 files changed, 23 insertions(+), 3 deletions(-) 21 6 files changed, 23 insertions(+), 3 deletions(-)
22 22
23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp 23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
24index e908fd8..8f0ef56 100644 24index a08d26f..cff3155 100644
25--- a/src/gui/opengl/qopenglpaintdevice.cpp 25--- a/src/gui/opengl/qopenglpaintdevice.cpp
26+++ b/src/gui/opengl/qopenglpaintdevice.cpp 26+++ b/src/gui/opengl/qopenglpaintdevice.cpp
27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) 27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
@@ -50,18 +50,17 @@ index e908fd8..8f0ef56 100644
50 Returns the pixel size of the paint device. 50 Returns the pixel size of the paint device.
51 51
52diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h 52diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
53index dda3bfe..9965553 100644 53index 10cee84..a6683c5 100644
54--- a/src/gui/opengl/qopenglpaintdevice.h 54--- a/src/gui/opengl/qopenglpaintdevice.h
55+++ b/src/gui/opengl/qopenglpaintdevice.h 55+++ b/src/gui/opengl/qopenglpaintdevice.h
56@@ -53,6 +53,7 @@ public: 56@@ -53,12 +53,14 @@ public:
57 QOpenGLPaintDevice(); 57 QOpenGLPaintDevice();
58 explicit QOpenGLPaintDevice(const QSize &size); 58 explicit QOpenGLPaintDevice(const QSize &size);
59 QOpenGLPaintDevice(int width, int height); 59 QOpenGLPaintDevice(int width, int height);
60+ QOpenGLPaintDevice(int x, int y, int width, int height); 60+ QOpenGLPaintDevice(int x, int y, int width, int height);
61 QOpenGLPaintDevice(QOpenGLPaintDevicePrivate *dd);
62 virtual ~QOpenGLPaintDevice(); 61 virtual ~QOpenGLPaintDevice();
63 62
64@@ -60,6 +61,7 @@ public: 63 int devType() const { return QInternal::OpenGL; }
65 QPaintEngine *paintEngine() const; 64 QPaintEngine *paintEngine() const;
66 65
67 QOpenGLContext *context() const; 66 QOpenGLContext *context() const;
@@ -141,10 +140,10 @@ index 5ef0366..c5b517d 100644
141 QOpenGLContext *ctx; 140 QOpenGLContext *ctx;
142 EngineMode mode; 141 EngineMode mode;
143diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp 142diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
144index 6e16b2d..ddec9bb 100644 143index cd268cd..997bc35 100644
145--- a/src/gui/opengl/qopengltextureglyphcache.cpp 144--- a/src/gui/opengl/qopengltextureglyphcache.cpp
146+++ b/src/gui/opengl/qopengltextureglyphcache.cpp 145+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
147@@ -308,7 +308,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) 146@@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
148 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); 147 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
149 148
150 if (pex != 0) { 149 if (pex != 0) {
@@ -154,5 +153,5 @@ index 6e16b2d..ddec9bb 100644
154 } else { 153 } else {
155 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
156-- 155--
1572.1.1 1562.1.3
158 157