diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | |
parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) | |
download | meta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch new file mode 100644 index 00000000..5ab6a7b1 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | ||
4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters | ||
5 | |||
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. | ||
8 | |||
9 | Also update length of EXT_PREFIX and HOST_PREFIX now. | ||
10 | |||
11 | Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118 | ||
12 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
13 | --- | ||
14 | configure.pri | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/configure.pri b/configure.pri | ||
18 | index be1b166080..52f03bf3f2 100644 | ||
19 | --- a/configure.pri | ||
20 | +++ b/configure.pri | ||
21 | @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { | ||
22 | "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ | ||
23 | "" \ | ||
24 | "/* Installation Info */" \ | ||
25 | - "static const char qt_configure_prefix_path_str [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \ | ||
26 | + "static const char qt_configure_prefix_path_str [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \ | ||
27 | "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \ | ||
28 | - "static const char qt_configure_ext_prefix_path_str [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \ | ||
29 | - "static const char qt_configure_host_prefix_path_str [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \ | ||
30 | + "static const char qt_configure_ext_prefix_path_str [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \ | ||
31 | + "static const char qt_configure_host_prefix_path_str [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \ | ||
32 | "$${LITERAL_HASH}endif" \ | ||
33 | "" \ | ||
34 | "static const short qt_configure_str_offsets[] = {" \ | ||