Accepting request 261310 from KDE:Qt5

Update QTBUG41590.patch for commit that was pushed upstream

OBS-URL: https://build.opensuse.org/request/show/261310
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=32

QTBUG41590.patch

@@ -1,11 +1,38 @@
---- src/gui/kernel/qplatformintegration.cpp.orig	2014-10-21 12:24:35.314606929 +0200
+From: Allan Sandfeld Jensen <allan.jensen@digia.com>
-+++ src/gui/kernel/qplatformintegration.cpp	2014-10-21 12:24:45.668477488 +0200
+Date: Tue, 11 Nov 2014 12:48:27 +0000
-@@ -360,7 +360,7 @@ QVariant QPlatformIntegration::styleHint
+Subject: Do not apply subpixel gamma-correction on XCB
-     case PasswordMaskCharacter:
+X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtbase.git&a=commitdiff&h=501c510cc3cb6215aed27af7599395480a049667
-         return QPlatformTheme::defaultThemeHint(QPlatformTheme::PasswordMaskCharacter);
+---
-     case FontSmoothingGamma:
+Do not apply subpixel gamma-correction on XCB
--        return qreal(1.7);
+
-+        return qreal(1.4);
+To match rendering of subpixel antialiased text in Qt 4.8 and other
-     case StartDragVelocity:
+toolkits on X11, we should not apply gamma-correction. This also
-         return QPlatformTheme::defaultThemeHint(QPlatformTheme::StartDragVelocity);
+makes the rendering of subpixel antialiased text closer to normal
-     case UseRtlExtensions:
+antialiased text.
+
+Task-number: QTBUG-41590
+Change-Id: I45ad3448334951353657b878d002eea429858f2d
+Reviewed-by: Samuel Rødal <srodal@gmail.com>
+Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
+Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
+---
+
+
+--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
++++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
+@@ -427,12 +427,14 @@
+     case QPlatformIntegration::StartDragTime:
+     case QPlatformIntegration::KeyboardAutoRepeatRate:
+     case QPlatformIntegration::PasswordMaskDelay:
+-    case QPlatformIntegration::FontSmoothingGamma:
+     case QPlatformIntegration::StartDragVelocity:
+     case QPlatformIntegration::UseRtlExtensions:
+     case QPlatformIntegration::PasswordMaskCharacter:
+         // TODO using various xcb, gnome or KDE settings
+         break; // Not implemented, use defaults
++    case QPlatformIntegration::FontSmoothingGamma:
++        // Match Qt 4.8 text rendering, and rendering of other X11 toolkits.
++        return qreal(1.0);
+     case QPlatformIntegration::StartDragDistance: {
+         // The default (in QPlatformTheme::defaultThemeHint) is 10 pixels, but
+         // on a high-resolution screen it makes sense to increase it.

libqt5-qtbase.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 11 19:34:51 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update QTBUG41590.patch for commit that was pushed upstream
+
 -------------------------------------------------------------------
 Wed Nov  5 16:51:36 UTC 2014 - hrvoje.senjan@gmail.com
 

libqt5-qtbase.spec

@@ -172,7 +172,7 @@ handling.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p0
+%patch6 -p1
 %patch2000 -p1
 %patch2001 -p1
 %patch2002 -p1