diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-27 17:25:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-05 11:03:12 +0200 |
commit | 1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch) | |
tree | 8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |
parent | 85694b94aa0b1e536eda13e7239720bca114b000 (diff) | |
download | meta-qt5-1a42aa78af040d0fbecc960e4f9dd3f180ccb404.tar.gz |
qt5: upgrade to latest revisions in 5.7 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.
* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
was resolved in upstream commit:
commit 26229cfa0b729313893af5674d604e8692dbb946
Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Tue Apr 26 15:08:34 2016 +0200
QDeclarativeTextInput: update API to use setBlinkingCursorEnabled
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 11cd97b0..381cde29 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f Mon Sep 17 00:00:00 2001 | 1 | From c1dc6165d6a085f162ed32ef5697f645019f9ee0 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] Add -external-hostbindir option | 4 | Subject: [PATCH] Add -external-hostbindir option |
@@ -39,10 +39,10 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 | |||
39 | 7 files changed, 44 insertions(+), 8 deletions(-) | 39 | 7 files changed, 44 insertions(+), 8 deletions(-) |
40 | 40 | ||
41 | diff --git a/configure b/configure | 41 | diff --git a/configure b/configure |
42 | index ffe6931..5aa87b4 100755 | 42 | index 052872e..1fcbb3a 100755 |
43 | --- a/configure | 43 | --- a/configure |
44 | +++ b/configure | 44 | +++ b/configure |
45 | @@ -825,6 +825,7 @@ QT_HOST_BINS= | 45 | @@ -834,6 +834,7 @@ QT_HOST_BINS= |
46 | QT_HOST_LIBS= | 46 | QT_HOST_LIBS= |
47 | QT_HOST_DATA= | 47 | QT_HOST_DATA= |
48 | QT_EXT_PREFIX= | 48 | QT_EXT_PREFIX= |
@@ -50,7 +50,7 @@ index ffe6931..5aa87b4 100755 | |||
50 | 50 | ||
51 | #flags for SQL drivers | 51 | #flags for SQL drivers |
52 | QT_CFLAGS_PSQL= | 52 | QT_CFLAGS_PSQL= |
53 | @@ -944,6 +945,7 @@ while [ "$#" -gt 0 ]; do | 53 | @@ -953,6 +954,7 @@ while [ "$#" -gt 0 ]; do |
54 | -testsdir| \ | 54 | -testsdir| \ |
55 | -hostdatadir| \ | 55 | -hostdatadir| \ |
56 | -hostbindir| \ | 56 | -hostbindir| \ |
@@ -58,7 +58,7 @@ index ffe6931..5aa87b4 100755 | |||
58 | -hostlibdir| \ | 58 | -hostlibdir| \ |
59 | -extprefix| \ | 59 | -extprefix| \ |
60 | -sysroot| \ | 60 | -sysroot| \ |
61 | @@ -1176,6 +1178,9 @@ while [ "$#" -gt 0 ]; do | 61 | @@ -1185,6 +1187,9 @@ while [ "$#" -gt 0 ]; do |
62 | extprefix) | 62 | extprefix) |
63 | QT_EXT_PREFIX="$VAL" | 63 | QT_EXT_PREFIX="$VAL" |
64 | ;; | 64 | ;; |
@@ -68,7 +68,7 @@ index ffe6931..5aa87b4 100755 | |||
68 | pkg-config) | 68 | pkg-config) |
69 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 69 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
70 | CFG_PKGCONFIG="$VAL" | 70 | CFG_PKGCONFIG="$VAL" |
71 | @@ -2438,6 +2443,10 @@ Installation options: | 71 | @@ -2447,6 +2452,10 @@ Installation options: |
72 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 72 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
73 | (default HOSTPREFIX) | 73 | (default HOSTPREFIX) |
74 | 74 | ||
@@ -79,7 +79,7 @@ index ffe6931..5aa87b4 100755 | |||
79 | Configure options: | 79 | Configure options: |
80 | 80 | ||
81 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 81 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
82 | @@ -3196,6 +3205,11 @@ fi | 82 | @@ -3209,6 +3218,11 @@ fi |
83 | # command line and environment validation | 83 | # command line and environment validation |
84 | #------------------------------------------------------------------------------- | 84 | #------------------------------------------------------------------------------- |
85 | 85 | ||
@@ -92,7 +92,7 @@ index ffe6931..5aa87b4 100755 | |||
92 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 92 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
93 | case "$CFG_QCONFIG" in | 93 | case "$CFG_QCONFIG" in |
94 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 94 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
95 | index cfac583..41ca7f1 100644 | 95 | index 54641ce..7d7baa4 100644 |
96 | --- a/mkspecs/features/qt_functions.prf | 96 | --- a/mkspecs/features/qt_functions.prf |
97 | +++ b/mkspecs/features/qt_functions.prf | 97 | +++ b/mkspecs/features/qt_functions.prf |
98 | @@ -71,7 +71,11 @@ defineTest(qtHaveModule) { | 98 | @@ -71,7 +71,11 @@ defineTest(qtHaveModule) { |