From 54c44443c34f077bfc2c5cc3a92d6db59d28343c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 27 Nov 2014 13:48:38 +0100 Subject: qt5-git: Update to rc1+, latest revision in 5.4 branch * qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently Signed-off-by: Martin Jansa --- .../0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | 4 ++-- .../0002-assistant-help-fix-linking-of-dependent-libraries.patch | 4 ++-- recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qttools-git') diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index af431dc5..e4ad2210 100644 --- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch @@ -1,4 +1,4 @@ -From f8476dd4e4069b4403f26b5ccd5c3d9d9402c7bd Mon Sep 17 00:00:00 2001 +From ff3f521648906d07ddc1e1aecaddadb95b0314f3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Sep 2013 18:30:08 +0200 Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert @@ -151,5 +151,5 @@ index df240e3..27ee687 100644 installed_cmake.depends = cmake -- -2.1.1 +2.1.3 diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch index 764c3e58..5cc317ce 100644 --- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch @@ -1,4 +1,4 @@ -From d43c5a3759ceee4ba0e0e6d94c61d13850e142ec Mon Sep 17 00:00:00 2001 +From 20dd8d70eb3db17173eb3965e757711cc694de2a 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/3] assistant/help: fix linking of dependent libraries @@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 + +LIBS += -lQt5CLucene -- -2.1.1 +2.1.3 diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch index 535a24c4..bf5957bc 100644 --- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From 5012d9057afa20e34aa8a36c195f87b89d0fbf8c Mon Sep 17 00:00:00 2001 +From 1d8bf41acc2235528f1d08505cf2dc8afd793aef 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/3] add noqtwebkit configuration @@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.1.1 +2.1.3 -- cgit v1.2.3-54-g00ecf