aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtquickcontrols
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-04-20 11:38:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-21 21:36:18 +0200
commit754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch)
treea417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtquickcontrols
parentf636eb7444a3454f2a25275a07e414d7409734d7 (diff)
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtquickcontrols')
-rw-r--r--recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch7
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
index 10793e6d..c57943d9 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
@@ -1,4 +1,4 @@
-From c39a563984693efac577adb137115693634c038f Mon Sep 17 00:00:00 2001
+From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Thu, 31 Mar 2016 19:57:01 -0400
Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+)
diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp
-index 2e9987a..c8bf419 100644
+index 2e03f74..3d1b3c8 100644
--- a/examples/quick/controls/texteditor/src/documenthandler.cpp
+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp
@@ -44,6 +44,7 @@
@@ -22,6 +22,3 @@ index 2e9987a..c8bf419 100644
DocumentHandler::DocumentHandler()
: m_target(0)
---
-2.2.0
-