diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:18 +0200 |
commit | bf2cafa909a27250f853a823e9d7101307337e7a (patch) | |
tree | 3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |
parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) | |
download | meta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz |
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
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 | 66 |
1 files changed, 34 insertions, 32 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 ca271e6c..11cd97b0 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 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 Mon Sep 17 00:00:00 2001 | 1 | From 502b95b840a5f79e5a68e9bd5b10dbdc92485f1f 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 |
@@ -26,21 +26,23 @@ Signed-off-by: Jonathan Liu <net147@gmail.com> | |||
26 | 26 | ||
27 | Conflicts: | 27 | Conflicts: |
28 | configure | 28 | configure |
29 | |||
30 | Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 | ||
29 | --- | 31 | --- |
30 | configure | 14 ++++++++++++++ | 32 | configure | 14 ++++++++++++++ |
31 | mkspecs/features/qt_functions.prf | 6 +++++- | 33 | mkspecs/features/qt_functions.prf | 6 +++++- |
32 | mkspecs/features/qt_tool.prf | 5 +++-- | 34 | mkspecs/features/qt_tool.prf | 4 +++- |
33 | qtbase.pro | 13 ++++++++++--- | 35 | qtbase.pro | 16 ++++++++++++++++ |
34 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | 36 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
35 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 37 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
36 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 38 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
37 | 7 files changed, 38 insertions(+), 12 deletions(-) | 39 | 7 files changed, 44 insertions(+), 8 deletions(-) |
38 | 40 | ||
39 | diff --git a/configure b/configure | 41 | diff --git a/configure b/configure |
40 | index 88a308d..f2611ed 100755 | 42 | index ffe6931..5aa87b4 100755 |
41 | --- a/configure | 43 | --- a/configure |
42 | +++ b/configure | 44 | +++ b/configure |
43 | @@ -810,6 +810,7 @@ QT_HOST_BINS= | 45 | @@ -825,6 +825,7 @@ QT_HOST_BINS= |
44 | QT_HOST_LIBS= | 46 | QT_HOST_LIBS= |
45 | QT_HOST_DATA= | 47 | QT_HOST_DATA= |
46 | QT_EXT_PREFIX= | 48 | QT_EXT_PREFIX= |
@@ -48,7 +50,7 @@ index 88a308d..f2611ed 100755 | |||
48 | 50 | ||
49 | #flags for SQL drivers | 51 | #flags for SQL drivers |
50 | QT_CFLAGS_PSQL= | 52 | QT_CFLAGS_PSQL= |
51 | @@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do | 53 | @@ -944,6 +945,7 @@ while [ "$#" -gt 0 ]; do |
52 | -testsdir| \ | 54 | -testsdir| \ |
53 | -hostdatadir| \ | 55 | -hostdatadir| \ |
54 | -hostbindir| \ | 56 | -hostbindir| \ |
@@ -56,7 +58,7 @@ index 88a308d..f2611ed 100755 | |||
56 | -hostlibdir| \ | 58 | -hostlibdir| \ |
57 | -extprefix| \ | 59 | -extprefix| \ |
58 | -sysroot| \ | 60 | -sysroot| \ |
59 | @@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do | 61 | @@ -1176,6 +1178,9 @@ while [ "$#" -gt 0 ]; do |
60 | extprefix) | 62 | extprefix) |
61 | QT_EXT_PREFIX="$VAL" | 63 | QT_EXT_PREFIX="$VAL" |
62 | ;; | 64 | ;; |
@@ -66,7 +68,7 @@ index 88a308d..f2611ed 100755 | |||
66 | pkg-config) | 68 | pkg-config) |
67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 69 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
68 | CFG_PKGCONFIG="$VAL" | 70 | CFG_PKGCONFIG="$VAL" |
69 | @@ -2428,6 +2433,10 @@ Installation options: | 71 | @@ -2438,6 +2443,10 @@ Installation options: |
70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 72 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
71 | (default HOSTPREFIX) | 73 | (default HOSTPREFIX) |
72 | 74 | ||
@@ -77,7 +79,7 @@ index 88a308d..f2611ed 100755 | |||
77 | Configure options: | 79 | Configure options: |
78 | 80 | ||
79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 81 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
80 | @@ -3172,6 +3181,11 @@ fi | 82 | @@ -3196,6 +3205,11 @@ fi |
81 | # command line and environment validation | 83 | # command line and environment validation |
82 | #------------------------------------------------------------------------------- | 84 | #------------------------------------------------------------------------------- |
83 | 85 | ||
@@ -90,10 +92,10 @@ index 88a308d..f2611ed 100755 | |||
90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 92 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
91 | case "$CFG_QCONFIG" in | 93 | case "$CFG_QCONFIG" in |
92 | 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 |
93 | index 8639695..d89d948 100644 | 95 | index cfac583..41ca7f1 100644 |
94 | --- a/mkspecs/features/qt_functions.prf | 96 | --- a/mkspecs/features/qt_functions.prf |
95 | +++ b/mkspecs/features/qt_functions.prf | 97 | +++ b/mkspecs/features/qt_functions.prf |
96 | @@ -70,7 +70,11 @@ defineTest(qtHaveModule) { | 98 | @@ -71,7 +71,11 @@ defineTest(qtHaveModule) { |
97 | defineTest(qtPrepareTool) { | 99 | defineTest(qtPrepareTool) { |
98 | cmd = $$eval(QT_TOOL.$${2}.binary) | 100 | cmd = $$eval(QT_TOOL.$${2}.binary) |
99 | isEmpty(cmd) { | 101 | isEmpty(cmd) { |
@@ -104,13 +106,13 @@ index 8639695..d89d948 100644 | |||
104 | + else: \ | 106 | + else: \ |
105 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 | 107 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 |
106 | exists($${cmd}.pl) { | 108 | exists($${cmd}.pl) { |
109 | $${1}_EXE = $${cmd}.pl | ||
107 | cmd = perl -w $$system_path($${cmd}.pl) | 110 | cmd = perl -w $$system_path($${cmd}.pl) |
108 | } else: contains(QMAKE_HOST.os, Windows) { | ||
109 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | 111 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf |
110 | index 839c3d6..45934a0 100644 | 112 | index bdeb59c..b8c539f 100644 |
111 | --- a/mkspecs/features/qt_tool.prf | 113 | --- a/mkspecs/features/qt_tool.prf |
112 | +++ b/mkspecs/features/qt_tool.prf | 114 | +++ b/mkspecs/features/qt_tool.prf |
113 | @@ -14,10 +14,11 @@ load(qt_app) | 115 | @@ -14,10 +14,12 @@ load(qt_app) |
114 | CONFIG += console | 116 | CONFIG += console |
115 | DEFINES *= QT_USE_QSTRINGBUILDER | 117 | DEFINES *= QT_USE_QSTRINGBUILDER |
116 | 118 | ||
@@ -118,37 +120,37 @@ index 839c3d6..45934a0 100644 | |||
118 | + | 120 | + |
119 | # If we are doing a prefix build, create a "module" pri which enables | 121 | # If we are doing a prefix build, create a "module" pri which enables |
120 | # qtPrepareTool() to work with the non-installed build. | 122 | # qtPrepareTool() to work with the non-installed build. |
121 | -# Non-bootstrapped tools always need this because of the environment setup. | 123 | # Non-bootstrapped tools always need this because of the environment setup. |
122 | -!build_pass:if(!host_build|!force_bootstrap|force_independent) { | 124 | -!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)) { |
123 | +!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty(QT_EXTERNAL_HOST_BINS) { | 125 | +!build_pass:if(!host_build|!force_bootstrap|force_independent|!isEmpty(HOST_QT_TOOLS)):isEmpty(QT_EXTERNAL_HOST_BINS) { |
124 | isEmpty(MODULE):MODULE = $$TARGET | 126 | isEmpty(MODULE):MODULE = $$TARGET |
125 | 127 | ||
126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 128 | load(qt_build_paths) |
127 | diff --git a/qtbase.pro b/qtbase.pro | 129 | diff --git a/qtbase.pro b/qtbase.pro |
128 | index 98ca86a..0eed475 100644 | 130 | index 11cff9e..ec03669 100644 |
129 | --- a/qtbase.pro | 131 | --- a/qtbase.pro |
130 | +++ b/qtbase.pro | 132 | +++ b/qtbase.pro |
131 | @@ -37,12 +37,16 @@ CONFIG -= qt | 133 | @@ -38,6 +38,19 @@ CONFIG -= qt |
132 | 134 | ||
133 | ### installations #### | 135 | ### installations #### |
134 | 136 | ||
135 | +QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] | 137 | +QT_EXTERNAL_HOST_BINS = $$[QT_EXTERNAL_HOST_BINS] |
136 | + | 138 | + |
137 | #qmake | 139 | +#qmake |
138 | qmake.path = $$[QT_HOST_BINS] | 140 | +qmake.path = $$[QT_HOST_BINS] |
139 | +qmake.files = $$OUT_PWD/bin/qmake | 141 | +qmake.files = $$OUT_PWD/bin/qmake |
140 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { | 142 | +!isEmpty(QT_EXTERNAL_HOST_BINS) { |
141 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake | 143 | + qmake.files = $$[QT_EXTERNAL_HOST_BINS]/qmake |
142 | +} | 144 | +} |
143 | equals(QMAKE_HOST.os, Windows) { | 145 | +equals(QMAKE_HOST.os, Windows) { |
144 | - qmake.files = $$OUT_PWD/bin/qmake.exe | ||
145 | -} else { | ||
146 | - qmake.files = $$OUT_PWD/bin/qmake | ||
147 | + qmake.files = $${qmake.files}.exe | 146 | + qmake.files = $${qmake.files}.exe |
148 | } | 147 | +} |
149 | INSTALLS += qmake | 148 | +INSTALLS += qmake |
150 | 149 | + | |
151 | @@ -59,6 +63,9 @@ INSTALLS += fixqt4headers | 150 | #licheck |
151 | licheck.path = $$[QT_HOST_BINS] | ||
152 | licheck.files = $$PWD/bin/$$QT_LICHECK | ||
153 | @@ -51,6 +64,9 @@ INSTALLS += fixqt4headers | ||
152 | #syncqt | 154 | #syncqt |
153 | syncqt.path = $$[QT_HOST_BINS] | 155 | syncqt.path = $$[QT_HOST_BINS] |
154 | syncqt.files = $$PWD/bin/syncqt.pl | 156 | syncqt.files = $$PWD/bin/syncqt.pl |
@@ -159,7 +161,7 @@ index 98ca86a..0eed475 100644 | |||
159 | 161 | ||
160 | # If we are doing a prefix build, create a "module" pri which enables | 162 | # If we are doing a prefix build, create a "module" pri which enables |
161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 163 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
162 | index 91a4eb6..25df27c 100644 | 164 | index a5ed8b2..0e11a1e 100644 |
163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 165 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 166 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 167 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |