recipes: upgrade from 5.3.0 to 5.3.1

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 3 insertions, 63 deletions

diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index 05aa3642..b1e8dffe 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
@@ -1,7 +1,7 @@
-From 64ca7961376fa896d82c2a3db2d42cbb6b68c069 Mon Sep 17 00:00:00 2001
+From c38b854abffbae52c118a361e49987a7623e231a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
 Date: Sun, 26 May 2013 14:26:19 +0200
-Subject: [PATCH 1/2] qmltestexample: fix link
+Subject: [PATCH] qmltestexample: fix link
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644
  
  load(qt_tool)
 -- 
-1.8.5.3
+2.0.0
 
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
deleted file mode 100644
index 821149f2..00000000
--- a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
-From: Oleg Shparber <trollixx@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.
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-39047
-Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
-Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
-Signed-off-by: Jonathan Liu <net147@gmail.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.9.3
-