[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-53-g074c536

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=074c536

The following commit has been merged in the ubuntu branch:
commit 074c5362c10d3cdbae5002954f7dea995d213450
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Oct 14 05:46:45 2015 +0000

    Remove the patches that were replaced by upstream version.
---
 ...able-generic-plugin-when-others-available.patch | 11 --------
 ...openglframebufferobject_powervrworkaround.patch | 29 ----------------------
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/disable-generic-plugin-when-others-available.patch b/debian/patches/disable-generic-plugin-when-others-available.patch
deleted file mode 100644
index 0f4d588..0000000
--- a/debian/patches/disable-generic-plugin-when-others-available.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/network/bearer/qnetworkconfigmanager_p.cpp.old	2014-10-13 04:46:01.898862589 +0000
-+++ b/src/network/bearer/qnetworkconfigmanager_p.cpp	2014-10-13 04:47:07.342863932 +0000
-@@ -413,7 +413,7 @@
-             }
-         }
- 
--        if (generic)
-+        if (generic && sessionEngines.count() == 0)
-             sessionEngines.append(generic);
- #endif // QT_NO_LIBRARY
-     }
diff --git a/debian/patches/qopenglframebufferobject_powervrworkaround.patch b/debian/patches/qopenglframebufferobject_powervrworkaround.patch
deleted file mode 100644
index ccbad7c..0000000
--- a/debian/patches/qopenglframebufferobject_powervrworkaround.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Workaround chipset specific driver bug.
-
- The PowerVR Rogue G6200 driver reports invalid capabilities, but a driver fix 
- is not yet available.
-Bug-Ubuntu: http://launchpad.net/bugs/1436074
-Author: Kevin Gunn <kevin.gunn at canonical.com>
-
---- qtbase-opensource-src-5.4.1+dfsg-orig/src/gui/opengl/qopenglframebufferobject.cpp	2015-02-16 22:56:47.000000000 -0600
-+++ qtbase-opensource-src-5.4.1+dfsg/src/gui/opengl/qopenglframebufferobject.cpp	2015-04-15 09:21:35.703052810 -0500
-@@ -1144,10 +1144,15 @@
-     const bool supports_bgra = context->isOpenGLES()
-             ? context->hasExtension(QByteArrayLiteral("GL_EXT_read_format_bgra"))
-             : context->hasExtension(QByteArrayLiteral("GL_EXT_bgra"));
--    if (supports_bgra) {
--        QImage img(size, include_alpha ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
--        funcs->glReadPixels(0, 0, w, h, GL_BGRA, GL_UNSIGNED_BYTE, img.bits());
--        return img;
-+    // check on Imagination Rogue with DDK1.3, BGRA broken
-+    QByteArray gpuStr = reinterpret_cast<const char *>(funcs->glGetString(GL_RENDERER));
-+    QByteArray verStr = reinterpret_cast<const char *>(funcs->glGetString(GL_VERSION));
-+    if( !gpuStr.contains("PowerVR Rogue G6200") && !verStr.contains("1.3")){
-+        if (supports_bgra) {
-+            QImage img(size, include_alpha ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32);
-+            funcs->glReadPixels(0, 0, w, h, GL_BGRA, GL_UNSIGNED_BYTE, img.bits());
-+            return img;
-+        }
-     }
- #endif
-     QImage rgbaImage(size, include_alpha ? QImage::Format_RGBA8888_Premultiplied : QImage::Format_RGBX8888);

-- 
qtbase packaging