From 178a817e6f4604e0f4b24a416d5e83b428cbabe7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 19 Oct 2015 15:26:34 +0200 Subject: qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+) Signed-off-by: Martin Jansa --- ...Allow-to-build-only-lrelease-lupdate-lconvert.patch | 18 ++++++++++-------- ...stant-help-fix-linking-of-dependent-libraries.patch | 4 ++-- .../qttools/0003-add-noqtwebkit-configuration.patch | 4 ++-- ...t-tools-cmake-allow-overriding-the-location-f.patch | 4 ++-- 4 files changed, 16 insertions(+), 14 deletions(-) (limited to 'recipes-qt/qt5/qttools') 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 e1255d8b..e743a352 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,4 +1,4 @@ -From 922931781bd4fd765de996f1709aff95b6ac3fba Mon Sep 17 00:00:00 2001 +From 0fb675dfdff64a270b92d768bedc0d6b355675b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/4] Allow to build only lrelease + lupdate + lconvert @@ -14,9 +14,9 @@ Signed-off-by: Martin Jansa examples/examples.pro | 3 ++- src/designer/src/src.pro | 18 ++++++++++-------- src/linguist/linguist.pro | 2 +- - src/src.pro | 14 ++++++++------ + src/src.pro | 16 +++++++++------- tests/auto/auto.pro | 24 +++++++++++++----------- - 5 files changed, 34 insertions(+), 27 deletions(-) + 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/examples/examples.pro b/examples/examples.pro index 69365d1..da7b38b 100644 @@ -79,10 +79,10 @@ index 3a70580..a977878 100644 qtNomakeTools( \ linguist \ diff --git a/src/src.pro b/src/src.pro -index 494898f..c02848d 100644 +index 387d54f..56b7d0c 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -4,10 +4,12 @@ qtHaveModule(widgets) { +@@ -4,19 +4,21 @@ qtHaveModule(widgets) { no-png { message("Some graphics-related tools are unavailable without PNG support") } else { @@ -98,16 +98,18 @@ index 494898f..c02848d 100644 linguist.depends = designer } -@@ -15,7 +17,7 @@ qtHaveModule(widgets) { + } SUBDIRS += linguist \ +- qdoc \ qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths ++!linguistonly: SUBDIRS += qdoc +if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths mac { SUBDIRS += macdeployqt -@@ -25,11 +27,11 @@ android { +@@ -26,11 +28,11 @@ android { SUBDIRS += androiddeployqt } @@ -155,5 +157,5 @@ index 20b5fec..8a42d1f 100644 installed_cmake.depends = cmake -- -2.6.1 +2.6.2 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 3116b3d9..754213fe 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,4 +1,4 @@ -From 83493e0f4e0d8b4dbf1da982e4459fefea61c582 Mon Sep 17 00:00:00 2001 +From d480a725a36482f7a1df52c5c170961382a8e730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jan 2014 14:33:19 +0100 Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries @@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.6.1 +2.6.2 diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index a0306e5f..3e87400b 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From ad5e4266eda956a1ff408bf3fe875badc5f4c866 Mon Sep 17 00:00:00 2001 +From d26b82742e20d4fff96856f7b9a7828ccb1aea68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/4] add noqtwebkit configuration @@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.6.1 +2.6.2 diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch index ce4a0b7c..55e7ec54 100644 --- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From e9e9a79d1a58981dd33d18c0f43b1fb982100a61 Mon Sep 17 00:00:00 2001 +From eb882650473cea1cd71cef7813512b381429fd5c Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Thu, 9 Jul 2015 11:28:19 -0400 Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for @@ -59,5 +59,5 @@ index 4318b16..2e3b70f 100644 set_target_properties(Qt5::lconvert PROPERTIES -- -2.6.1 +2.6.2 -- cgit v1.2.3