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/nativesdk-qtbase_git.bb | |
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/nativesdk-qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6f334c12..e1b30c9a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -27,20 +27,18 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | |||
27 | # common for qtbase-native, qtbase-nativesdk and qtbase | 27 | # common for qtbase-native, qtbase-nativesdk and qtbase |
28 | SRC_URI += "\ | 28 | SRC_URI += "\ |
29 | file://0001-Add-linux-oe-g-platform.patch \ | 29 | file://0001-Add-linux-oe-g-platform.patch \ |
30 | file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ | 30 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
31 | file://0003-Add-external-hostbindir-option.patch \ | 31 | file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |
32 | file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ | 32 | file://0004-configure-bump-path-length-from-256-to-512-character.patch \ |
33 | file://0005-configure-bump-path-length-from-256-to-512-character.patch \ | 33 | file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \ |
34 | file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \ | 34 | file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ |
35 | file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ | 35 | file://0007-Delete-qlonglong-and-qulonglong.patch \ |
36 | file://0008-Delete-qlonglong-and-qulonglong.patch \ | 36 | file://0008-Replace-pthread_yield-with-sched_yield.patch \ |
37 | file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ | ||
38 | file://0010-Replace-pthread_yield-with-sched_yield.patch \ | ||
39 | " | 37 | " |
40 | 38 | ||
41 | # common for qtbase-native and nativesdk-qtbase | 39 | # common for qtbase-native and nativesdk-qtbase |
42 | SRC_URI += " \ | 40 | SRC_URI += " \ |
43 | file://0011-Always-build-uic.patch \ | 41 | file://0009-Always-build-uic.patch \ |
44 | " | 42 | " |
45 | 43 | ||
46 | # CMake's toolchain configuration of nativesdk-qtbase | 44 | # CMake's toolchain configuration of nativesdk-qtbase |
@@ -118,6 +116,7 @@ do_configure() { | |||
118 | -no-opengl \ | 116 | -no-opengl \ |
119 | -no-openssl \ | 117 | -no-openssl \ |
120 | -no-xcb \ | 118 | -no-xcb \ |
119 | -no-feature-bearermanagement \ | ||
121 | -no-icu \ | 120 | -no-icu \ |
122 | -verbose \ | 121 | -verbose \ |
123 | -release \ | 122 | -release \ |
@@ -137,7 +136,6 @@ do_configure() { | |||
137 | -testsdir ${OE_QMAKE_PATH_TESTS} \ | 136 | -testsdir ${OE_QMAKE_PATH_TESTS} \ |
138 | -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ | 137 | -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \ |
139 | -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ | 138 | -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ |
140 | -host-option CROSS_COMPILE=${HOST_PREFIX} \ | ||
141 | -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ | 139 | -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ |
142 | -no-glib \ | 140 | -no-glib \ |
143 | -no-iconv \ | 141 | -no-iconv \ |
@@ -195,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | 193 | ||
196 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
197 | 195 | ||
198 | SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980" | 196 | SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" |