diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:51:19 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:09:41 +0200 |
commit | c110de233f0fd56e60b2be996dece64147c332e0 (patch) | |
tree | 394f63daf8c21542c650d3c4bf5c3db85349f430 /recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |
parent | 4cea8f8c4a6ff2d869b0244c279def2e5adb9e8a (diff) | |
download | meta-qt5-c110de233f0fd56e60b2be996dece64147c332e0.tar.gz |
qt5: upgrade to latest revisions in 5.6 branch
* LIC_FILES_CHKSUM were changed because of this small change:
commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
Author: Sze Howe Koh <szehowe.koh@gmail.com>
Date: Tue Jun 14 19:12:35 2016 +0800
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
* -no-nis option was removed from qtbase in:
commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
Author: Ralf Nolden <nolden@kde.org>
Date: Fri May 20 22:03:39 2016 +0200
Cleanup NIS support leftover from Qt 3/4
* allow to disable eglfs independently from gles2, because eglfs-egldevice
may be autodetected when libdrm was built before qtbase since this
upstream commit:
commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
Author: Ralf Nolden <nolden@kde.org>
Date: Tue May 17 12:38:44 2016 +0200
Make eglfs-egldevice check work with pkgconfig as well
and then it fails to build, because libdrm could be removed from sysroot
and drm.h is missing.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 18f268ce..822aefbe 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001 | 1 | From 19f7088dd18c4966ec40501cd7e07a0ea16613ae Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 | 3 | Date: Tue, 18 Nov 2014 10:38:18 +0100 |
4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to | 4 | Subject: [PATCH] functions.prf: Make sure we only use the file name to |
@@ -11,10 +11,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 1 deletion(-) | 11 | 1 file changed, 2 insertions(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf | 13 | diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf |
14 | index 8d984c7..055e960 100644 | 14 | index 47311c6..be2b2a5 100644 |
15 | --- a/tools/qmake/mkspecs/features/functions.prf | 15 | --- a/tools/qmake/mkspecs/features/functions.prf |
16 | +++ b/tools/qmake/mkspecs/features/functions.prf | 16 | +++ b/tools/qmake/mkspecs/features/functions.prf |
17 | @@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { | 17 | @@ -122,7 +122,8 @@ defineReplace(findIncludedMocFiles) { |
18 | } | 18 | } |
19 | 19 | ||
20 | defineReplace(mocOutput) { | 20 | defineReplace(mocOutput) { |