Date: Thursday, May 22, 2014 @ 14:27:18 Author: andrea Revision: 213384
upgpkg: qt5 5.3.0-3 Fix antialiasing with QML (FS#40488) Added: qt5/trunk/QTBUG-39047.patch Modified: qt5/trunk/PKGBUILD -------------------+ PKGBUILD | 11 +++++++--- QTBUG-39047.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-22 10:04:58 UTC (rev 213383) +++ PKGBUILD 2014-05-22 12:27:18 UTC (rev 213384) @@ -24,7 +24,7 @@ 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.3.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -38,13 +38,15 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.3/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' - 'use-python2.patch') + 'use-python2.patch' + 'QTBUG-39047.patch') md5sums=('f00ac7930e3b1b2b364dedcd15acc142' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - 'a378deccf363bd6079da459c89aff7b9') + 'a378deccf363bd6079da459c89aff7b9' + '819813c53ab11b2341baf54afbc37e37') prepare() { cd ${_pkgfqn} @@ -58,6 +60,9 @@ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') + + cd qtdeclarative + patch -p1 -i "${srcdir}"/QTBUG-39047.patch } build() { Added: QTBUG-39047.patch =================================================================== --- QTBUG-39047.patch (rev 0) +++ QTBUG-39047.patch 2014-05-22 12:27:18 UTC (rev 213384) @@ -0,0 +1,57 @@ +From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001 +From: Oleg Shparber <troll...@gmail.com> +Date: Mon, 19 May 2014 00:53:39 -0700 +Subject: [PATCH] Fix improper antialiasing property behavior + +For components antialiased by default the property was returned +as false if default true value was set to true again. + +Task-number: QTBUG-39047 +Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4 +Reviewed-by: Gunnar Sletta <gunnar.sle...@jollamobile.com> +--- + src/quick/items/qquickitem.cpp | 8 +++++--- + tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp +index 3f0dae8..ef2eac4 100644 +--- a/src/quick/items/qquickitem.cpp ++++ b/src/quick/items/qquickitem.cpp +@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa) + { + Q_D(QQuickItem); + +- bool changed = (aa != antialiasing()); +- d->antialiasingValid = true; ++ if (!d->antialiasingValid) { ++ d->antialiasingValid = true; ++ d->antialiasing = d->implicitAntialiasing; ++ } + +- if (!changed) ++ if (aa == d->antialiasing) + return; + + d->antialiasing = aa; +diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp +index 0b69981..d36c55d 100644 +--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp ++++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp +@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing() + text->resetAntialiasing(); + QCOMPARE(text->antialiasing(), true); + QCOMPARE(spy.count(), 2); ++ ++ // QTBUG-39047 ++ component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl()); ++ object.reset(component.create()); ++ text = qobject_cast<QQuickText *>(object.data()); ++ QVERIFY(text); ++ QCOMPARE(text->antialiasing(), true); + } + + void tst_qquicktext::weight() +-- +1.7.1 +