diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-25 15:47:15 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-06 19:45:44 +0200 |
commit | b26453cd28ed913d68e6ab2a0da0a13b1ce40098 (patch) | |
tree | 0296514f3790e3d4c6226b5f676f6cd28f8db3d9 /recipes-qt/qt5/qtbase | |
parent | 0d9ca1b1bd06a9f2221cbfd6b7364c74fd20f21a (diff) | |
download | meta-qt5-b26453cd28ed913d68e6ab2a0da0a13b1ce40098.tar.gz |
recipes: upgrade from 5.3.0 to 5.3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
21 files changed, 326 insertions, 600 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index cddd6210..f2a7c0ec 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2c2e479049c49539049db7e53d500e673285025f Mon Sep 17 00:00:00 2001 | 1 | From c5b50848ead7de12ec18cd30940d74d92b974280 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: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/17] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
@@ -11,6 +11,14 @@ Subject: [PATCH 01/17] Add linux-oe-g++ platform | |||
11 | Allow expansion of $(...) references from qmake.conf to generate | 11 | Allow expansion of $(...) references from qmake.conf to generate |
12 | qmake environment from shell environment as exported by qmake5_base | 12 | qmake environment from shell environment as exported by qmake5_base |
13 | 13 | ||
14 | * configure: don't export SYSTEM_VARIABLES to .qmake.vars | ||
15 | linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is | ||
16 | causing issues as we need g++ to be used as linker | ||
17 | |||
18 | * configure.prf: Allow to add extra arguments to make | ||
19 | sometimes we would like to add -e or define some variable and respect it from both | ||
20 | Makefiles used in configure tests and also Makefiles to build the application | ||
21 | |||
14 | * OE_QMAKE_CXX in order to allow compiler version check to succeed | 22 | * OE_QMAKE_CXX in order to allow compiler version check to succeed |
15 | which allows WebKit to be enabled. | 23 | which allows WebKit to be enabled. |
16 | 24 | ||
@@ -29,19 +37,21 @@ Subject: [PATCH 01/17] Add linux-oe-g++ platform | |||
29 | /bin/sh: line 0: test: -gt: unary operator expected | 37 | /bin/sh: line 0: test: -gt: unary operator expected |
30 | which are not fatal, but still misleading in do_configure output | 38 | which are not fatal, but still misleading in do_configure output |
31 | 39 | ||
32 | Upstream-Status: Pending | 40 | Upstream-Status: Inappropriate [embedded specific] |
41 | too OE specific, probably cannot be upstreamed | ||
33 | 42 | ||
34 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
35 | --- | 44 | --- |
36 | configure | 54 ++++++++++++++++--- | 45 | configure | 66 ++++++++++++++++------- |
46 | mkspecs/features/configure.prf | 4 +- | ||
37 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ | 47 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ |
38 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 48 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
39 | 3 files changed, 187 insertions(+), 7 deletions(-) | 49 | 4 files changed, 188 insertions(+), 22 deletions(-) |
40 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 50 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
41 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 51 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
42 | 52 | ||
43 | diff --git a/configure b/configure | 53 | diff --git a/configure b/configure |
44 | index 601d84a..eaa4092 100755 | 54 | index d5c2b08..4eae0d3 100755 |
45 | --- a/configure | 55 | --- a/configure |
46 | +++ b/configure | 56 | +++ b/configure |
47 | @@ -324,6 +324,16 @@ getQMakeConf() | 57 | @@ -324,6 +324,16 @@ getQMakeConf() |
@@ -78,26 +88,37 @@ index 601d84a..eaa4092 100755 | |||
78 | compilerSupportsFlag() | 88 | compilerSupportsFlag() |
79 | { | 89 | { |
80 | cat >conftest.cpp <<EOF | 90 | cat >conftest.cpp <<EOF |
81 | @@ -548,6 +568,18 @@ fi | 91 | @@ -548,21 +568,19 @@ fi |
82 | # initalize variables | 92 | # initalize variables |
83 | #------------------------------------------------------------------------------- | 93 | #------------------------------------------------------------------------------- |
84 | 94 | ||
95 | -SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
96 | -for varname in $SYSTEM_VARIABLES; do | ||
85 | +# Export all OE variables for qmake.conf from shell env to QMakeVars | 97 | +# Export all OE variables for qmake.conf from shell env to QMakeVars |
86 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" | 98 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" |
87 | +for varname in $OE_VARIABLES; do | 99 | +for varname in $OE_VARIABLES; do |
88 | + qmakevarname="${varname}" | 100 | qmakevarname="${varname}" |
89 | + cmd=`echo \ | 101 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS |
102 | - if [ "${varname}" = "LDFLAGS" ]; then | ||
103 | - qmakevarname="LFLAGS" | ||
104 | - elif [ "${varname}" = "LD" ]; then | ||
105 | - qmakevarname="LINK" | ||
106 | - fi | ||
107 | cmd=`echo \ | ||
108 | -'if [ -n "\$'${varname}'" ]; then | ||
109 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | ||
90 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then | 110 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then |
91 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" | 111 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" |
92 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 | 112 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 |
93 | +fi'` | 113 | fi'` |
94 | + eval "$cmd" | 114 | eval "$cmd" |
95 | +done | 115 | done |
96 | + | 116 | + |
97 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | 117 | +SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" |
98 | for varname in $SYSTEM_VARIABLES; do | 118 | # Use CC/CXX to run config.tests |
99 | qmakevarname="${varname}" | 119 | mkdir -p "$outpath/config.tests" |
100 | @@ -3117,7 +3149,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 120 | rm -f "$outpath/config.tests/.qmake.cache" |
121 | @@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | ||
101 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 122 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
102 | fi | 123 | fi |
103 | 124 | ||
@@ -106,7 +127,7 @@ index 601d84a..eaa4092 100755 | |||
106 | 127 | ||
107 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 128 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
108 | 129 | ||
109 | @@ -3152,7 +3184,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 130 | @@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
110 | exit 1 | 131 | exit 1 |
111 | fi | 132 | fi |
112 | fi | 133 | fi |
@@ -115,7 +136,7 @@ index 601d84a..eaa4092 100755 | |||
115 | 136 | ||
116 | GCC_MACHINE_DUMP= | 137 | GCC_MACHINE_DUMP= |
117 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 138 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
118 | @@ -3617,6 +3649,14 @@ setBootstrapVariable() | 139 | @@ -3633,6 +3651,14 @@ setBootstrapVariable() |
119 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 140 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
120 | } | 141 | } |
121 | 142 | ||
@@ -130,23 +151,48 @@ index 601d84a..eaa4092 100755 | |||
130 | # build qmake | 151 | # build qmake |
131 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 152 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
132 | echo "Creating qmake..." | 153 | echo "Creating qmake..." |
133 | @@ -3655,11 +3695,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | @@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
134 | fi | 155 | fi |
135 | 156 | ||
136 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 157 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
137 | - setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" | 158 | - setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM" |
138 | - setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" | 159 | - setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM" |
139 | - setBootstrapVariable QMAKE_CFLAGS | 160 | - setBootstrapVariable QMAKE_CFLAGS |
161 | - setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
140 | - setBootstrapVariable QMAKE_CXXFLAGS | 162 | - setBootstrapVariable QMAKE_CXXFLAGS |
163 | - setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
141 | - setBootstrapVariable QMAKE_LFLAGS | 164 | - setBootstrapVariable QMAKE_LFLAGS |
165 | - setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS | ||
142 | + setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" | 166 | + setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM" |
143 | + setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" | 167 | + setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM" |
144 | + setBootstrapEvalVariable QMAKE_CFLAGS | 168 | + setBootstrapEvalVariable QMAKE_CFLAGS |
169 | + setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS | ||
145 | + setBootstrapEvalVariable QMAKE_CXXFLAGS | 170 | + setBootstrapEvalVariable QMAKE_CXXFLAGS |
171 | + setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS | ||
146 | + setBootstrapEvalVariable QMAKE_LFLAGS | 172 | + setBootstrapEvalVariable QMAKE_LFLAGS |
173 | + setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS | ||
147 | 174 | ||
148 | if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then | 175 | if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then |
149 | setBootstrapVariable QMAKE_CFLAGS_RELEASE | 176 | setBootstrapVariable QMAKE_CFLAGS_RELEASE |
177 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | ||
178 | index fe41c54..e2db923 100644 | ||
179 | --- a/mkspecs/features/configure.prf | ||
180 | +++ b/mkspecs/features/configure.prf | ||
181 | @@ -60,12 +60,12 @@ defineTest(qtCompileTest) { | ||
182 | } | ||
183 | |||
184 | # Clean up after previous run | ||
185 | - exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") | ||
186 | + exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") | ||
187 | |||
188 | mkpath($$test_out_dir)|error("Aborting.") | ||
189 | |||
190 | qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { | ||
191 | - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { | ||
192 | + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { | ||
193 | log("yes$$escape_expand(\\n)") | ||
194 | msg = "test $$1 succeeded" | ||
195 | write_file($$QMAKE_CONFIG_LOG, msg, append) | ||
150 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 196 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
151 | new file mode 100644 | 197 | new file mode 100644 |
152 | index 0000000..ca26b10 | 198 | index 0000000..ca26b10 |
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 14f0fc7d..247bfb75 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,14 +1,17 @@ | |||
1 | From c45a30d1301f85e49eef66c06cccf2a16741a932 Mon Sep 17 00:00:00 2001 | 1 | From 5d83d8ce8b601a983b055f32dc67a418a0ce06ab Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/17] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside |
5 | using the environment | 5 | using the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
8 | to inject new prefixes and other paths into qmake. This is needed when using | 8 | to inject new prefixes and other paths into qmake. This is needed when using |
9 | the same qmake binary to build qt/x11 and qt/embedded | 9 | the same qmake binary to build qt/x11 and qt/embedded |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Inappropriate [embedded specific] |
12 | again very OE specific to read everything from environment (reusing the same | ||
13 | qmake from sstate and replacing all configured paths in it with qt.conf from | ||
14 | environment). | ||
12 | 15 | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
14 | --- | 17 | --- |
@@ -16,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | 19 | 1 file changed, 4 insertions(+), 1 deletion(-) |
17 | 20 | ||
18 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
19 | index 6d25325..80e0f30 100644 | 22 | index 174c1d0..69e614f 100644 |
20 | --- a/src/corelib/global/qlibraryinfo.cpp | 23 | --- a/src/corelib/global/qlibraryinfo.cpp |
21 | +++ b/src/corelib/global/qlibraryinfo.cpp | 24 | +++ b/src/corelib/global/qlibraryinfo.cpp |
22 | @@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() | 25 | @@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings() |
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 f8253ecf..66903a32 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5c2a17167e89f8f6cf26cbc289e57fa466678d2d Mon Sep 17 00:00:00 2001 | 1 | From 1fd06315781ada843e473ba2c28c594e05808ca2 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 03/17] Add -external-hostbindir option | 4 | Subject: [PATCH 03/12] Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -13,25 +13,34 @@ Subject: [PATCH 03/17] Add -external-hostbindir option | |||
13 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | 13 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - |
14 | isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. | 14 | isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. |
15 | 15 | ||
16 | * cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries | ||
17 | |||
16 | Upstream-Status: Pending | 18 | Upstream-Status: Pending |
19 | is a lot better for upstreaming (and it was already sort of approved by | ||
20 | Oswald) but in 5.2.0 I've noticed that he added something similar for | ||
21 | android builds | ||
17 | 22 | ||
18 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
24 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
19 | --- | 25 | --- |
20 | configure | 15 +++++++++++++++ | 26 | configure | 15 +++++++++++++++ |
21 | mkspecs/features/qt_functions.prf | 9 ++++++++- | 27 | mkspecs/features/qt_functions.prf | 2 +- |
22 | mkspecs/features/qt_tool.prf | 3 +-- | 28 | mkspecs/features/qt_tool.prf | 3 +-- |
23 | qmake/property.cpp | 1 + | 29 | qmake/property.cpp | 1 + |
24 | qtbase.pro | 12 +++++++++--- | 30 | qtbase.pro | 12 +++++++++--- |
25 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | 31 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
26 | src/corelib/global/qlibraryinfo.h | 1 + | 32 | src/corelib/global/qlibraryinfo.cpp | 3 ++- |
27 | tools/configure/configureapp.cpp | 8 ++++++++ | 33 | src/corelib/global/qlibraryinfo.h | 1 + |
28 | 8 files changed, 45 insertions(+), 7 deletions(-) | 34 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
35 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | ||
36 | tools/configure/configureapp.cpp | 8 ++++++++ | ||
37 | 11 files changed, 44 insertions(+), 13 deletions(-) | ||
29 | 38 | ||
30 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
31 | index eaa4092..43ad8df 100755 | 40 | index 4eae0d3..48d5119 100755 |
32 | --- a/configure | 41 | --- a/configure |
33 | +++ b/configure | 42 | +++ b/configure |
34 | @@ -791,6 +791,7 @@ QT_HOST_BINS= | 43 | @@ -777,6 +777,7 @@ QT_HOST_BINS= |
35 | QT_HOST_LIBS= | 44 | QT_HOST_LIBS= |
36 | QT_HOST_DATA= | 45 | QT_HOST_DATA= |
37 | QT_EXT_PREFIX= | 46 | QT_EXT_PREFIX= |
@@ -39,7 +48,7 @@ index eaa4092..43ad8df 100755 | |||
39 | 48 | ||
40 | #flags for SQL drivers | 49 | #flags for SQL drivers |
41 | QT_CFLAGS_PSQL= | 50 | QT_CFLAGS_PSQL= |
42 | @@ -910,6 +911,7 @@ while [ "$#" -gt 0 ]; do | 51 | @@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do |
43 | -testsdir| \ | 52 | -testsdir| \ |
44 | -hostdatadir| \ | 53 | -hostdatadir| \ |
45 | -hostbindir| \ | 54 | -hostbindir| \ |
@@ -47,7 +56,7 @@ index eaa4092..43ad8df 100755 | |||
47 | -hostlibdir| \ | 56 | -hostlibdir| \ |
48 | -extprefix| \ | 57 | -extprefix| \ |
49 | -sysroot| \ | 58 | -sysroot| \ |
50 | @@ -1124,6 +1126,9 @@ while [ "$#" -gt 0 ]; do | 59 | @@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do |
51 | extprefix) | 60 | extprefix) |
52 | QT_EXT_PREFIX="$VAL" | 61 | QT_EXT_PREFIX="$VAL" |
53 | ;; | 62 | ;; |
@@ -68,7 +77,7 @@ index eaa4092..43ad8df 100755 | |||
68 | Configure options: | 77 | Configure options: |
69 | 78 | ||
70 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
71 | @@ -2906,6 +2915,11 @@ fi | 80 | @@ -2915,6 +2924,11 @@ fi |
72 | # command line and environment validation | 81 | # command line and environment validation |
73 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
74 | 83 | ||
@@ -80,7 +89,7 @@ index eaa4092..43ad8df 100755 | |||
80 | # update QT_CONFIG to show our current predefined configuration | 89 | # update QT_CONFIG to show our current predefined configuration |
81 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
82 | case "$CFG_QCONFIG" in | 91 | case "$CFG_QCONFIG" in |
83 | @@ -3593,6 +3607,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | 92 | @@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { |
84 | "qt_hbinpath=$QT_HOST_BINS", | 93 | "qt_hbinpath=$QT_HOST_BINS", |
85 | "qt_hlibpath=$QT_HOST_LIBS", | 94 | "qt_hlibpath=$QT_HOST_LIBS", |
86 | "qt_hdatpath=$QT_HOST_DATA", | 95 | "qt_hdatpath=$QT_HOST_DATA", |
@@ -89,27 +98,20 @@ index eaa4092..43ad8df 100755 | |||
89 | "qt_hostspec=$shortspec", | 98 | "qt_hostspec=$shortspec", |
90 | #endif | 99 | #endif |
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 100 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 1dacfed..7229845 100644 | 101 | index 9a4d80e..e60ce37 100644 |
93 | --- a/mkspecs/features/qt_functions.prf | 102 | --- a/mkspecs/features/qt_functions.prf |
94 | +++ b/mkspecs/features/qt_functions.prf | 103 | +++ b/mkspecs/features/qt_functions.prf |
95 | @@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) { | 104 | @@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) { |
96 | defineTest(qtPrepareTool) { | 105 | defineTest(qtPrepareTool) { |
97 | $$1 = $$eval(QT_TOOL.$${2}.binary) | 106 | cmd = $$eval(QT_TOOL.$${2}.binary) |
98 | isEmpty($$1) { | 107 | isEmpty(cmd) { |
99 | - $$1 = $$[QT_HOST_BINS]/$$2 | 108 | - cmd = $$[QT_HOST_BINS]/$$2 |
100 | + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 | 109 | + cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2 |
101 | + # for some reason isEmpty does not work here, FIXME before submitting upstream | 110 | exists($${cmd}.pl) { |
102 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) | 111 | cmd = perl -w $$system_path($${cmd}.pl) |
103 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true | ||
104 | + # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch | ||
105 | + !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { | ||
106 | + $$1 = $$[QT_HOST_BINS]/$$2 | ||
107 | + } | ||
108 | exists($$eval($$1).pl) { | ||
109 | $$1 = perl -w $$eval($$1).pl | ||
110 | } else: contains(QMAKE_HOST.os, Windows) { | 112 | } else: contains(QMAKE_HOST.os, Windows) { |
111 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf | 113 | diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf |
112 | index f0864f9..50bfac8 100644 | 114 | index 1d3e88c..bd44754 100644 |
113 | --- a/mkspecs/features/qt_tool.prf | 115 | --- a/mkspecs/features/qt_tool.prf |
114 | +++ b/mkspecs/features/qt_tool.prf | 116 | +++ b/mkspecs/features/qt_tool.prf |
115 | @@ -15,8 +15,7 @@ CONFIG += console | 117 | @@ -15,8 +15,7 @@ CONFIG += console |
@@ -135,7 +137,7 @@ index e50485c..71291ad 100644 | |||
135 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 137 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
136 | }; | 138 | }; |
137 | diff --git a/qtbase.pro b/qtbase.pro | 139 | diff --git a/qtbase.pro b/qtbase.pro |
138 | index ed6fc39..2421f41 100644 | 140 | index d6861cf..92e6a83 100644 |
139 | --- a/qtbase.pro | 141 | --- a/qtbase.pro |
140 | +++ b/qtbase.pro | 142 | +++ b/qtbase.pro |
141 | @@ -71,16 +71,22 @@ CONFIG -= qt | 143 | @@ -71,16 +71,22 @@ CONFIG -= qt |
@@ -164,8 +166,39 @@ index ed6fc39..2421f41 100644 | |||
164 | INSTALLS += syncqt | 166 | INSTALLS += syncqt |
165 | 167 | ||
166 | # If we are doing a prefix build, create a "module" pri which enables | 168 | # If we are doing a prefix build, create a "module" pri which enables |
169 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
170 | index 9bda70e..6e3605a 100644 | ||
171 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
172 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
173 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | ||
174 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
175 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") | ||
176 | !!ELSE | ||
177 | - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") | ||
178 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\") | ||
179 | !!ENDIF | ||
180 | _qt5_Core_check_file_exists(${imported_location}) | ||
181 | |||
182 | @@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) | ||
183 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
184 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") | ||
185 | !!ELSE | ||
186 | - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") | ||
187 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\") | ||
188 | !!ENDIF | ||
189 | _qt5_Core_check_file_exists(${imported_location}) | ||
190 | |||
191 | @@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) | ||
192 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
193 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") | ||
194 | !!ELSE | ||
195 | - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") | ||
196 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\") | ||
197 | !!ENDIF | ||
198 | _qt5_Core_check_file_exists(${imported_location}) | ||
199 | |||
167 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 200 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
168 | index 80e0f30..89e13cf 100644 | 201 | index 69e614f..a95ca35 100644 |
169 | --- a/src/corelib/global/qlibraryinfo.cpp | 202 | --- a/src/corelib/global/qlibraryinfo.cpp |
170 | +++ b/src/corelib/global/qlibraryinfo.cpp | 203 | +++ b/src/corelib/global/qlibraryinfo.cpp |
171 | @@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() | 204 | @@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild() |
@@ -197,11 +230,46 @@ index 0b573c2..b5535ee 100644 | |||
197 | TargetSpecPath, | 230 | TargetSpecPath, |
198 | HostSpecPath, | 231 | HostSpecPath, |
199 | LastHostPath = HostSpecPath, | 232 | LastHostPath = HostSpecPath, |
233 | diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
234 | index 1d94715..301af8f 100644 | ||
235 | --- a/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
236 | +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
237 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) | ||
238 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
239 | set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
240 | !!ELSE | ||
241 | - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
242 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
243 | !!ENDIF | ||
244 | _qt5_DBus_check_file_exists(${imported_location}) | ||
245 | |||
246 | @@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) | ||
247 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
248 | set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
249 | !!ELSE | ||
250 | - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
251 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
252 | !!ENDIF | ||
253 | _qt5_DBus_check_file_exists(${imported_location}) | ||
254 | |||
255 | diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
256 | index 99d87e2..5621dc0 100644 | ||
257 | --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
258 | +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
259 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) | ||
260 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
261 | set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") | ||
262 | !!ELSE | ||
263 | - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") | ||
264 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\") | ||
265 | !!ENDIF | ||
266 | _qt5_Widgets_check_file_exists(${imported_location}) | ||
267 | |||
200 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 268 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
201 | index fe2caa2..eb472db 100644 | 269 | index b756509..7e61845 100644 |
202 | --- a/tools/configure/configureapp.cpp | 270 | --- a/tools/configure/configureapp.cpp |
203 | +++ b/tools/configure/configureapp.cpp | 271 | +++ b/tools/configure/configureapp.cpp |
204 | @@ -1208,6 +1208,13 @@ void Configure::parseCmdLine() | 272 | @@ -1213,6 +1213,13 @@ void Configure::parseCmdLine() |
205 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 273 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
206 | } | 274 | } |
207 | 275 | ||
@@ -215,7 +283,7 @@ index fe2caa2..eb472db 100644 | |||
215 | else if (configCmdLine.at(i) == "-make-tool") { | 283 | else if (configCmdLine.at(i) == "-make-tool") { |
216 | ++i; | 284 | ++i; |
217 | if (i == argCount) | 285 | if (i == argCount) |
218 | @@ -3957,6 +3964,7 @@ void Configure::generateQConfigCpp() | 286 | @@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp() |
219 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 287 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl |
220 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 288 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl |
221 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 289 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl |
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch index d24e193d..db6266d0 100644 --- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From 15b871b694cead18fcb750c0bb393440ea929e06 Mon Sep 17 00:00:00 2001 | 1 | From 4a86d338f04c2bfa4d3f63a2fa9d1252503757fd 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, 27 Apr 2013 22:33:33 +0200 | 3 | Date: Sat, 27 Apr 2013 22:33:33 +0200 |
4 | Subject: [PATCH 04/17] configureapp: Prefix default LIBDIRS and INCDIRS with | 4 | Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with |
5 | SYSROOT | 5 | SYSROOT |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
8 | again a bit OE specific | ||
8 | --- | 9 | --- |
9 | tools/configure/configureapp.cpp | 4 ++-- | 10 | tools/configure/configureapp.cpp | 4 ++-- |
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 12 | ||
12 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 13 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
13 | index eb472db..808c8dd 100644 | 14 | index 7e61845..29c6358 100644 |
14 | --- a/tools/configure/configureapp.cpp | 15 | --- a/tools/configure/configureapp.cpp |
15 | +++ b/tools/configure/configureapp.cpp | 16 | +++ b/tools/configure/configureapp.cpp |
16 | @@ -3344,8 +3344,8 @@ void Configure::generateQConfigPri() | 17 | @@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri() |
17 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; | 18 | configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; |
18 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { | 19 | if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { |
19 | // FIXME: add detection | 20 | // FIXME: add detection |
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 751ba277..6a7d7149 100644 --- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ad57786c39de2a192c0972bca6ffde2ce7a05d91 Mon Sep 17 00:00:00 2001 | 1 | From 71e5a4c62ca38b30a14c9957db21a7cbf5fcf54d 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, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 05/17] qt_module: Fix pkgconfig replacement | 4 | Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements |
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 |
@@ -40,60 +40,42 @@ Content-Transfer-Encoding: 8bit | |||
40 | Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b | 40 | Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b |
41 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> | 41 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> |
42 | 42 | ||
43 | Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c | ||
43 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
44 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 45 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
45 | --- | 46 | --- |
46 | mkspecs/features/qt_module.prf | 20 +++++++++++++------- | 47 | mkspecs/features/qt_module.prf | 14 ++++++++++++++ |
47 | 1 file changed, 13 insertions(+), 7 deletions(-) | 48 | 1 file changed, 14 insertions(+) |
48 | 49 | ||
49 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 50 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
50 | index 2134077..a88b8cc 100644 | 51 | index 8bf4c92..9737f8c 100644 |
51 | --- a/mkspecs/features/qt_module.prf | 52 | --- a/mkspecs/features/qt_module.prf |
52 | +++ b/mkspecs/features/qt_module.prf | 53 | +++ b/mkspecs/features/qt_module.prf |
53 | @@ -170,30 +170,36 @@ load(qt_installs) | 54 | @@ -188,10 +188,24 @@ unix|mingw { |
54 | rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* | 55 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module |
55 | else: \ | 56 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace |
56 | rplbase = $$MODULE_BASE_OUTDIR | ||
57 | -include_replace.match = $$rplbase/include | ||
58 | -include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
59 | -include_replace.CONFIG = path | ||
60 | +pkgconfig_include_replace.match = $$rplbase/include | ||
61 | +pkgconfig_include_replace.replace = "\$$\\{includedir}" | ||
62 | +pkgconfig_include_replace.CONFIG = path | ||
63 | +pkgconfig_lib_replace.match = $$rplbase/lib | ||
64 | +pkgconfig_lib_replace.replace = "\$$\\{libdir}" | ||
65 | +pkgconfig_lib_replace.CONFIG = path | ||
66 | lib_replace.match = $$rplbase/lib | ||
67 | host_build: \ | ||
68 | lib_replace.replace = $$[QT_HOST_LIBS] | ||
69 | else: \ | ||
70 | lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
71 | lib_replace.CONFIG = path | ||
72 | -QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | ||
73 | +lafile_replace.match = "-L$$[QT_INSTALL_LIBS/raw]" | ||
74 | +lafile_replace.replace = "" | ||
75 | +lafile_replace.CONFIG = path | ||
76 | +QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace | ||
77 | 57 | ||
78 | unix|mingw { | 58 | + pkgconfig_include_replace.match = $$rplbase/include |
79 | CONFIG += create_pc | 59 | + pkgconfig_include_replace.replace = "\$$\\{includedir}" |
80 | QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace | 60 | + pkgconfig_include_replace.CONFIG = path |
81 | - QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace | 61 | + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace |
82 | + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] | 62 | + |
83 | QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME | 63 | + pkgconfig_lib_replace.match = $$rplbase/lib |
84 | QMAKE_PKGCONFIG_DESTDIR = pkgconfig | 64 | + pkgconfig_lib_replace.replace = "\$$\\{libdir}" |
85 | - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace | 65 | + pkgconfig_lib_replace.CONFIG = path |
86 | + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | 66 | + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_lib_replace |
67 | + | ||
68 | unix { | ||
69 | CONFIG += create_libtool explicitlib | ||
70 | QMAKE_LIBTOOL_LIBDIR = $$qt_libdir | ||
71 | QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace | ||
72 | + lafile_replace.match = "-L$$[QT_INSTALL_LIBS/raw]" | ||
73 | + lafile_replace.replace = "" | ||
74 | + lafile_replace.CONFIG = path | ||
75 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace | ||
76 | } | ||
87 | } | 77 | } |
88 | 78 | ||
89 | unix { | ||
90 | CONFIG += create_libtool explicitlib | ||
91 | QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace | ||
92 | - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace | ||
93 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace | ||
94 | } | ||
95 | |||
96 | unix|mingw { | ||
97 | -- | 79 | -- |
98 | 2.0.0 | 80 | 2.0.0 |
99 | 81 | ||
diff --git a/recipes-qt/qt5/qtbase/0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch index 412ff357..e70417c3 100644 --- a/recipes-qt/qt5/qtbase/0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ b/recipes-qt/qt5/qtbase/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 13d45f81c26b22668c58d56a797db6f4309b5469 Mon Sep 17 00:00:00 2001 | 1 | From a3e87ebdf7dff6b9d4b1d8191f044cfb56b9da3d 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: Mon, 21 Apr 2014 19:22:04 +0200 | 3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 |
4 | Subject: [PATCH 11/17] Revert "eglfs: Print the chosen config in debug mode" | 4 | Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode" |
5 | 5 | ||
6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | 6 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. |
7 | --- | 7 | --- |
@@ -10,10 +10,10 @@ This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | |||
10 | 2 files changed, 3 insertions(+), 8 deletions(-) | 10 | 2 files changed, 3 insertions(+), 8 deletions(-) |
11 | 11 | ||
12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 12 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
13 | index 75789db..cd732d9 100644 | 13 | index 5eed470..39c7c1f 100644 |
14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | 14 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp |
15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | 15 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp |
16 | @@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | 16 | @@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) |
17 | for (index = 0; attrs[index].attr != -1; ++index) { | 17 | for (index = 0; attrs[index].attr != -1; ++index) { |
18 | EGLint value; | 18 | EGLint value; |
19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | 19 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { |
diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index 2ad412e1..00000000 --- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 96b69ad415b4883782841fa1d7723cf182e4ce6e Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 8 May 2013 23:54:35 +0200 | ||
4 | Subject: [PATCH 06/17] configure: don't export SYSTEM_VARIABLES to .qmake.vars | ||
5 | |||
6 | * linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is | ||
7 | causing issues as we need g++ to be used as linker | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | configure | 14 -------------- | ||
14 | 1 file changed, 14 deletions(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 43ad8df..341a01b 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -581,20 +581,6 @@ fi'` | ||
21 | done | ||
22 | |||
23 | SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
24 | -for varname in $SYSTEM_VARIABLES; do | ||
25 | - qmakevarname="${varname}" | ||
26 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | ||
27 | - if [ "${varname}" = "LDFLAGS" ]; then | ||
28 | - qmakevarname="LFLAGS" | ||
29 | - elif [ "${varname}" = "LD" ]; then | ||
30 | - qmakevarname="LINK" | ||
31 | - fi | ||
32 | - cmd=`echo \ | ||
33 | -'if [ -n "\$'${varname}'" ]; then | ||
34 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | ||
35 | -fi'` | ||
36 | - eval "$cmd" | ||
37 | -done | ||
38 | # Use CC/CXX to run config.tests | ||
39 | mkdir -p "$outpath/config.tests" | ||
40 | rm -f "$outpath/config.tests/.qmake.cache" | ||
41 | -- | ||
42 | 2.0.0 | ||
43 | |||
diff --git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 66eb898f..00000000 --- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 28fa609f9726993dd5b52de45c3458a1bdff6149 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 9 May 2013 10:06:50 +0200 | ||
4 | Subject: [PATCH 07/17] configure.prf: Allow to add extra arguments to make | ||
5 | |||
6 | * sometimes we would like to add -e or define some variable and respect it from both | ||
7 | Makefiles used in configure tests and also Makefiles to build the application | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | mkspecs/features/configure.prf | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | ||
17 | index fe41c54..e2db923 100644 | ||
18 | --- a/mkspecs/features/configure.prf | ||
19 | +++ b/mkspecs/features/configure.prf | ||
20 | @@ -60,12 +60,12 @@ defineTest(qtCompileTest) { | ||
21 | } | ||
22 | |||
23 | # Clean up after previous run | ||
24 | - exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") | ||
25 | + exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") | ||
26 | |||
27 | mkpath($$test_out_dir)|error("Aborting.") | ||
28 | |||
29 | qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { | ||
30 | - qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { | ||
31 | + qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { | ||
32 | log("yes$$escape_expand(\\n)") | ||
33 | msg = "test $$1 succeeded" | ||
34 | write_file($$QMAKE_CONFIG_LOG, msg, append) | ||
35 | -- | ||
36 | 2.0.0 | ||
37 | |||
diff --git a/recipes-qt/qt5/qtbase/0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 6c7d1397..b5e46d75 100644 --- a/recipes-qt/qt5/qtbase/0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ebe56bbaf8916bae94e7cef7932b87fd0fe13959 Mon Sep 17 00:00:00 2001 | 1 | From 75fbeec66d98aacad5be1e3fcfd92f42b1ef0da7 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: Wed, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 12/17] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h |
5 | 5 | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | --- | 7 | --- |
diff --git a/recipes-qt/qt5/qtbase/0013-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch index a215a5de..5df83300 100644 --- a/recipes-qt/qt5/qtbase/0013-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0008-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 2fd1d381e0202296303f296965467f3252d72e25 Mon Sep 17 00:00:00 2001 | 1 | From a3beca1f4ba231baf38e7de0221e55681437966d Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | 3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 |
4 | Subject: [PATCH 13/17] configure: bump path length from 256 to 512 characters | 4 | Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters |
5 | 5 | ||
6 | Increase the path length that gets hardcoded into generated config.cpp file | 6 | Increase the path length that gets hardcoded into generated config.cpp file |
7 | from 256 to 512 characters, as nativesdk path can be quite long. | 7 | from 256 to 512 characters, as nativesdk path can be quite long. |
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
15 | index 7d33403..53eb65d 100755 | 15 | index 48d5119..3c0347a 100755 |
16 | --- a/configure | 16 | --- a/configure |
17 | +++ b/configure | 17 | +++ b/configure |
18 | @@ -3578,7 +3578,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | 18 | @@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ |
19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; | 19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; |
20 | 20 | ||
21 | /* Installation Info */ | 21 | /* Installation Info */ |
diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch deleted file mode 100644 index d1d5873d..00000000 --- a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | From 8cca7892a65992369bb50a965293ebd2198ce40a Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Tue, 28 Feb 2012 15:10:24 +0000 | ||
4 | Subject: [PATCH 08/17] configure: make pulseaudio, alsa, freetype a | ||
5 | configurable option | ||
6 | |||
7 | Allows disabling pulseaudio, alsa, freetype support at configure time | ||
8 | making builds more deterministic. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | configure | 21 +++++++++++++++++++++ | ||
16 | 1 file changed, 21 insertions(+) | ||
17 | |||
18 | diff --git a/configure b/configure | ||
19 | index 341a01b..7d33403 100755 | ||
20 | --- a/configure | ||
21 | +++ b/configure | ||
22 | @@ -1826,6 +1826,27 @@ while [ "$#" -gt 0 ]; do | ||
23 | UNKNOWN_OPT=yes | ||
24 | fi | ||
25 | ;; | ||
26 | + pulseaudio) | ||
27 | + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
28 | + CFG_PULSEAUDIO="$VAL" | ||
29 | + else | ||
30 | + UNKNOWN_OPT=yes | ||
31 | + fi | ||
32 | + ;; | ||
33 | + alsa) | ||
34 | + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
35 | + CFG_ALSA="$VAL" | ||
36 | + else | ||
37 | + UNKNOWN_OPT=yes | ||
38 | + fi | ||
39 | + ;; | ||
40 | + freetype) | ||
41 | + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then | ||
42 | + CFG_LIBFREETYPE="$VAL" | ||
43 | + else | ||
44 | + UNKNOWN_OPT=yes | ||
45 | + fi | ||
46 | + ;; | ||
47 | gtkstyle) | ||
48 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | ||
49 | CFG_QGTKSTYLE="$VAL" | ||
50 | -- | ||
51 | 2.0.0 | ||
52 | |||
diff --git a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch deleted file mode 100644 index c83e330c..00000000 --- a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | From c1c28fa202519d6af0ca5aac942c3e18aaeda602 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Busch <morphis@gravedo.de> | ||
3 | Date: Mon, 22 Jul 2013 21:09:41 +0000 | ||
4 | Subject: [PATCH 09/17] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to | ||
5 | determine path to host binaries | ||
6 | |||
7 | Upstream-Status: Inappropiate (configuration) | ||
8 | |||
9 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | ||
13 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | ||
14 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | ||
15 | 3 files changed, 6 insertions(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
18 | index 9bda70e..6e3605a 100644 | ||
19 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
20 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | ||
21 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | ||
22 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
23 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") | ||
24 | !!ELSE | ||
25 | - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") | ||
26 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\") | ||
27 | !!ENDIF | ||
28 | _qt5_Core_check_file_exists(${imported_location}) | ||
29 | |||
30 | @@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc) | ||
31 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
32 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") | ||
33 | !!ELSE | ||
34 | - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") | ||
35 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\") | ||
36 | !!ENDIF | ||
37 | _qt5_Core_check_file_exists(${imported_location}) | ||
38 | |||
39 | @@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc) | ||
40 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
41 | set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") | ||
42 | !!ELSE | ||
43 | - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") | ||
44 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\") | ||
45 | !!ENDIF | ||
46 | _qt5_Core_check_file_exists(${imported_location}) | ||
47 | |||
48 | diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
49 | index 1d94715..301af8f 100644 | ||
50 | --- a/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
51 | +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in | ||
52 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) | ||
53 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
54 | set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
55 | !!ELSE | ||
56 | - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
57 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") | ||
58 | !!ENDIF | ||
59 | _qt5_DBus_check_file_exists(${imported_location}) | ||
60 | |||
61 | @@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) | ||
62 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
63 | set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
64 | !!ELSE | ||
65 | - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
66 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") | ||
67 | !!ENDIF | ||
68 | _qt5_DBus_check_file_exists(${imported_location}) | ||
69 | |||
70 | diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
71 | index e5650ff..16ff007 100644 | ||
72 | --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
73 | +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | ||
74 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) | ||
75 | !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) | ||
76 | set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") | ||
77 | !!ELSE | ||
78 | - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") | ||
79 | + set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\") | ||
80 | !!ENDIF | ||
81 | _qt5_Widgets_check_file_exists(${imported_location}) | ||
82 | |||
83 | -- | ||
84 | 2.0.0 | ||
85 | |||
diff --git a/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index 92b9ddd2..c3750b8e 100644 --- a/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c209e7648bc0c59707fe18874789a826f8beb47b Mon Sep 17 00:00:00 2001 | 1 | From 6d1123116233e55c4ade13378eec41fb7441cec6 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: Wed, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
4 | Subject: [PATCH 15/17] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one |
5 | window/surface | 5 | window/surface |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -21,32 +21,41 @@ Upstream-Status: unknown | |||
21 | [2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch | 21 | [2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch |
22 | 22 | ||
23 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 23 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
24 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
24 | --- | 25 | --- |
25 | src/plugins/platforms/eglfs/qeglfswindow.cpp | 15 +++++++++++++++ | 26 | src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++- |
26 | 1 file changed, 15 insertions(+) | 27 | 1 file changed, 15 insertions(+), 1 deletion(-) |
27 | 28 | ||
28 | diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp | 29 | diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp |
29 | index 2d36c0b..f2b68d3 100644 | 30 | index 2d36c0b..854531e 100644 |
30 | --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp | 31 | --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp |
31 | +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp | 32 | +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp |
32 | @@ -72,6 +72,16 @@ void QEglFSWindow::create() | 33 | @@ -74,6 +74,15 @@ void QEglFSWindow::create() |
33 | 34 | ||
34 | QEGLPlatformWindow::create(); | 35 | m_flags = Created; |
35 | 36 | ||
36 | + static EGLSurface __singleWindowSurface; | 37 | + static EGLSurface __singleWindowSurface; |
37 | + if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) | 38 | + if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) { |
38 | + { | ||
39 | + m_surface = __singleWindowSurface; | 39 | + m_surface = __singleWindowSurface; |
40 | +#ifdef QEGL_EXTRA_DEBUG | 40 | +#ifdef QEGL_EXTRA_DEBUG |
41 | + qWarning("Surface recreate request, re-using %x\n", m_surface); | 41 | + qWarning("Surface recreate request, re-using %x\n", m_surface); |
42 | +#endif | 42 | +#endif |
43 | + return; | 43 | + return; |
44 | + } | 44 | + } |
45 | + | 45 | + |
46 | m_flags = Created; | ||
47 | |||
48 | if (window()->type() == Qt::Desktop) | 46 | if (window()->type() == Qt::Desktop) |
49 | @@ -105,6 +115,11 @@ void QEglFSWindow::create() | 47 | return; |
48 | |||
49 | @@ -85,7 +94,7 @@ void QEglFSWindow::create() | ||
50 | if (isRaster() && screen->compositingWindow()) | ||
51 | return; | ||
52 | |||
53 | -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) | ||
54 | +#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB) | ||
55 | // We can have either a single OpenGL window or multiple raster windows. | ||
56 | // Other combinations cannot work. | ||
57 | qFatal("EGLFS: OpenGL windows cannot be mixed with others."); | ||
58 | @@ -105,6 +114,11 @@ void QEglFSWindow::create() | ||
50 | 59 | ||
51 | resetSurface(); | 60 | resetSurface(); |
52 | 61 | ||
diff --git a/recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch deleted file mode 100644 index 8defd450..00000000 --- a/recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 92cd73cb679dec203484cd76deff50cf329d8c44 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Apr 2014 15:09:23 +0200 | ||
4 | Subject: [PATCH 10/17] Fix missing plugin_types | ||
5 | |||
6 | * bearer/generic was failing with: | ||
7 | Project ERROR: No module claims plugin type 'bearer' | ||
8 | |||
9 | Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623 | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | mkspecs/features/qt_module_pris.prf | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf | ||
16 | index f31bc38..415e780 100644 | ||
17 | --- a/mkspecs/features/qt_module_pris.prf | ||
18 | +++ b/mkspecs/features/qt_module_pris.prf | ||
19 | @@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri | ||
20 | include($$mod_work_pfx/qt_lib_$${pri}.pri) | ||
21 | for(mod, mods_to_load) { | ||
22 | for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \ | ||
23 | - name depends module_config CONFIG DEFINES sources \ | ||
24 | + name depends module_config plugin_types CONFIG DEFINES sources \ | ||
25 | includes bins libs libexecs plugins imports qml \ | ||
26 | rpath_link \ | ||
27 | )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient) | ||
28 | -- | ||
29 | 2.0.0 | ||
30 | |||
diff --git a/recipes-qt/qt5/qtbase/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes-qt/qt5/qtbase/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch new file mode 100644 index 00000000..9fb7e08e --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 2a6891f2cbf221b51b214a527adb4602e20b100b Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 4 Jun 2014 15:26:11 +0200 | ||
4 | Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf" | ||
5 | |||
6 | This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489. | ||
7 | --- | ||
8 | mkspecs/features/simd.prf | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf | ||
12 | index 62a63f9..4f86f60 100644 | ||
13 | --- a/mkspecs/features/simd.prf | ||
14 | +++ b/mkspecs/features/simd.prf | ||
15 | @@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) | ||
16 | # | ||
17 | # Set up compilers for SIMD (SSE/AVX, NEON etc) | ||
18 | # | ||
19 | -gcc { # includes intel_icc and clang variants | ||
20 | +*-g++*|intel_icc|*-clang*|*-qcc* { | ||
21 | sse2 { | ||
22 | HEADERS += $$SSE2_HEADERS | ||
23 | |||
24 | -- | ||
25 | 2.0.0 | ||
26 | |||
diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch index a466dbc3..dcd10bd3 100644 --- a/recipes-qt/qt5/qtbase/0016-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 981cbf981b4a36d790b4ebf1a3434ef439ad3e52 Mon Sep 17 00:00:00 2001 | 1 | From bf4593d727fa673734bb1930f79fc012e52250ec 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, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 16/17] Always build uic | 4 | Subject: [PATCH 11/12] Always build uic |
5 | 5 | ||
6 | Even if we are not building gui or widgets. This tool is needed later | 6 | Even if we are not building gui or widgets. This tool is needed later |
7 | as a native tool when compiling the target. | 7 | as a native tool when compiling the target. |
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch new file mode 100644 index 00000000..7135a49a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 6317e81c96cec598da266d0c863afa4320d1e38a Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | ||
4 | Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build | ||
5 | it separately | ||
6 | |||
7 | * it is already built in qtbase-native, so we don't need it in configure | ||
8 | * allow building a separate qmake for the target | ||
9 | |||
10 | Upstream-Status: Inappropriate [configuration] | ||
11 | OE specific for native/target builds | ||
12 | |||
13 | Signed-off-by: Yu Ke <ke.yu@intel.com> | ||
14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
15 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | ||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
17 | --- | ||
18 | configure | 2 +- | ||
19 | qmake/qmake.pro | 2 ++ | ||
20 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/configure b/configure | ||
23 | index 3c0347a..a75ca11 100755 | ||
24 | --- a/configure | ||
25 | +++ b/configure | ||
26 | @@ -3675,7 +3675,7 @@ setBootstrapEvalVariable() | ||
27 | |||
28 | |||
29 | # build qmake | ||
30 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
31 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
32 | echo "Creating qmake..." | ||
33 | |||
34 | mkdir -p "$outpath/qmake" || exit | ||
35 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro | ||
36 | index 89d6ea5..7c605b9 100644 | ||
37 | --- a/qmake/qmake.pro | ||
38 | +++ b/qmake/qmake.pro | ||
39 | @@ -8,6 +8,8 @@ CONFIG -= qt | ||
40 | DEFINES += \ | ||
41 | QT_BUILD_QMAKE \ | ||
42 | PROEVALUATOR_FULL | ||
43 | +DESTDIR = ../bin/ | ||
44 | +TARGET = qmake | ||
45 | |||
46 | VPATH += \ | ||
47 | ../src/corelib/global \ | ||
48 | -- | ||
49 | 2.0.0 | ||
50 | |||
diff --git a/recipes-qt/qt5/qtbase/0017-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch index 0d5bc2f6..32d67dbc 100644 --- a/recipes-qt/qt5/qtbase/0017-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0012-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 88e1910cc2e0c2890d7084cc66ebb7c3c9981bf3 Mon Sep 17 00:00:00 2001 | 1 | From bfc795c5af38731dbd18d20467e27dd710df374c Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 17/17] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 12/12] configure: preserve built qmake and swap with native |
5 | one | 5 | one |
6 | 6 | ||
7 | Let configure script build the real qmake, but right after it's built, swap | 7 | Let configure script build the real qmake, but right after it's built, swap |
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
13 | 1 file changed, 2 insertions(+) | 13 | 1 file changed, 2 insertions(+) |
14 | 14 | ||
15 | diff --git a/configure b/configure | 15 | diff --git a/configure b/configure |
16 | index 53eb65d..01832e6 100755 | 16 | index 3c0347a..c51f785 100755 |
17 | --- a/configure | 17 | --- a/configure |
18 | +++ b/configure | 18 | +++ b/configure |
19 | @@ -3827,6 +3827,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 19 | @@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
20 | 20 | ||
21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | 21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 |
22 | fi # Build qmake | 22 | fi # Build qmake |
diff --git a/recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch deleted file mode 100644 index 64dd18ad..00000000 --- a/recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch +++ /dev/null | |||
@@ -1,152 +0,0 @@ | |||
1 | From d252513e388358e52865a29374840327369cb479 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | ||
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | ||
4 | Subject: [PATCH 14/17] QOpenGLPaintDevice sub-area support | ||
5 | |||
6 | Allows creating QOpenGLPaintDevice targetting sub-area | ||
7 | of binded framebuffer. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80 | ||
12 | |||
13 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
14 | --- | ||
15 | src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++ | ||
16 | src/gui/opengl/qopenglpaintdevice.h | 2 ++ | ||
17 | src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++-- | ||
18 | src/gui/opengl/qopenglpaintengine_p.h | 1 + | ||
19 | src/gui/opengl/qopengltextureglyphcache.cpp | 2 +- | ||
20 | 5 files changed, 23 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp | ||
23 | index 6750458..034630a 100644 | ||
24 | --- a/src/gui/opengl/qopenglpaintdevice.cpp | ||
25 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp | ||
26 | @@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate | ||
27 | public: | ||
28 | QOpenGLPaintDevicePrivate(const QSize &size); | ||
29 | |||
30 | + QPoint offset; | ||
31 | QSize size; | ||
32 | QOpenGLContext *ctx; | ||
33 | |||
34 | @@ -159,6 +160,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) | ||
35 | { | ||
36 | } | ||
37 | |||
38 | +QOpenGLPaintDevice::QOpenGLPaintDevice(int x, int y, int width, int height) | ||
39 | + : d_ptr(new QOpenGLPaintDevicePrivate(QSize(width, height))) | ||
40 | +{ | ||
41 | + d_ptr->offset = QPoint(x,y); | ||
42 | +} | ||
43 | + | ||
44 | /*! | ||
45 | Destroys the QOpenGLPaintDevice. | ||
46 | */ | ||
47 | @@ -228,6 +235,11 @@ QOpenGLContext *QOpenGLPaintDevice::context() const | ||
48 | return d_ptr->ctx; | ||
49 | } | ||
50 | |||
51 | +QPoint QOpenGLPaintDevice::offset() const | ||
52 | +{ | ||
53 | + return d_ptr->offset; | ||
54 | +} | ||
55 | + | ||
56 | /*! | ||
57 | Returns the pixel size of the paint device. | ||
58 | |||
59 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h | ||
60 | index c05571c..01eb1bc 100644 | ||
61 | --- a/src/gui/opengl/qopenglpaintdevice.h | ||
62 | +++ b/src/gui/opengl/qopenglpaintdevice.h | ||
63 | @@ -62,12 +62,14 @@ public: | ||
64 | QOpenGLPaintDevice(); | ||
65 | explicit QOpenGLPaintDevice(const QSize &size); | ||
66 | QOpenGLPaintDevice(int width, int height); | ||
67 | + QOpenGLPaintDevice(int x, int y, int width, int height); | ||
68 | virtual ~QOpenGLPaintDevice(); | ||
69 | |||
70 | int devType() const { return QInternal::OpenGL; } | ||
71 | QPaintEngine *paintEngine() const; | ||
72 | |||
73 | QOpenGLContext *context() const; | ||
74 | + QPoint offset() const; | ||
75 | QSize size() const; | ||
76 | void setSize(const QSize &size); | ||
77 | void setDevicePixelRatio(qreal devicePixelRatio); | ||
78 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | ||
79 | index 81a0d82..ce57261 100644 | ||
80 | --- a/src/gui/opengl/qopenglpaintengine.cpp | ||
81 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | ||
82 | @@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | ||
83 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) | ||
84 | d->vertexAttributeArraysEnabledState[i] = false; | ||
85 | |||
86 | + const QPoint offset = d->device->offset(); | ||
87 | const QSize sz = d->device->size(); | ||
88 | + d->x = offset.x(); | ||
89 | + d->y = offset.y(); | ||
90 | d->width = sz.width(); | ||
91 | d->height = sz.height(); | ||
92 | d->mode = BrushDrawingMode; | ||
93 | @@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | ||
94 | d->device->ensureActiveTarget(); | ||
95 | |||
96 | d->transferMode(BrushDrawingMode); | ||
97 | - d->funcs.glViewport(0, 0, d->width, d->height); | ||
98 | + d->funcs.glViewport(d->x, d->y, d->width, d->height); | ||
99 | d->needsSync = false; | ||
100 | d->lastMaskTextureUsed = 0; | ||
101 | d->shaderManager->setDirty(); | ||
102 | @@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | ||
103 | if (bounds == QRect(0, 0, width, height)) { | ||
104 | funcs.glDisable(GL_SCISSOR_TEST); | ||
105 | } else { | ||
106 | + bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height()); | ||
107 | funcs.glEnable(GL_SCISSOR_TEST); | ||
108 | setScissor(bounds); | ||
109 | } | ||
110 | @@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | ||
111 | |||
112 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | ||
113 | { | ||
114 | - const int left = rect.left(); | ||
115 | + const int left = rect.left() + x; | ||
116 | const int width = rect.width(); | ||
117 | int bottom = height - (rect.top() + rect.height()); | ||
118 | if (device->paintFlipped()) { | ||
119 | bottom = rect.top(); | ||
120 | } | ||
121 | + bottom += y; | ||
122 | const int height = rect.height(); | ||
123 | |||
124 | funcs.glScissor(left, bottom, width, height); | ||
125 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h | ||
126 | index 4f0e2e5..f211de1 100644 | ||
127 | --- a/src/gui/opengl/qopenglpaintengine_p.h | ||
128 | +++ b/src/gui/opengl/qopenglpaintengine_p.h | ||
129 | @@ -264,6 +264,7 @@ public: | ||
130 | QOpenGL2PaintEngineEx* q; | ||
131 | QOpenGLEngineShaderManager* shaderManager; | ||
132 | QOpenGLPaintDevice* device; | ||
133 | + int x, y; | ||
134 | int width, height; | ||
135 | QOpenGLContext *ctx; | ||
136 | EngineMode mode; | ||
137 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp | ||
138 | index ac88d9d..6c77f10 100644 | ||
139 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp | ||
140 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp | ||
141 | @@ -315,7 +315,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) | ||
142 | funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); | ||
143 | |||
144 | if (pex != 0) { | ||
145 | - funcs->glViewport(0, 0, pex->width, pex->height); | ||
146 | + funcs->glViewport(pex->x, pex->y, pex->width, pex->height); | ||
147 | pex->updateClipScissorTest(); | ||
148 | } else { | ||
149 | if (m_vao.isCreated()) { | ||
150 | -- | ||
151 | 2.0.0 | ||
152 | |||
diff --git a/recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index b807862c..00000000 --- a/recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 9a83bdba584d2a816c4f54fbc903f9f8f9fc0a2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Krelin <hacker@klever.net> | ||
3 | Date: Mon, 29 Oct 2012 20:07:49 -0700 | ||
4 | Subject: [PATCH 16/17] qmake is already built in qtbase-native | ||
5 | |||
6 | Ported from OE by: Yu Ke <ke.yu@intel.com> | ||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure b/configure | ||
16 | index 53eb65d..b61c82b 100755 | ||
17 | --- a/configure | ||
18 | +++ b/configure | ||
19 | @@ -3680,7 +3680,7 @@ setBootstrapEvalVariable() | ||
20 | |||
21 | |||
22 | # build qmake | ||
23 | -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
24 | +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; | ||
25 | echo "Creating qmake..." | ||
26 | |||
27 | mkdir -p "$outpath/qmake" || exit | ||
28 | -- | ||
29 | 2.0.0 | ||
30 | |||
diff --git a/recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index a6fcfe52..00000000 --- a/recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From a850a288fb526e6a4003616aa11dd992688ccc89 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Mon, 29 Oct 2012 20:26:36 -0700 | ||
4 | Subject: [PATCH 17/17] Allow building a separate qmake for the target | ||
5 | |||
6 | Upstream-Status: Inappropriate [config] | ||
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
9 | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> | ||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | qmake/qmake.pro | 2 ++ | ||
13 | 1 file changed, 2 insertions(+) | ||
14 | |||
15 | diff --git a/qmake/qmake.pro b/qmake/qmake.pro | ||
16 | index 89d6ea5..7c605b9 100644 | ||
17 | --- a/qmake/qmake.pro | ||
18 | +++ b/qmake/qmake.pro | ||
19 | @@ -8,6 +8,8 @@ CONFIG -= qt | ||
20 | DEFINES += \ | ||
21 | QT_BUILD_QMAKE \ | ||
22 | PROEVALUATOR_FULL | ||
23 | +DESTDIR = ../bin/ | ||
24 | +TARGET = qmake | ||
25 | |||
26 | VPATH += \ | ||
27 | ../src/corelib/global \ | ||
28 | -- | ||
29 | 2.0.0 | ||
30 | |||