diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-07 04:10:06 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-19 11:56:32 +0100 |
commit | 4b7182a3be2b591e8190ff15b7a121191e4b201f (patch) | |
tree | c518a426110cae5e5355dc5d02bdcf60a2cf2834 /recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |
parent | 79944bda32a7e4799e7e73ea5b0dfc71ff1fc172 (diff) | |
download | meta-qt5-4b7182a3be2b591e8190ff15b7a121191e4b201f.tar.gz |
qt5: Upgrade from 5.2.0 to 5.2.1
* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
* license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
* SHA-1 of v5.2.1 tag is only in release branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 0f953338..3e4cf4ef 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 @@ | |||
1 | From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001 | 1 | From 6837c212d388a3b679b7420c5f1c98ef85d04a39 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -28,5 +28,5 @@ index ed75c37..a2c55c7 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 1.8.3.1 | 31 | 1.8.5.3 |
32 | 32 | ||