recipes: upgrade from 5.3.0 to 5.3.1

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

3 files changed, 23 insertions, 23 deletions

diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 0479bec9..e668edd9 100644
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,7 +1,7 @@
-From 5eb3dd427bca8bbc13b7554e8e21993b2fc708e7 Mon Sep 17 00:00:00 2001
+From f4eb217f9b706a13e7f8256b8540970cfc78d805 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.jansa@gmail.com>
 Date: Wed, 11 Sep 2013 18:30:08 +0200
-Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
+Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
 
 This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
 is built without GUI support (no-png is set) and we still want to build
@@ -9,7 +9,7 @@ native lrelease + lupdate + lconvert tools.
 
 Upstream-Status: Pending
 
-Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
  examples/examples.pro     |  4 ++--
  src/designer/src/src.pro  | 16 +++++++++-------
@@ -74,7 +74,7 @@ index 3a70580..a977878 100644
  qtNomakeTools( \
      linguist \
 diff --git a/src/src.pro b/src/src.pro
-index a07a3bb..4c6b463 100644
+index a486d65..3aeac1e 100644
 --- a/src/src.pro
 +++ b/src/src.pro
 @@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -98,11 +98,11 @@ index a07a3bb..4c6b463 100644
  
  SUBDIRS += linguist
 -if(!android|android_app):!ios: SUBDIRS += qtpaths
-+!linguistonly:if(!android|android_app):!ios: SUBDIRS += qtpaths
++if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths
  
  mac {
      SUBDIRS += macdeployqt
-@@ -25,7 +27,7 @@ android {
+@@ -25,11 +27,11 @@ android {
      SUBDIRS += androiddeployqt
  }
  
@@ -111,12 +111,11 @@ index a07a3bb..4c6b463 100644
  
  win32|winrt:SUBDIRS += windeployqt
  winrt:SUBDIRS += winrtrunner qtd3dservice
-@@ -36,4 +38,4 @@ qtNomakeTools( \
-     macdeployqt \
- )
+-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
  
--!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
-+!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+ qtNomakeTools( \
+     pixeltool \
 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
 index c3acfe3..f2f88f7 100644
 --- a/tests/auto/auto.pro
@@ -151,5 +150,5 @@ index c3acfe3..f2f88f7 100644
  installed_cmake.depends = cmake
  
 -- 
-1.9.3
+2.0.0
 
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 3e4cf4ef..042605c3 100644
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,7 +1,7 @@
-From 6837c212d388a3b679b7420c5f1c98ef85d04a39 Mon Sep 17 00:00:00 2001
+From 2b9829a4aa1379a69343371991a81b3769ac7dec Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Fri, 17 Jan 2014 14:33:19 +0100
-Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
+Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,15 +18,15 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
-index ed75c37..a2c55c7 100644
+index 168d23d..a9c3b59 100644
 --- a/src/assistant/help/help.pro
 +++ b/src/assistant/help/help.pro
-@@ -70,3 +70,5 @@ HEADERS += qhelpenginecore.h \
+@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \
  # access to clucene
  HEADERS += qhelpsearchindexwriter_clucene_p.h \
      qhelpsearchindexreader_clucene_p.h
 +
 +LIBS += -lQt5CLucene
 -- 
-1.8.5.3
+2.0.0
 
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index 3238d795..956bff2f 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -1,7 +1,7 @@
-From e6b77a5732610816948a8a860a9cb9e92b02c33e Mon Sep 17 00:00:00 2001
+From d59c24913f7edb0809ed32cf6dfeea874860d783 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
-Subject: [PATCH] add noqtwebkit configuration
+Subject: [PATCH 3/3] add noqtwebkit configuration
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
-index 5f96377..e461d4b 100644
+index 5f96377..e2dfa61 100644
 --- a/src/assistant/assistant/assistant.pro
 +++ b/src/assistant/assistant/assistant.pro
 @@ -1,4 +1,4 @@
@@ -25,16 +25,17 @@ index 5f96377..e461d4b 100644
  } else {
      DEFINES += QT_NO_WEBKIT
 diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
-index b7ee661..0c6e50a 100644
+index 500a153..12a6127 100644
 --- a/src/designer/src/plugins/plugins.pro
 +++ b/src/designer/src/plugins/plugins.pro
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  TEMPLATE = subdirs
  
  # qtHaveModule(opengl): SUBDIRS += tools/view3d
 -qtHaveModule(webkitwidgets): SUBDIRS += qwebview
 +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview
  win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+ qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
 -- 
-1.8.3.1
+2.0.0