Revert "qtbase: backport from qt 5.6"

This reverts commit 2e60c643bf660edb8c738b2ac5c83db096786a8e.

Conflicts:
	recipes-qt/qt5/qtbase_%.bbappend

Simple merge.

Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>

2 files changed, 0 insertions, 48 deletions

diff --git a/recipes-qt/qt5/qtbase/0001-Backport-qreal-bug-from-5.6.patch b/recipes-qt/qt5/qtbase/0001-Backport-qreal-bug-from-5.6.patch
deleted file mode 100644
index 6e848e9..0000000
--- a/recipes-qt/qt5/qtbase/0001-Backport-qreal-bug-from-5.6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 72680ce7e2e32222078178596bf3793e6e848a36 Mon Sep 17 00:00:00 2001
-From: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
-Date: Fri, 24 Jul 2015 18:05:43 +0200
-Subject: [PATCH] Fix for build with -qreal float
-
-Resolve ambiguity with function calls (due to double->float conversion),
-use qreal where needed intead of explicit 'double'.
-
-Change-Id: I28f1fb4a2b424b1399fb082a36ba9cff666f7c62
-Task-number: QTBUG-47433
-Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
----
- src/gui/painting/qpdf.cpp           | 4 ++--
- src/widgets/widgets/qlineedit_p.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
-index 7fa2e5b..9f1fc31 100644
---- a/src/gui/painting/qpdf.cpp
-+++ b/src/gui/painting/qpdf.cpp
-@@ -2103,9 +2103,9 @@ int QPdfEnginePrivate::generateLinearGradientShader(const QLinearGradient *gradi
- int QPdfEnginePrivate::generateRadialGradientShader(const QRadialGradient *gradient, const QTransform &matrix, bool alpha)
- {
-     QPointF p1 = gradient->center();
--    double r1 = gradient->centerRadius();
-+    qreal r1 = gradient->centerRadius();
-     QPointF p0 = gradient->focalPoint();
--    double r0 = gradient->focalRadius();
-+    qreal r0 = gradient->focalRadius();
- 
-     Q_ASSERT(gradient->coordinateMode() == QGradient::LogicalMode);
- 
-diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
-index ad3a92d..b798bca 100644
---- a/src/widgets/widgets/qlineedit_p.cpp
-+++ b/src/widgets/widgets/qlineedit_p.cpp
-@@ -343,7 +343,7 @@ void QLineEditIconButton::startOpacityAnimation(qreal endValue)
- void QLineEditIconButton::updateCursor()
- {
- #ifndef QT_NO_CURSOR
--    setCursor(qFuzzyCompare(m_opacity, 1.0) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor());
-+    setCursor(qFuzzyCompare(m_opacity, qreal(1.0)) || !parentWidget() ? QCursor(Qt::ArrowCursor) : parentWidget()->cursor());
- #endif
- }
- 
--- 
-2.6.2.2.g1b5ffa3
diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend
index a34259b..8513106 100644
--- a/recipes-qt/qt5/qtbase_%.bbappend
+++ b/recipes-qt/qt5/qtbase_%.bbappend
@@ -20,7 +20,6 @@ PACKAGECONFIG_append = " sql-sqlite"
 #fix for 5.5
 PACKAGECONFIG_append = " pcre"
 
-SRC_URI_append = " file://0001-Backport-qreal-bug-from-5.6.patch"
 SRC_URI_append = " file://res-touchscreen.rules"
 SRC_URI_append = " file://qtLauncher"