summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-11-02 19:06:14 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-01-12 15:01:37 +0100
commitc908fe4ebd5a04813be0b83c173fae182bb22728 (patch)
treeac8f089c2dce89598cf96532eac24cfb33567e4b /recipes-qt/qt5
parent775d77e482f1ea203c78003cccd2547075fd720f (diff)
downloadmeta-qt5-c908fe4ebd5a04813be0b83c173fae182bb22728.tar.gz
qt5: upgrade to 5.2.0
* drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase.inc34
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/nativesdk-qttools_5.1.1.bb7
-rw-r--r--recipes-qt/qt5/nativesdk-qttools_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qt3d_git.bb8
-rw-r--r--recipes-qt/qt5/qt5-5.2.0.inc (renamed from recipes-qt/qt5/qt5-5.1.1.inc)2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qt5.inc1
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch304
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch40
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch36
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch219
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch51
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch70
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch62
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch82
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch44
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch47
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch35
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch48
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch154
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch34
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch36
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch47
-rw-r--r--recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch74
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch40
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch51
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch30
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch29
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch70
-rw-r--r--recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch62
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch82
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch37
-rw-r--r--recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch47
-rw-r--r--recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch34
-rw-r--r--recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch36
-rw-r--r--recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch35
-rw-r--r--recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch84
-rw-r--r--recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch41
-rw-r--r--recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch47
-rw-r--r--recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch74
-rw-r--r--recipes-qt/qt5/qtbase-native.inc28
-rw-r--r--recipes-qt/qt5/qtbase-native_5.2.0.bb (renamed from recipes-qt/qt5/qtbase-native_5.1.1.bb)4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb23
-rw-r--r--recipes-qt/qt5/qtbase.inc35
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch (renamed from recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch)22
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (renamed from recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch (renamed from recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch)105
-rw-r--r--recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch117
-rw-r--r--recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch (renamed from recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch)15
-rw-r--r--recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch49
-rw-r--r--recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch)11
-rw-r--r--recipes-qt/qt5/qtbase/0010-Always-build-uic.patch38
-rw-r--r--recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch)25
-rw-r--r--recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch)11
-rw-r--r--recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch (renamed from recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch)16
-rw-r--r--recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch (renamed from recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch (renamed from recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch)22
-rw-r--r--recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch (renamed from recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch)6
-rw-r--r--recipes-qt/qt5/qtbase_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtbase_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtbase_git.bb4
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch41
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch46
-rw-r--r--recipes-qt/qt5/qtdeclarative.inc7
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch (renamed from recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch)0
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch (renamed from recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch)0
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.1.1.bb15
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb7
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtimageformats_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch32
-rw-r--r--recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch31
-rw-r--r--recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch32
-rw-r--r--recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch31
-rw-r--r--recipes-qt/qt5/qtjsbackend-native.inc24
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_git.bb4
-rw-r--r--recipes-qt/qt5/qtjsbackend.inc14
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtjsbackend_git.bb4
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb8
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtquick1_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_5.1.1.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_5.2.0.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtscript_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtsensors_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport.inc6
-rw-r--r--recipes-qt/qt5/qtserialport_5.1.1.bb10
-rw-r--r--recipes-qt/qt5/qtserialport_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb4
-rw-r--r--recipes-qt/qt5/qtsvg_5.1.1.bb6
-rw-r--r--recipes-qt/qt5/qtsvg_5.2.0.bb6
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb9
-rw-r--r--recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch138
-rw-r--r--recipes-qt/qt5/qttools-native_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qttools-native_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qttools-native_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch (renamed from recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch)16
-rw-r--r--recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch46
-rw-r--r--recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch33
-rw-r--r--recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch71
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb7
-rw-r--r--recipes-qt/qt5/qtwayland.inc11
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch (renamed from recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch)0
-rw-r--r--recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch30
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb9
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit.inc3
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch443
-rw-r--r--recipes-qt/qt5/qtwebkit_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtx11extras_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.1.1.bb5
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.2.0.bb5
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
147 files changed, 1034 insertions, 3300 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 8e9a8097..c4ef6e80 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -7,32 +7,28 @@ QT_MODULE = "qtbase"
7 7
8require nativesdk-qt5.inc 8require nativesdk-qt5.inc
9 9
10# shared with target version 10# common with -native and target version
11SRC_URI += " \ 11SRC_URI += "\
12 file://0001-Add-linux-oe-g-platform.patch \ 12 file://0001-Add-linux-oe-g-platform.patch \
13 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 13 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
14 file://0003-Add-external-hostbindir-option.patch \ 14 file://0003-Add-external-hostbindir-option.patch \
15 file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ 15 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
16 file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ 16 file://0005-qt_module-Fix-pkgconfig-replacement.patch \
17 file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ 17 file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
18 file://0008-qt_module-Fix-pkgconfig-replacement.patch \ 18 file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
19 file://0009-qt_module-Fix-paths-in-.prl-files.patch \ 19 file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
20 file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ 20 file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
21 file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ 21"
22 file://0013-Disable-mkv8snapshot.patch \ 22
23 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ 23# common with -native
24 file://0015-qtbase-allow-build-of-examples.patch \ 24SRC_URI += " \
25 file://0021-configure-make-pulseaudio-a-configurable-option.patch \ 25 file://0010-Always-build-uic.patch \
26 file://0022-configure-make-alsa-a-configurable-option.patch \
27 file://0023-configure-make-freetype-a-configurable-option.patch \
28 file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
29" 26"
30 27
31# specific for nativesdk version 28# specific for nativesdk version
32SRC_URI += " \ 29SRC_URI += " \
33 file://0001-Always-build-uic.patch \ 30 file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \
34 file://0001-configure-preserve-built-qmake-and-swap-with-native-.patch \ 31 file://0012-configure-bump-path-length-from-256-to-512-character.patch \
35 file://0001-configure-bump-path-length-from-256-to-512-character.patch \
36" 32"
37 33
38PACKAGES = "${PN}-tools-dbg ${PN}-tools" 34PACKAGES = "${PN}-tools-dbg ${PN}-tools"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb
deleted file mode 100644
index 8fd161a8..00000000
--- a/recipes-qt/qt5/nativesdk-qtbase_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd"
5SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
new file mode 100644
index 00000000..aca8dea0
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
5SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb
deleted file mode 100644
index b56f430b..00000000
--- a/recipes-qt/qt5/nativesdk-qttools_5.1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools-${PV}:"
5
6SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781"
7SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6"
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
new file mode 100644
index 00000000..0effa1bf
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
5SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 4a816c96..7ca9bf85 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -1,16 +1,14 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# last tag before this SRCREV is 5.0.0-beta1
5PV = "4.999+5.0.0-beta1+git${SRCPV}"
6
7QT_MODULE_BRANCH = "master" 4QT_MODULE_BRANCH = "master"
8 5
9SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058" 6# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
7SRCREV = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9"
10 8
11do_configure_prepend() { 9do_configure_prepend() {
12 # Temporary hack to get qt3d build for Qt 5.1.0 10 # Temporary hack to get qt3d build for Qt 5.1.0
13 if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then 11 if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
14 echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf 12 echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf
15 fi 13 fi
16} 14}
diff --git a/recipes-qt/qt5/qt5-5.1.1.inc b/recipes-qt/qt5/qt5-5.2.0.inc
index 0de6539d..50e8a7a0 100644
--- a/recipes-qt/qt5/qt5-5.1.1.inc
+++ b/recipes-qt/qt5/qt5-5.2.0.inc
@@ -4,7 +4,7 @@
4QT_VERSION ?= "${PV}" 4QT_VERSION ?= "${PV}"
5 5
6# it's different for RC versions 6# it's different for RC versions
7QT_VERSION_DIR ?= "5.1" 7QT_VERSION_DIR ?= "5.2"
8 8
9SRC_URI += " \ 9SRC_URI += " \
10 http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ 10 http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 98770472..97a1c37d 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13PV = "5.1.0+git${SRCPV}" 13PV = "5.2.0+git${SRCPV}"
14 14
15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
16 16
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 426ed555..57ffe098 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -68,6 +68,7 @@ FILES_${PN}-qmlplugins = " \
68 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ 68 ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
69 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ 69 ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
70 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ 70 ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
71 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
71 ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ 72 ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
72 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ 73 ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
73 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ 74 ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch
deleted file mode 100644
index 87c26122..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0001-Add-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,304 +0,0 @@
1From b91e232e603df102a1d305aceb0dbedc6ce3e89c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/22] Add linux-oe-g++ platform
5
6* This qmake.conf unlike other platforms reads most variables from
7 shell environment, because it's easier for qt recipes to export
8 *FLAGS or CC specific for given recipe
9
10* configure: add getQEvalMakeConf and getXQEvalMakeConf
11 Allow expansion of $(...) references from qmake.conf to generate
12 qmake environment from shell environment as exported by qmake5_base
13
14* OE_QMAKE_CXX in order to allow compiler version check to succeed
15 which allows WebKit to be enabled.
16
17* Other variables in order to let config.tests to use our -platform
18 settings
19
20* Add setBootstrapEvalVariable to bootstrap qmake with our environment
21 too, this allows us to use -platform linux-oe-g++ also for native
22 recipe
23
24* disable gdb_dwarf_index
25 * qmake is trying to call native gdb and we don't depend on gdb-native
26 (or even provide gdb-native)
27 * fixes errors like this:
28 /bin/sh: gdb: command not found
29 /bin/sh: line 0: test: -gt: unary operator expected
30 which are not fatal, but still misleading in do_configure output
31
32Upstream-Status: Pending
33
34Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
35---
36 configure | 54 ++++++++++++++++---
37 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
38 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
39 3 files changed, 187 insertions(+), 7 deletions(-)
40 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42
43diff --git a/configure b/configure
44index 140c7b4..397d53f 100755
45--- a/configure
46+++ b/configure
47@@ -291,6 +291,16 @@ getQMakeConf()
48 getSingleQMakeVariable "$1" "$specvals"
49 }
50
51+# OE qmake.conf is reading some variables from shell env
52+# read them from qmake.conf, replace qmake () syntax with shell and eval
53+getQEvalMakeConf()
54+{
55+ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
56+ EVAL=`eval "echo ${VAL}"`
57+# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
58+ eval "echo ${VAL}"
59+}
60+
61 getXQMakeConf()
62 {
63 if [ -z "$xspecvals" ]; then
64@@ -300,6 +310,16 @@ getXQMakeConf()
65 getSingleQMakeVariable "$1" "$xspecvals"
66 }
67
68+# OE qmake.conf is reading some variables from shell env
69+# read them from qmake.conf, replace qmake () syntax with shell and eval
70+getXQEvalMakeConf()
71+{
72+ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
73+ EVAL=`eval "echo ${VAL}"`
74+# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
75+ eval "echo ${VAL}"
76+}
77+
78 compilerSupportsFlag()
79 {
80 cat >conftest.cpp <<EOF
81@@ -816,6 +836,18 @@ fi
82 # initalize variables
83 #-------------------------------------------------------------------------------
84
85+# 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"
87+for varname in $OE_VARIABLES; do
88+ qmakevarname="${varname}"
89+ cmd=`echo \
90+'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
91+ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
92+# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
93+fi'`
94+ eval "$cmd"
95+done
96+
97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
98 for varname in $SYSTEM_VARIABLES; do
99 qmakevarname="${varname}"
100@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
101 CFG_QGTKSTYLE=no
102 fi
103
104-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
105+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
106
107 TEST_COMPILER=$QMAKE_CONF_COMPILER
108
109@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
110 exit 1
111 fi
112 fi
113-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
114+TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
115
116 GCC_MACHINE_DUMP=
117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
118@@ -3959,6 +3991,14 @@ setBootstrapVariable()
119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
120 }
121
122+# OE qmake.conf is reading some variables from shell env
123+# read them from qmake.conf, replace qmake () syntax with shell and eval
124+setBootstrapEvalVariable()
125+{
126+ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
127+}
128+
129+
130 # build qmake
131 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
132 echo "Creating qmake..."
133@@ -3997,11 +4037,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
134 fi
135
136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
137- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
138- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
139- setBootstrapVariable QMAKE_CFLAGS
140- setBootstrapVariable QMAKE_CXXFLAGS
141- setBootstrapVariable QMAKE_LFLAGS
142+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
143+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
144+ setBootstrapEvalVariable QMAKE_CFLAGS
145+ setBootstrapEvalVariable QMAKE_CXXFLAGS
146+ setBootstrapEvalVariable QMAKE_LFLAGS
147
148 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
149 setBootstrapVariable QMAKE_CFLAGS_RELEASE
150diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
151new file mode 100644
152index 0000000..ca26b10
153--- /dev/null
154+++ b/mkspecs/linux-oe-g++/qmake.conf
155@@ -0,0 +1,40 @@
156+#
157+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
158+#
159+
160+MAKEFILE_GENERATOR = UNIX
161+CONFIG += incremental
162+QMAKE_INCREMENTAL_STYLE = sublib
163+
164+include(../common/linux.conf)
165+
166+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
167+QMAKE_AR = $(OE_QMAKE_AR) cqs
168+QMAKE_STRIP = $(OE_QMAKE_STRIP)
169+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
170+
171+include(../common/gcc-base-unix.conf)
172+
173+# *FLAGS from gcc-base.conf
174+QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
175+QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
176+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
177+
178+include(../common/g++-unix.conf)
179+
180+# tc settings from g++-base.conf
181+QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
182+QMAKE_CC = $(OE_QMAKE_CC)
183+QMAKE_CXX = $(OE_QMAKE_CXX)
184+
185+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
186+
187+QMAKE_LINK = $(OE_QMAKE_LINK)
188+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
189+QMAKE_LINK_C = $(OE_QMAKE_LINK)
190+QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
191+
192+# for the SDK
193+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
194+
195+load(qt_config)
196diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
197new file mode 100644
198index 0000000..dd12003
199--- /dev/null
200+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
201@@ -0,0 +1,100 @@
202+/****************************************************************************
203+**
204+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
205+** Contact: http://www.qt-project.org/legal
206+**
207+** This file is part of the qmake spec of the Qt Toolkit.
208+**
209+** $QT_BEGIN_LICENSE:LGPL$
210+** Commercial License Usage
211+** Licensees holding valid commercial Qt licenses may use this file in
212+** accordance with the commercial license agreement provided with the
213+** Software or, alternatively, in accordance with the terms contained in
214+** a written agreement between you and Digia. For licensing terms and
215+** conditions see http://qt.digia.com/licensing. For further information
216+** use the contact form at http://qt.digia.com/contact-us.
217+**
218+** GNU Lesser General Public License Usage
219+** Alternatively, this file may be used under the terms of the GNU Lesser
220+** General Public License version 2.1 as published by the Free Software
221+** Foundation and appearing in the file LICENSE.LGPL included in the
222+** packaging of this file. Please review the following information to
223+** ensure the GNU Lesser General Public License version 2.1 requirements
224+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
225+**
226+** In addition, as a special exception, Digia gives you certain additional
227+** rights. These rights are described in the Digia Qt LGPL Exception
228+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
229+**
230+** GNU General Public License Usage
231+** Alternatively, this file may be used under the terms of the GNU
232+** General Public License version 3.0 as published by the Free Software
233+** Foundation and appearing in the file LICENSE.GPL included in the
234+** packaging of this file. Please review the following information to
235+** ensure the GNU General Public License version 3.0 requirements will be
236+** met: http://www.gnu.org/copyleft/gpl.html.
237+**
238+**
239+** $QT_END_LICENSE$
240+**
241+****************************************************************************/
242+
243+#ifndef QPLATFORMDEFS_H
244+#define QPLATFORMDEFS_H
245+
246+// Get Qt defines/settings
247+
248+#include "qglobal.h"
249+
250+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
251+
252+// 1) need to reset default environment if _BSD_SOURCE is defined
253+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
254+// 3) it seems older glibc need this to include the X/Open stuff
255+#ifndef _GNU_SOURCE
256+# define _GNU_SOURCE
257+#endif
258+
259+#include <unistd.h>
260+
261+
262+// We are hot - unistd.h should have turned on the specific APIs we requested
263+
264+#include <features.h>
265+#include <pthread.h>
266+#include <dirent.h>
267+#include <fcntl.h>
268+#include <grp.h>
269+#include <pwd.h>
270+#include <signal.h>
271+
272+#include <sys/types.h>
273+#include <sys/ioctl.h>
274+#include <sys/ipc.h>
275+#include <sys/time.h>
276+#include <sys/shm.h>
277+#include <sys/socket.h>
278+#include <sys/stat.h>
279+#include <sys/wait.h>
280+#include <netinet/in.h>
281+#ifndef QT_NO_IPV6IFNAME
282+#include <net/if.h>
283+#endif
284+
285+#define QT_USE_XOPEN_LFS_EXTENSIONS
286+#include "../common/posix/qplatformdefs.h"
287+
288+#undef QT_SOCKLEN_T
289+
290+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
291+#define QT_SOCKLEN_T socklen_t
292+#else
293+#define QT_SOCKLEN_T int
294+#endif
295+
296+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
297+#define QT_SNPRINTF ::snprintf
298+#define QT_VSNPRINTF ::vsnprintf
299+#endif
300+
301+#endif // QPLATFORMDEFS_H
302--
3031.8.3.1
304
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch
deleted file mode 100644
index 96c85f05..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From f794542b10ccbf9c4cecaf23cf24658d64594cf3 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH 22/22] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b4c9602..f30ec1f 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
22 src_plugins.depends += src_gui src_platformsupport
23 !contains(QT_CONFIG, no-widgets) {
24- SUBDIRS += src_tools_uic src_widgets
25+ SUBDIRS += src_widgets
26 src_plugins.depends += src_widgets
27 contains(QT_CONFIG, opengl(es1|es2)?) {
28 SUBDIRS += src_opengl
29@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
30 }
31 }
32 }
33-SUBDIRS += src_plugins src_tools_qdoc
34+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
35
36 nacl: SUBDIRS -= src_network src_testlib
37
38--
391.8.3.1
40
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
deleted file mode 100644
index fab58802..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From a899fba459928c7e5196f15dcea4d561807dc825 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/22] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment
6
7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using
9the same qmake binary to build qt/x11 and qt/embedded
10
11Upstream-Status: Pending
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/corelib/global/qlibraryinfo.cpp | 5 ++++-
16 1 file changed, 4 insertions(+), 1 deletion(-)
17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 53a3ebb..8ca2102 100644
20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings()
23
24 QSettings *QLibraryInfoPrivate::findConfiguration()
25 {
26- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
27+ QByteArray config = getenv("QT_CONF_PATH");
28+ QString qtconfig = QFile::decodeName(config);
29+ if(!QFile::exists(qtconfig))
30+ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
31 #ifdef QT_BOOTSTRAPPED
32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile();
34--
351.8.3.1
36
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch
deleted file mode 100644
index b4bf10f6..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0003-Add-external-hostbindir-option.patch
+++ /dev/null
@@ -1,219 +0,0 @@
1From 062621e0310eddb448ebcc27fc4c1507c2d6e30d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/22] Add -external-hostbindir option
5
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
8
9* this way we can skip bootstraping tools we already have
10
11Upstream-Status: Pending
12
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 configure | 16 +++++++++++++++-
16 mkspecs/features/qt_functions.prf | 5 ++++-
17 mkspecs/features/qt_tool.prf | 2 +-
18 qmake/property.cpp | 1 +
19 qtbase.pro | 12 +++++++++---
20 src/corelib/global/qlibraryinfo.cpp | 3 ++-
21 src/corelib/global/qlibraryinfo.h | 1 +
22 tools/configure/configureapp.cpp | 8 ++++++++
23 8 files changed, 41 insertions(+), 7 deletions(-)
24
25diff --git a/configure b/configure
26index 397d53f..80bdd7a 100755
27--- a/configure
28+++ b/configure
29@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX=
30 QT_HOST_BINS=
31 QT_HOST_LIBS=
32 QT_HOST_DATA=
33+QT_EXTERNAL_HOST_BINS=
34
35 #flags for SQL drivers
36 QT_CFLAGS_PSQL=
37@@ -1191,7 +1192,8 @@ while [ "$#" -gt 0 ]; do
38 -android-ndk-platform| \
39 -android-ndk-host| \
40 -android-arch| \
41- -android-toolchain-version)
42+ -android-toolchain-version| \
43+ -external-hostbindir)
44 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
45 shift
46 VAL="$1"
47@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do
48 hostlibdir)
49 QT_HOST_LIBS="$VAL"
50 ;;
51+ external-hostbindir)
52+ QT_EXTERNAL_HOST_BINS="$VAL"
53+ ;;
54 pkg-config)
55 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
56 CFG_PKGCONFIG="$VAL"
57@@ -3240,6 +3245,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
58 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
59 fi
60
61+# default is empty, don't call makeabs if it is empty
62+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
63+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
64+fi
65+
66 #-------------------------------------------------------------------------------
67 # help - interactive parts of the script _after_ this section please
68 #-------------------------------------------------------------------------------
69@@ -3408,6 +3418,9 @@ Installation options:
70 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
71 (default HOSTPREFIX)
72
73+ -external-hostbindir <dir> Use external host executables instead of building them
74+ (not used by defaut)
75+
76 Configure options:
77
78 The defaults (*) are usually acceptable. A plus (+) denotes a default value
79@@ -3923,6 +3936,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
80 "qt_hbinpath=$QT_HOST_BINS",
81 "qt_hlibpath=$QT_HOST_LIBS",
82 "qt_hdatpath=$QT_HOST_DATA",
83+ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
84 "qt_targspec=$shortxspec",
85 "qt_hostspec=$shortspec",
86 #endif
87diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
88index 2f2c94c..4e12d3d 100644
89--- a/mkspecs/features/qt_functions.prf
90+++ b/mkspecs/features/qt_functions.prf
91@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) {
92 defineTest(qtPrepareTool) {
93 $$1 = $$eval(QT_TOOL.$${2}.binary)
94 isEmpty($$1) {
95- $$1 = $$[QT_HOST_BINS]/$$2
96+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
97+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
98+ $$1 = $$[QT_HOST_BINS]/$$2
99+ }
100 exists($$eval($$1).pl) {
101 $$1 = perl -w $$eval($$1).pl
102 } else: contains(QMAKE_HOST.os, Windows) {
103diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
104index 9a6b963..83ef3a0 100644
105--- a/mkspecs/features/qt_tool.prf
106+++ b/mkspecs/features/qt_tool.prf
107@@ -16,7 +16,7 @@ CONFIG += console
108 # If we are doing a prefix build, create a "module" pri which enables
109 # qtPrepareTool() to work with the non-installed build.
110 # Non-bootstrapped tools always need this because of the environment setup.
111-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
112+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
113 isEmpty(MODULE):MODULE = $$TARGET
114
115 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
116diff --git a/qmake/property.cpp b/qmake/property.cpp
117index 4685440..93eb1d4 100644
118--- a/qmake/property.cpp
119+++ b/qmake/property.cpp
120@@ -75,6 +75,7 @@ static const struct {
121 { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
122 { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
123 { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
124+ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
125 { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
126 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
127 };
128diff --git a/qtbase.pro b/qtbase.pro
129index d6726b5..28ca7d5 100644
130--- a/qtbase.pro
131+++ b/qtbase.pro
132@@ -70,16 +70,22 @@ CONFIG -= qt
133
134 #qmake
135 qmake.path = $$[QT_HOST_BINS]
136+qmake.files = $$OUT_PWD/bin/qmake
137+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
138+ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
139+}
140 equals(QMAKE_HOST.os, Windows) {
141- qmake.files = $$OUT_PWD/bin/qmake.exe
142-} else {
143- qmake.files = $$OUT_PWD/bin/qmake
144+ qmake.files = $${qmake.files}.exe
145 }
146 INSTALLS += qmake
147
148 #syncqt
149 syncqt.path = $$[QT_HOST_BINS]
150 syncqt.files = $$PWD/bin/syncqt.pl
151+syncqt.files = $$PWD/bin/syncqt.pl
152+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
153+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
154+}
155 INSTALLS += syncqt
156
157 # If we are doing a prefix build, create a "module" pri which enables
158diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
159index 8ca2102..9f5d444 100644
160--- a/src/corelib/global/qlibraryinfo.cpp
161+++ b/src/corelib/global/qlibraryinfo.cpp
162@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
163 */
164
165 static const struct {
166- char key[19], value[13];
167+ char key[21], value[13];
168 } qtConfEntries[] = {
169 { "Prefix", "." },
170 { "Documentation", "doc" }, // should be ${Data}/doc
171@@ -296,6 +296,7 @@ static const struct {
172 { "HostBinaries", "bin" },
173 { "HostLibraries", "lib" },
174 { "HostData", "." },
175+ { "ExternalHostBinaries", "" },
176 { "TargetSpec", "" },
177 { "HostSpec", "" },
178 #endif
179diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
180index b275e01..0e6baed 100644
181--- a/src/corelib/global/qlibraryinfo.h
182+++ b/src/corelib/global/qlibraryinfo.h
183@@ -84,6 +84,7 @@ public:
184 HostBinariesPath,
185 HostLibrariesPath,
186 HostDataPath,
187+ ExternalHostBinariesPath,
188 TargetSpecPath,
189 HostSpecPath,
190 LastHostPath = HostSpecPath,
191diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
192index a6376bb..aed85ce 100644
193--- a/tools/configure/configureapp.cpp
194+++ b/tools/configure/configureapp.cpp
195@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine()
196 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
197 }
198
199+ else if (configCmdLine.at(i) == "-external-hostbindir") {
200+ ++i;
201+ if (i == argCount)
202+ break;
203+ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
204+ }
205+
206 else if (configCmdLine.at(i) == "-make-tool") {
207 ++i;
208 if (i == argCount)
209@@ -3708,6 +3715,7 @@ void Configure::generateQConfigCpp()
210 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
211 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
212 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
213+ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
214 << " \"qt_targspec=" << targSpec << "\"," << endl
215 << " \"qt_hostspec=" << hostSpec << "\"," << endl
216 << "#endif" << endl
217--
2181.8.3.1
219
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch
deleted file mode 100644
index 955d791c..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 21c573762a168f874f32c8bf49f75442e608e08a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/22] qt_functions: temporary remove isEmpty check
5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7* isEmpty works correctly only with qmake variables (e.g. $$FOO -
8 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 mkspecs/features/qt_functions.prf | 6 +++++-
15 mkspecs/features/qt_tool.prf | 3 +--
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index 4e12d3d..e20ad9d 100644
20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf
22@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.binary)
24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
27+ # for some reason isEmpty does not work here, FIXME before submitting upstream
28+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
29+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
30+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2
33 }
34 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index 83ef3a0..21c9eb7 100644
37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console
40
41 # If we are doing a prefix build, create a "module" pri which enables
42 # qtPrepareTool() to work with the non-installed build.
43-# Non-bootstrapped tools always need this because of the environment setup.
44-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET
47
48 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49--
501.8.3.1
51
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index 00affb12..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From c2cc1f9251953f680191c5cf53b019d5d480c79e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 07/22] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index aed85ce..0575520 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3111,8 +3111,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27--
281.8.3.1
29
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch
deleted file mode 100644
index dfc018f2..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 0089c1ecba912aed6a8cd6126297300e0f7ffcb9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 08/22] qt_module: Fix pkgconfig replacement
5
6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
8 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
9 QT_INSTALL_LIBS/raw:/usr/lib
10 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
11
12 I don't want the replacement like this:
13 sed
14 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
15 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
16 "../../lib/pkgconfig/Qt5Core.pc"
17 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
18 because that way I'll end with -L/usr/lib in .pc file which is
19 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
20 in my case
21
22Upstream-Status: Pending
23
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
27 1 file changed, 16 insertions(+), 4 deletions(-)
28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 390fb49..e85c2a8 100644
31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf
33@@ -140,18 +140,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \
36 rplbase = $$MODULE_BASE_OUTDIR
37+ pkgconfig_include_replace.match = $$rplbase/include
38+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
39+ pkgconfig_lib_replace.match = $$rplbase/lib
40+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
41 include_replace.match = $$rplbase/include
42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43 lib_replace.match = $$rplbase/lib
44- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
47+ lafile_replace.match = $$rplbase
48+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
49+
50+ !isEmpty(SYSROOT): \
51+ rplbase = $$[SYSROOT] \
52+ lafile_replace.match = $$rplbase \
53+ lafile_replace.replace = "=" \
54+
55+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
56 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
57 }
58
59 unix {
60 CONFIG += create_libtool explicitlib
61- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
62- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
63+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
64+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
65 }
66
67 unix|win32-g++* {
68--
691.8.3.1
70
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch
deleted file mode 100644
index 5c8f8189..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0009-qt_module-Fix-paths-in-.prl-files.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From d4f6f5afa36d87d991051f0079f129d2682455d9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 12:56:55 +0200
4Subject: [PATCH 09/22] qt_module: Fix paths in .prl files
5
6* qmake does not prefix them with QT_SYSROOT when using them
7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
8 variable, which is unsafe for cross-compilation
9* writting QT_SYSROOT in .prl files is dangerous for sstate when
10 builds are in different directories, so we need
11 SSTATE_SCAN_FILES += "*.pri *.prl"
12 to make them relocateble
13
14Upstream-Status: Pending
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
19 1 file changed, 17 insertions(+), 11 deletions(-)
20
21diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
22index e85c2a8..7fcfcfe 100644
23--- a/mkspecs/features/qt_module.prf
24+++ b/mkspecs/features/qt_module.prf
25@@ -144,17 +144,23 @@ unix|win32-g++* {
26 pkgconfig_include_replace.replace = "\$$\\{includedir}"
27 pkgconfig_lib_replace.match = $$rplbase/lib
28 pkgconfig_lib_replace.replace = "\$$\\{libdir}"
29- include_replace.match = $$rplbase/include
30- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
31- lib_replace.match = $$rplbase/lib
32- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
33- lafile_replace.match = $$rplbase
34- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
35-
36- !isEmpty(SYSROOT): \
37- rplbase = $$[SYSROOT] \
38- lafile_replace.match = $$rplbase \
39- lafile_replace.replace = "=" \
40+ !exists($$[QT_SYSROOT]) {
41+ include_replace.match = $$rplbase/include
42+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43+ lib_replace.match = $$rplbase/lib
44+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
45+ lafile_replace.match = $$rplbase
46+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
47+ } else {
48+ # include_replace and lib_replace are duplicate, but we don't want to
49+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
50+ include_replace.match = $$rplbase
51+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
52+ lib_replace.match = $$rplbase
53+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
54+ lafile_replace.match = $$rplbase
55+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
56+ }
57
58 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
60--
611.8.3.1
62
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch
deleted file mode 100644
index a91c9edf..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0010-wayland-scanner-disable-silent-rules.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From 9a2219a25247b76de6524d358211b55467305d11 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 10/22] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 mkspecs/features/wayland-scanner.prf | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
16index b2eca41..46da374 100644
17--- a/mkspecs/features/wayland-scanner.prf
18+++ b/mkspecs/features/wayland-scanner.prf
19@@ -10,7 +10,7 @@ wayland_server_header.input = WAYLANDSERVERSOURCES
20 wayland_server_header.variable_out = HEADERS
21 wayland_server_header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
22 wayland_server_header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
23-silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
24+#silent:wayland_server_header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland_server_header.commands
25 QMAKE_EXTRA_COMPILERS += wayland_server_header
26
27 wayland_client_header.name = wayland ${QMAKE_FILE_BASE}
28@@ -18,7 +18,7 @@ wayland_client_header.input = WAYLANDCLIENTSOURCES
29 wayland_client_header.variable_out = HEADERS
30 wayland_client_header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
31 wayland_client_header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
32-silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
33+#silent:wayland_client_header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland_client_header.commands
34 QMAKE_EXTRA_COMPILERS += wayland_client_header
35
36 wayland_code.name = wayland ${QMAKE_FILE_BASE}
37@@ -26,7 +26,7 @@ wayland_code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
38 wayland_code.variable_out = SOURCES
39 wayland_code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
40 wayland_code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
41-silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands
42+#silent:wayland_code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland_code.commands
43 QMAKE_EXTRA_COMPILERS += wayland_code
44
45 qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
46@@ -37,7 +37,7 @@ qtwayland_client_header.variable_out = HEADERS
47 qtwayland_client_header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
48 qtwayland_client_header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
49 qtwayland_client_header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
50-silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
51+#silent:qtwayland_client_header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland_client_header.commands
52 QMAKE_EXTRA_COMPILERS += qtwayland_client_header
53
54 qtwayland_client_code.name = qtwayland ${QMAKE_FILE_BASE}
55@@ -46,7 +46,7 @@ qtwayland_client_code.variable_out = SOURCES
56 qtwayland_client_code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
57 qtwayland_client_code.output = qwayland-${QMAKE_FILE_BASE}.cpp
58 qtwayland_client_code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
59-silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
60+#silent:qtwayland_client_code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland_client_code.commands
61 QMAKE_EXTRA_COMPILERS += qtwayland_client_code
62
63 qtwayland_server_header.name = qtwayland ${QMAKE_FILE_BASE}
64@@ -55,7 +55,7 @@ qtwayland_server_header.variable_out = HEADERS
65 qtwayland_server_header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
66 qtwayland_server_header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
67 qtwayland_server_header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
68-silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
69+#silent:qtwayland_server_header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland_server_header.commands
70 QMAKE_EXTRA_COMPILERS += qtwayland_server_header
71
72 qtwayland_server_code.name = qtwayland ${QMAKE_FILE_BASE}
73@@ -64,5 +64,5 @@ qtwayland_server_code.variable_out = SOURCES
74 qtwayland_server_code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
75 qtwayland_server_code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
76 qtwayland_server_code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
77-silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
78+#silent:qtwayland_server_code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland_server_code.commands
79 QMAKE_EXTRA_COMPILERS += qtwayland_server_code
80--
811.8.3.1
82
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
deleted file mode 100644
index bea83a89..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 05fc8b21f40d2e6bc35fa717ea340ef26f922d32 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 8 May 2013 23:54:35 +0200
4Subject: [PATCH 11/22] 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
9Upstream-Status: Pending
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 15 +--------------
14 1 file changed, 1 insertion(+), 14 deletions(-)
15
16diff --git a/configure b/configure
17index 40f2b02..11c11c4 100755
18--- a/configure
19+++ b/configure
20@@ -849,20 +849,7 @@ 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+
39 # Use CC/CXX to run config.tests
40 mkdir -p "$outpath/config.tests"
41 rm -f "$outpath/config.tests/.qmake.cache"
42--
431.8.3.1
44
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
deleted file mode 100644
index 2c4fa20b..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0013-Disable-mkv8snapshot.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 70669010c6f8a541db6f87f96aee3ff50ec8483f Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 8 Jan 2013 15:58:29 -0800
4Subject: [PATCH 13/22] Disable mkv8snapshot
5
6It seems to generate code that throws SIGILL, so disabling it
7
8Program received signal SIGILL, Illegal instruction.
90x26312c60 in ?? ()
10(gdb) bt
11 function=..., receiver=..., argc=1978934572, args=0x7efff254,
12 has_pending_exception=0x7efff277, qml=...)
13 at ../3rdparty/v8/src/execution.cc:125
14 argc=1, argv=0x7efff254, pending_exception=0x7efff277,
15 convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
16 receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
17 pending_exception=0x7efff277, convert_receiver=false)
18 at ../3rdparty/v8/src/execution.cc:161
19 data=<optimized out>, exc=0x7efff277)
20 at ../3rdparty/v8/src/execution.cc:734
21 at ../3rdparty/v8/src/api.cc:4742
22 at qml/v8/qv8contextwrapper.cpp:155
23 ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
24 parent=<optimized out>) at qml/v8/qjsengine.cpp:192
25
26Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28---
29 configure | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/configure b/configure
33index 11c11c4..521e374 100755
34--- a/configure
35+++ b/configure
36@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
37 CFG_COMPILE_EXAMPLES=yes
38 CFG_RELEASE_QMAKE=no
39 CFG_AUDIO_BACKEND=auto
40-CFG_V8SNAPSHOT=auto
41+CFG_V8SNAPSHOT=no
42 CFG_QML_DEBUG=yes
43 CFG_JAVASCRIPTCORE_JIT=auto
44 CFG_PKGCONFIG=auto
45--
461.8.3.1
47
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch
deleted file mode 100644
index 56b4a663..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0014-enables-tslib-device-to-be-read-from-env-variable.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 3642ea2f7eff14c0835385f28a13514b806eba32 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Mon, 27 May 2013 18:32:37 +0200
4Subject: [PATCH 14/22] enables tslib device to be read from env variable
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9from :
10https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
11
12Signed-off-by: Eric Bénard <eric@eukrea.com>
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14---
15 src/plugins/generic/tslib/qtslib.cpp | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
19index 6986fd5..2ed4a69 100644
20--- a/src/plugins/generic/tslib/qtslib.cpp
21+++ b/src/plugins/generic/tslib/qtslib.cpp
22@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
23 qDebug() << "QTsLibMouseHandler" << key << specification;
24 setObjectName(QLatin1String("TSLib Mouse Handler"));
25
26- QByteArray device = "/dev/input/event1";
27+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
28+ if(device.isEmpty())
29+ device = "/dev/input/event1";
30 if (specification.startsWith("/dev/"))
31 device = specification.toLocal8Bit();
32
33--
341.8.3.1
35
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch
deleted file mode 100644
index 59c94669..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0015-qtbase-allow-build-of-examples.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 52172f09d646949c32f7b70188f1ffc779adbdef Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/22] qtbase: allow build of examples
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9this revert the following commit :
10
11commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Fri Dec 21 19:36:12 2012 +0100
14
15 do not actually build examples in production builds
16
17 -developer-build enables an actual build of examples, based on the
18 assumption that developers want to test it (it can be still disabled
19 with -nomake examples). regular users otoh want only the examples
20 sources installed.
21
22 Change-Id: Ifc6a108099929175a3960480802b271a758fdd38
23 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
24
25Signed-off-by: Eric Bénard <eric@eukrea.com>
26---
27 mkspecs/features/qt_example_installs.prf | 7 -------
28 1 file changed, 7 deletions(-)
29
30diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
31index 2db752c..ca1b0c7 100644
32--- a/mkspecs/features/qt_example_installs.prf
33+++ b/mkspecs/features/qt_example_installs.prf
34@@ -92,11 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
35 allfiles -= doc
36 !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
37 }
38-
39- !equals(TEMPLATE, subdirs):!compile_examples {
40- TEMPLATE = aux
41- CONFIG -= have_target qt staticlib dll
42- SOURCES =
43- INSTALLS -= target
44- }
45 }
46--
471.8.3.1
48
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch
deleted file mode 100644
index add3e25a..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0018-QOpenGLPaintDevice-sub-area-support.patch
+++ /dev/null
@@ -1,154 +0,0 @@
1From cc2bdb0bbbbeb4eb630d82b7274d13922eb06da2 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 16/22] QOpenGLPaintDevice sub-area support
5
6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer.
8
9Upstream-Status: Pending
10
11Change-Id: Ida2f079aa1ac0b87d36b54129e226399dbcdda80
12
13Signed-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 | 10 +++++++---
18 src/gui/opengl/qopenglpaintengine_p.h | 1 +
19 src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
20 5 files changed, 23 insertions(+), 4 deletions(-)
21
22diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
23index f0e7e49..fe9a30c 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
59diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
60index 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);
78diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
79index 78f5080..20db620 100644
80--- a/src/gui/opengl/qopenglpaintengine.cpp
81+++ b/src/gui/opengl/qopenglpaintengine.cpp
82@@ -2004,7 +2004,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@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
94 d->device->ensureActiveTarget();
95
96 d->transferMode(BrushDrawingMode);
97- glViewport(0, 0, d->width, d->height);
98+ glViewport(d->x, d->y, d->width, d->height);
99 d->needsSync = false;
100 d->lastMaskTextureUsed = 0;
101 d->shaderManager->setDirty();
102@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
103 if (bounds == QRect(0, 0, width, height)) {
104 glDisable(GL_SCISSOR_TEST);
105 } else {
106+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
107 glEnable(GL_SCISSOR_TEST);
108 setScissor(bounds);
109 }
110@@ -2143,14 +2147,14 @@ 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 glScissor(left, bottom, width, height);
125 }
126
127diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
128index d51f0e5..0d4b38d 100644
129--- a/src/gui/opengl/qopenglpaintengine_p.h
130+++ b/src/gui/opengl/qopenglpaintengine_p.h
131@@ -264,6 +264,7 @@ public:
132 QOpenGL2PaintEngineEx* q;
133 QOpenGLEngineShaderManager* shaderManager;
134 QOpenGLPaintDevice* device;
135+ int x, y;
136 int width, height;
137 QOpenGLContext *ctx;
138 EngineMode mode;
139diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
140index 7d49c03..d9eb3fe 100644
141--- a/src/gui/opengl/qopengltextureglyphcache.cpp
142+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
143@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
144 funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
145
146 if (pex != 0) {
147- glViewport(0, 0, pex->width, pex->height);
148+ glViewport(pex->x, pex->y, pex->width, pex->height);
149 pex->updateClipScissorTest();
150 } else {
151 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
152--
1531.8.3.1
154
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
deleted file mode 100644
index e17e5ac9..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0020-Use-BGRA-extension-in-bindTexture.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 5aaec8299901e0093cec2b704a724bc3254b8b8d Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Mon, 27 May 2013 15:25:25 -0700
4Subject: [PATCH 17/22] Use BGRA extension in bindTexture
5
6Upstream-Status: Pending
7
8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 src/gui/opengl/qopengltexturecache.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
16index 94b8288..5c8aa3c 100644
17--- a/src/gui/opengl/qopengltexturecache.cpp
18+++ b/src/gui/opengl/qopengltexturecache.cpp
19@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
20
21 QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
22
23- // Performance could be improved by skipping qgl_byteSwapImage().
24- if (m_useByteSwapImage)
25- qgl_byteSwapImage(tx);
26-
27- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
28+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
29
30 int cost = tx.width() * tx.height() * 4 / 1024;
31 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
32--
331.8.3.1
34
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch
deleted file mode 100644
index eaa3ae67..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0021-configure-make-pulseaudio-a-configurable-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 0bc48cdb5e3556a96320ea963d2e031b0810d0d4 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 18/22] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 7 +++++++
14 1 file changed, 7 insertions(+)
15
16diff --git a/configure b/configure
17index 521e374..896e012 100755
18--- a/configure
19+++ b/configure
20@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do
21 UNKNOWN_OPT=yes
22 fi
23 ;;
24+ pulseaudio)
25+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
26+ CFG_PULSEAUDIO="$VAL"
27+ else
28+ UNKNOWN_OPT=yes
29+ fi
30+ ;;
31 gtkstyle)
32 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
33 CFG_QGTKSTYLE="$VAL"
34--
351.8.3.1
36
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch
deleted file mode 100644
index c01f635b..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0022-configure-make-alsa-a-configurable-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From e6430c64e4dcc48ae59e48fa303bbea33b253011 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 19 Jul 2013 23:21:28 +0200
4Subject: [PATCH 19/22] configure: make alsa a configurable option
5
6Allows disabling alsa support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 896e012..3470b32 100755
17--- a/configure
18+++ b/configure
19@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ alsa)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
25+ CFG_ALSA="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.1
35
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch
deleted file mode 100644
index 9cec921f..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0023-configure-make-freetype-a-configurable-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 98201094967e2e4224c394d0c92c0be7d39582a6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 20 Jul 2013 10:56:37 +0200
4Subject: [PATCH 20/22] configure: make freetype a configurable option
5
6Allows disabling freetype support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 3470b32..b0ec977 100755
17--- a/configure
18+++ b/configure
19@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ freetype)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
25+ CFG_LIBFREETYPE="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.1
35
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
deleted file mode 100644
index 0d533059..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
2From: Andy Shaw <andy.shaw@digia.com>
3Date: Tue, 8 Oct 2013 15:45:42 +0200
4Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
5
6Task-number: QTBUG-31579
7
8Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
9Signed-off-by: Jonathan Liu <net147@gmail.com>
10
11Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
12Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
13---
14 src/gui/painting/qcosmeticstroker.cpp | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
18index 39f6422..a2301e3 100644
19--- a/src/gui/painting/qcosmeticstroker.cpp
20+++ b/src/gui/painting/qcosmeticstroker.cpp
21@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
22 ymax = deviceRect.bottom() + 2;
23
24 lastPixel.x = -1;
25+ lastPixel.y = -1;
26 }
27
28 // returns true if the whole line gets clipped away
29@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
30 QPointF p = QPointF(points[0], points[1]) * state->matrix;
31 patternOffset = state->lastPen.dashOffset()*64;
32 lastPixel.x = -1;
33+ lastPixel.y = -1;
34
35 bool closed;
36 const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
37@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
38 QPointF movedTo = p;
39 patternOffset = state->lastPen.dashOffset()*64;
40 lastPixel.x = -1;
41+ lastPixel.y = -1;
42
43 const qreal *begin = points;
44 const qreal *end = points + 2*path.elementCount();
45--
461.8.4
47
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch
deleted file mode 100644
index d5e082ea..00000000
--- a/recipes-qt/qt5/qtbase-5.1.1/0027-Fix-misaligned-selection-region-with-text-when-cente.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 23 Oct 2013 00:28:17 +1100
4Subject: [PATCH] Fix misaligned selection region with text when centered
5
6If the text is centered, the x/y position in the selection QRectF may
7be a multiple of 0.5 which is rounded up. This rounding causes
8misalignment of the selection region with the text.
9
10The alignment is fixed by using qFloor on the x and y components.
11
12Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
13Signed-off-by: Jonathan Liu <net147@gmail.com>
14
15Task-number: QTBUG-34218
16Task-number: QTBUG-34234
17Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
18Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
19---
20 src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
21 1 file changed, 14 insertions(+), 5 deletions(-)
22
23diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
24index 54d337e..66341e1 100644
25--- a/src/gui/text/qtextlayout.cpp
26+++ b/src/gui/text/qtextlayout.cpp
27@@ -44,6 +44,7 @@
28
29 #include <qthread.h>
30 #include <qfont.h>
31+#include <qmath.h>
32 #include <qpainter.h>
33 #include <qvarlengtharray.h>
34 #include <qtextformat.h>
35@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
36 continue;
37 }
38
39- if (lastSelectionWidth > 0)
40- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
41+ if (lastSelectionWidth > 0) {
42+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
43+ rect.moveLeft(qFloor(rect.left()));
44+ rect.moveTop(qFloor(rect.top()));
45+ region->addRect(rect);
46+ }
47
48 lastSelectionX = selectionX;
49 lastSelectionWidth = selectionWidth;
50 }
51 }
52- if (lastSelectionWidth > 0)
53- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
54+ if (lastSelectionWidth > 0) {
55+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
56+ rect.moveLeft(qFloor(rect.left()));
57+ rect.moveTop(qFloor(rect.top()));
58+ region->addRect(rect);
59+ }
60 }
61
62 static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
63@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
64
65 QBrush bg = chf.background();
66 if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
67- p->fillRect(r, bg);
68+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
69 if (c.style() != Qt::NoBrush) {
70 p->setPen(QPen(c, 0));
71 }
72--
731.8.4
74
diff --git a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
deleted file mode 100644
index e02815b1..00000000
--- a/recipes-qt/qt5/qtbase-git/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a911109ed920e6a7466b65df86270ed836dd529c Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 27 Nov 2012 12:46:44 -0800
4Subject: [PATCH] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b4c9602..f30ec1f 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -122,7 +122,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += src_openglextensions
22 src_plugins.depends += src_gui src_platformsupport
23 !contains(QT_CONFIG, no-widgets) {
24- SUBDIRS += src_tools_uic src_widgets
25+ SUBDIRS += src_widgets
26 src_plugins.depends += src_widgets
27 contains(QT_CONFIG, opengl(es1|es2)?) {
28 SUBDIRS += src_opengl
29@@ -134,7 +134,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
30 }
31 }
32 }
33-SUBDIRS += src_plugins src_tools_qdoc
34+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
35
36 nacl: SUBDIRS -= src_network src_testlib
37
38--
391.8.3.2
40
diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
deleted file mode 100644
index ccb8a093..00000000
--- a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 1e0f35bd94719f77f7be5e059e72a51576b6f94b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 04/23] qt_functions: temporary remove isEmpty check
5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7* isEmpty works correctly only with qmake variables (e.g. $$FOO -
8 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 mkspecs/features/qt_functions.prf | 6 +++++-
15 mkspecs/features/qt_tool.prf | 3 +--
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
19index 4e12d3d..e20ad9d 100644
20--- a/mkspecs/features/qt_functions.prf
21+++ b/mkspecs/features/qt_functions.prf
22@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
23 $$1 = $$eval(QT_TOOL.$${2}.binary)
24 isEmpty($$1) {
25 $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
26- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
27+ # for some reason isEmpty does not work here, FIXME before submitting upstream
28+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
29+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
30+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
31+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
32 $$1 = $$[QT_HOST_BINS]/$$2
33 }
34 exists($$eval($$1).pl) {
35diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
36index 83ef3a0..21c9eb7 100644
37--- a/mkspecs/features/qt_tool.prf
38+++ b/mkspecs/features/qt_tool.prf
39@@ -15,8 +15,7 @@ CONFIG += console
40
41 # If we are doing a prefix build, create a "module" pri which enables
42 # qtPrepareTool() to work with the non-installed build.
43-# Non-bootstrapped tools always need this because of the environment setup.
44-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
45+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
46 isEmpty(MODULE):MODULE = $$TARGET
47
48 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, )
49--
501.8.3.2
51
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
deleted file mode 100644
index 7bd2ba6b..00000000
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 33e87dae3b9dc4007c7cddd82a1b9058010a1992 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/23] qmake is already built in qtbase-native
5
6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration]
8
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure b/configure
16index 25980c0..74f9e65 100755
17--- a/configure
18+++ b/configure
19@@ -4022,7 +4022,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--
291.8.3.2
30
diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
deleted file mode 100644
index d074c3da..00000000
--- a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 6007028a92806a0fd0683f539dba178ad33ab87d Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 29 Oct 2012 20:26:36 -0700
4Subject: [PATCH 06/23] Allow building a separate qmake for the target
5
6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 qmake/qmake.pro | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
16index a81d0cd..ed7aebf 100644
17--- a/qmake/qmake.pro
18+++ b/qmake/qmake.pro
19@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic
20 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
21 PROEVALUATOR_FULL PROEVALUATOR_DEBUG
22 DESTDIR = ../bin/
23+TARGET = qmake
24
25 OBJECTS_DIR = .
26 MOC_DIR = .
27--
281.8.3.2
29
diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index 4562fe15..00000000
--- a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From bd192d0261e39765d895446e9d914a68a0590365 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 07/23] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index c752df3..0d1bca6 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3118,8 +3118,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27--
281.8.3.2
29
diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
deleted file mode 100644
index f855292c..00000000
--- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 5168edad24f2c27061286707603bc2126365bcb2 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement
5
6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
8 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
9 QT_INSTALL_LIBS/raw:/usr/lib
10 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
11
12 I don't want the replacement like this:
13 sed
14 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
15 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
16 "../../lib/pkgconfig/Qt5Core.pc"
17 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
18 because that way I'll end with -L/usr/lib in .pc file which is
19 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
20 in my case
21
22Upstream-Status: Pending
23
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 mkspecs/features/qt_module.prf | 20 ++++++++++++++++----
27 1 file changed, 16 insertions(+), 4 deletions(-)
28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 7f7de85..7741b96 100644
31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf
33@@ -140,18 +140,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \
36 rplbase = $$MODULE_BASE_OUTDIR
37+ pkgconfig_include_replace.match = $$rplbase/include
38+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
39+ pkgconfig_lib_replace.match = $$rplbase/lib
40+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
41 include_replace.match = $$rplbase/include
42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43 lib_replace.match = $$rplbase/lib
44- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
47+ lafile_replace.match = $$rplbase
48+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
49+
50+ !isEmpty(SYSROOT): \
51+ rplbase = $$[SYSROOT] \
52+ lafile_replace.match = $$rplbase \
53+ lafile_replace.replace = "=" \
54+
55+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
56 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
57 }
58
59 unix {
60 CONFIG += create_libtool explicitlib
61- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR
62- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
63+ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
64+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
65 }
66
67 unix|win32-g++* {
68--
691.8.3.2
70
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
deleted file mode 100644
index c1e80bc2..00000000
--- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From fdd0a04cca9cb991b7073d01312218d3387c1e43 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 12:56:55 +0200
4Subject: [PATCH 09/23] qt_module: Fix paths in .prl files
5
6* qmake does not prefix them with QT_SYSROOT when using them
7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
8 variable, which is unsafe for cross-compilation
9* writting QT_SYSROOT in .prl files is dangerous for sstate when
10 builds are in different directories, so we need
11 SSTATE_SCAN_FILES += "*.pri *.prl"
12 to make them relocateble
13
14Upstream-Status: Pending
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
19 1 file changed, 17 insertions(+), 11 deletions(-)
20
21diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
22index 7741b96..3874067 100644
23--- a/mkspecs/features/qt_module.prf
24+++ b/mkspecs/features/qt_module.prf
25@@ -144,17 +144,23 @@ unix|win32-g++* {
26 pkgconfig_include_replace.replace = "\$$\\{includedir}"
27 pkgconfig_lib_replace.match = $$rplbase/lib
28 pkgconfig_lib_replace.replace = "\$$\\{libdir}"
29- include_replace.match = $$rplbase/include
30- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
31- lib_replace.match = $$rplbase/lib
32- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
33- lafile_replace.match = $$rplbase
34- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
35-
36- !isEmpty(SYSROOT): \
37- rplbase = $$[SYSROOT] \
38- lafile_replace.match = $$rplbase \
39- lafile_replace.replace = "=" \
40+ !exists($$[QT_SYSROOT]) {
41+ include_replace.match = $$rplbase/include
42+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43+ lib_replace.match = $$rplbase/lib
44+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
45+ lafile_replace.match = $$rplbase
46+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
47+ } else {
48+ # include_replace and lib_replace are duplicate, but we don't want to
49+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
50+ include_replace.match = $$rplbase
51+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
52+ lib_replace.match = $$rplbase
53+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
54+ lafile_replace.match = $$rplbase
55+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
56+ }
57
58 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
59 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
60--
611.8.3.2
62
diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
deleted file mode 100644
index 749edeee..00000000
--- a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch
+++ /dev/null
@@ -1,82 +0,0 @@
1From 346e27a30ee7e480c5bdb789d12aa41e8e2efad5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 10/23] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 mkspecs/features/wayland-scanner.prf | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
16index 2ec064f..847d0f7 100644
17--- a/mkspecs/features/wayland-scanner.prf
18+++ b/mkspecs/features/wayland-scanner.prf
19@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES
20 wayland-server-header.variable_out = HEADERS
21 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
22 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
23-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
24+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
25 QMAKE_EXTRA_COMPILERS += wayland-server-header
26
27 wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
28@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES
29 wayland-client-header.variable_out = HEADERS
30 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
31 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
32-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
33+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
34 QMAKE_EXTRA_COMPILERS += wayland-client-header
35
36 wayland-code.name = wayland ${QMAKE_FILE_BASE}
37@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
38 wayland-code.variable_out = SOURCES
39 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
40 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
41-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
42+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
43 QMAKE_EXTRA_COMPILERS += wayland-code
44
45 qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
46@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS
47 qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
48 qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
49 qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
50-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
51+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
52 QMAKE_EXTRA_COMPILERS += qtwayland-client-header
53
54 qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE}
55@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES
56 qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
57 qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp
58 qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
59-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
60+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
61 QMAKE_EXTRA_COMPILERS += qtwayland-client-code
62
63 qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE}
64@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS
65 qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
66 qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
67 qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
68-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
69+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
70 QMAKE_EXTRA_COMPILERS += qtwayland-server-header
71
72 qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE}
73@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES
74 qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
75 qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
76 qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
77-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
78+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
79 QMAKE_EXTRA_COMPILERS += qtwayland-server-code
80--
811.8.3.2
82
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
deleted file mode 100644
index e0a21667..00000000
--- a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From e72d6d0528bb0032dddfbdb01a232f62e5931ba8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 9 May 2013 10:06:50 +0200
4Subject: [PATCH 12/23] 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
9Upstream-Status: Pending
10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 mkspecs/features/configure.prf | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
17index b4569df..d189e50 100644
18--- a/mkspecs/features/configure.prf
19+++ b/mkspecs/features/configure.prf
20@@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
21 qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
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--
361.8.3.2
37
diff --git a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch b/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
deleted file mode 100644
index 32982662..00000000
--- a/recipes-qt/qt5/qtbase-git/0013-Disable-mkv8snapshot.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 4d9e581943ed3a7440e8176ab81c82fe949ae300 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 8 Jan 2013 15:58:29 -0800
4Subject: [PATCH 13/23] Disable mkv8snapshot
5
6It seems to generate code that throws SIGILL, so disabling it
7
8Program received signal SIGILL, Illegal instruction.
90x26312c60 in ?? ()
10(gdb) bt
11 function=..., receiver=..., argc=1978934572, args=0x7efff254,
12 has_pending_exception=0x7efff277, qml=...)
13 at ../3rdparty/v8/src/execution.cc:125
14 argc=1, argv=0x7efff254, pending_exception=0x7efff277,
15 convert_receiver=false, qml=...) at ../3rdparty/v8/src/execution.cc:194
16 receiver=<optimized out>, argc=<optimized out>, argv=<optimized out>,
17 pending_exception=0x7efff277, convert_receiver=false)
18 at ../3rdparty/v8/src/execution.cc:161
19 data=<optimized out>, exc=0x7efff277)
20 at ../3rdparty/v8/src/execution.cc:734
21 at ../3rdparty/v8/src/api.cc:4742
22 at qml/v8/qv8contextwrapper.cpp:155
23 ownership=<optimized out>) at qml/v8/qv8engine.cpp:155
24 parent=<optimized out>) at qml/v8/qjsengine.cpp:192
25
26Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
27Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
28---
29 configure | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/configure b/configure
33index 7a9a77c..69e30b5 100755
34--- a/configure
35+++ b/configure
36@@ -910,7 +910,7 @@ CFG_SKIP_MODULES=""
37 CFG_COMPILE_EXAMPLES=auto
38 CFG_RELEASE_QMAKE=no
39 CFG_AUDIO_BACKEND=auto
40-CFG_V8SNAPSHOT=auto
41+CFG_V8SNAPSHOT=no
42 CFG_QML_DEBUG=yes
43 CFG_JAVASCRIPTCORE_JIT=auto
44 CFG_PKGCONFIG=auto
45--
461.8.3.2
47
diff --git a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch b/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch
deleted file mode 100644
index 5919bbad..00000000
--- a/recipes-qt/qt5/qtbase-git/0020-Use-BGRA-extension-in-bindTexture.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 893bf856c5f61c75cd9a2c44dff911f31db261e1 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Mon, 27 May 2013 15:25:25 -0700
4Subject: [PATCH 20/23] Use BGRA extension in bindTexture
5
6Upstream-Status: Pending
7
8Change-Id: I18aecc87c5c7d4483cabe5555da33ca6bb8580f1
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 src/gui/opengl/qopengltexturecache.cpp | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
16index 94b8288..5c8aa3c 100644
17--- a/src/gui/opengl/qopengltexturecache.cpp
18+++ b/src/gui/opengl/qopengltexturecache.cpp
19@@ -181,11 +181,7 @@ GLuint QOpenGLTextureCache::bindTexture(QOpenGLContext *context, qint64 key, con
20
21 QImage tx = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
22
23- // Performance could be improved by skipping qgl_byteSwapImage().
24- if (m_useByteSwapImage)
25- qgl_byteSwapImage(tx);
26-
27- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tx.width(), tx.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
28+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, tx.width(), tx.height(), 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, const_cast<const QImage &>(tx).bits());
29
30 int cost = tx.width() * tx.height() * 4 / 1024;
31 m_cache.insert(key, new QOpenGLCachedTexture(id, context), cost);
32--
331.8.3.2
34
diff --git a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch
deleted file mode 100644
index f259284c..00000000
--- a/recipes-qt/qt5/qtbase-git/0021-configure-make-pulseaudio-a-configurable-option.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f6156776d191b9d848d6892c473dfa2cd8963884 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 21/23] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 configure | 7 +++++++
14 1 file changed, 7 insertions(+)
15
16diff --git a/configure b/configure
17index 69e30b5..290b9ac 100755
18--- a/configure
19+++ b/configure
20@@ -2039,6 +2039,13 @@ while [ "$#" -gt 0 ]; do
21 UNKNOWN_OPT=yes
22 fi
23 ;;
24+ pulseaudio)
25+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
26+ CFG_PULSEAUDIO="$VAL"
27+ else
28+ UNKNOWN_OPT=yes
29+ fi
30+ ;;
31 gtkstyle)
32 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
33 CFG_QGTKSTYLE="$VAL"
34--
351.8.3.2
36
diff --git a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch
deleted file mode 100644
index 3513a171..00000000
--- a/recipes-qt/qt5/qtbase-git/0022-configure-make-alsa-a-configurable-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 39dc112aa81a9e658fa00e1fc88ed3f712b4687a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 19 Jul 2013 23:21:28 +0200
4Subject: [PATCH 22/23] configure: make alsa a configurable option
5
6Allows disabling alsa support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 290b9ac..5e9bfd4 100755
17--- a/configure
18+++ b/configure
19@@ -2046,6 +2046,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ alsa)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
25+ CFG_ALSA="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.2
35
diff --git a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch b/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch
deleted file mode 100644
index f141725f..00000000
--- a/recipes-qt/qt5/qtbase-git/0023-configure-make-freetype-a-configurable-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 059904ca921dfbdc9d702be67dcce66957ef6ecd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 20 Jul 2013 10:56:37 +0200
4Subject: [PATCH 23/23] configure: make freetype a configurable option
5
6Allows disabling freetype support at configure time.
7
8Upstream-Status: Pending
9
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 7 +++++++
13 1 file changed, 7 insertions(+)
14
15diff --git a/configure b/configure
16index 5e9bfd4..5b1f5f2 100755
17--- a/configure
18+++ b/configure
19@@ -2053,6 +2053,13 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ freetype)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
25+ CFG_LIBFREETYPE="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30 gtkstyle)
31 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32 CFG_QGTKSTYLE="$VAL"
33--
341.8.3.2
35
diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
deleted file mode 100644
index 7ca5e808..00000000
--- a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to
5 host binaries
6
7Upstream-Status: Inappropiate (configuration)
8
9Signed-off-by: Simon Busch <morphis@gravedo.de>
10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
13 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
14 3 files changed, 6 insertions(+), 6 deletions(-)
15
16diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
17index a804278..b6fbbea 100644
18--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
19+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
20@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
21 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
22 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
23 !!ELSE
24- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
25+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
26 !!ENDIF
27 _qt5_Core_check_file_exists(${imported_location})
28
29@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
30 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
31 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
32 !!ELSE
33- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
34+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
35 !!ENDIF
36 _qt5_Core_check_file_exists(${imported_location})
37
38@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
39 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
40 set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
41 !!ELSE
42- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
43+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
44 !!ENDIF
45 _qt5_Core_check_file_exists(${imported_location})
46
47diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
48index 1d94715..3209e42 100644
49--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
50+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
51@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
52 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
53 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
54 !!ELSE
55- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
56+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
57 !!ENDIF
58 _qt5_DBus_check_file_exists(${imported_location})
59
60@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
61 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
62 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
63 !!ELSE
64- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
65+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
66 !!ENDIF
67 _qt5_DBus_check_file_exists(${imported_location})
68
69diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
70index e5650ff..7fb8b21 100644
71--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
72+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
73@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
74 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
75 set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
76 !!ELSE
77- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
78+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
79 !!ENDIF
80 _qt5_Widgets_check_file_exists(${imported_location})
81
82--
831.8.1.2
84
diff --git a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch b/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
deleted file mode 100644
index 6858cead..00000000
--- a/recipes-qt/qt5/qtbase-git/0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From af96c6fed931564c95037539f07e9c8e33c69529 Mon Sep 17 00:00:00 2001
2From: Peter Hartmann <phartmann@blackberry.com>
3Date: Thu, 25 Jul 2013 12:05:29 -0400
4Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method
5
6When readData() is called repeatedly, we need to keep track which
7part of the multipart message we are currently reading from.
8Hereby we also need to take the boundary size into account, and not
9only the size of the multipart; otherwise we would skip a not
10completely read part. This would then later lead to advancing the
11read pointer by negative indexes and data loss.
12
13Upstream-Status: Accepted [https://codereview.qt-project.org/#change,61698]
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15
16Task-number: QTBUG-32534
17Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0
18Reviewed-by: Jonathan Liu <net147@gmail.com>
19Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
20---
21 src/network/access/qhttpmultipart.cpp | 3 +-
22 .../access/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++
23 2 files changed, 46 insertions(+), 1 deletion(-)
24
25diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp
26index 4397ef8..5985ed9 100644
27--- a/src/network/access/qhttpmultipart.cpp
28+++ b/src/network/access/qhttpmultipart.cpp
29@@ -497,7 +497,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize)
30
31 // skip the parts we have already read
32 while (index < multiPart->parts.count() &&
33- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size())
34+ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()
35+ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart
36 index++;
37
38 // read the data
39--
401.8.3.4
41
diff --git a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch b/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
deleted file mode 100644
index 0d533059..00000000
--- a/recipes-qt/qt5/qtbase-git/0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f0b950144dde85b65df0c3cf83f7c8df0e94bbbf Mon Sep 17 00:00:00 2001
2From: Andy Shaw <andy.shaw@digia.com>
3Date: Tue, 8 Oct 2013 15:45:42 +0200
4Subject: [PATCH] Ensure lastPixel.y is also initalized to -1 when necessary
5
6Task-number: QTBUG-31579
7
8Upstream-Status: Accepted [https://codereview.qt-project.org/#change,67578]
9Signed-off-by: Jonathan Liu <net147@gmail.com>
10
11Change-Id: Ia4916ac0d384ea523bbfad0dafbc90044da7ec3e
12Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
13---
14 src/gui/painting/qcosmeticstroker.cpp | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
18index 39f6422..a2301e3 100644
19--- a/src/gui/painting/qcosmeticstroker.cpp
20+++ b/src/gui/painting/qcosmeticstroker.cpp
21@@ -305,6 +305,7 @@ void QCosmeticStroker::setup()
22 ymax = deviceRect.bottom() + 2;
23
24 lastPixel.x = -1;
25+ lastPixel.y = -1;
26 }
27
28 // returns true if the whole line gets clipped away
29@@ -533,6 +534,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
30 QPointF p = QPointF(points[0], points[1]) * state->matrix;
31 patternOffset = state->lastPen.dashOffset()*64;
32 lastPixel.x = -1;
33+ lastPixel.y = -1;
34
35 bool closed;
36 const QPainterPath::ElementType *e = subPath(type, end, points, &closed);
37@@ -587,6 +589,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
38 QPointF movedTo = p;
39 patternOffset = state->lastPen.dashOffset()*64;
40 lastPixel.x = -1;
41+ lastPixel.y = -1;
42
43 const qreal *begin = points;
44 const qreal *end = points + 2*path.elementCount();
45--
461.8.4
47
diff --git a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch b/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch
deleted file mode 100644
index d5e082ea..00000000
--- a/recipes-qt/qt5/qtbase-git/0027-Fix-misaligned-selection-region-with-text-when-cente.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 5d8a882c11201a29475c5ea71cfb76c9de6573f5 Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 23 Oct 2013 00:28:17 +1100
4Subject: [PATCH] Fix misaligned selection region with text when centered
5
6If the text is centered, the x/y position in the selection QRectF may
7be a multiple of 0.5 which is rounded up. This rounding causes
8misalignment of the selection region with the text.
9
10The alignment is fixed by using qFloor on the x and y components.
11
12Upstream-Status: Accepted [https://codereview.qt-project.org/#change,68842]
13Signed-off-by: Jonathan Liu <net147@gmail.com>
14
15Task-number: QTBUG-34218
16Task-number: QTBUG-34234
17Change-Id: I4f2fadeb38602f62a93773c6e5faecf03b28069f
18Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
19---
20 src/gui/text/qtextlayout.cpp | 19 ++++++++++++++-----
21 1 file changed, 14 insertions(+), 5 deletions(-)
22
23diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
24index 54d337e..66341e1 100644
25--- a/src/gui/text/qtextlayout.cpp
26+++ b/src/gui/text/qtextlayout.cpp
27@@ -44,6 +44,7 @@
28
29 #include <qthread.h>
30 #include <qfont.h>
31+#include <qmath.h>
32 #include <qpainter.h>
33 #include <qvarlengtharray.h>
34 #include <qtextformat.h>
35@@ -946,15 +947,23 @@ static void addSelectedRegionsToPath(QTextEngine *eng, int lineNumber, const QPo
36 continue;
37 }
38
39- if (lastSelectionWidth > 0)
40- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
41+ if (lastSelectionWidth > 0) {
42+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
43+ rect.moveLeft(qFloor(rect.left()));
44+ rect.moveTop(qFloor(rect.top()));
45+ region->addRect(rect);
46+ }
47
48 lastSelectionX = selectionX;
49 lastSelectionWidth = selectionWidth;
50 }
51 }
52- if (lastSelectionWidth > 0)
53- region->addRect(boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight));
54+ if (lastSelectionWidth > 0) {
55+ QRectF rect = boundingRect & QRectF(lastSelectionX.toReal(), selectionY, lastSelectionWidth.toReal(), lineHeight);
56+ rect.moveLeft(qFloor(rect.left()));
57+ rect.moveTop(qFloor(rect.top()));
58+ region->addRect(rect);
59+ }
60 }
61
62 static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
63@@ -2077,7 +2086,7 @@ static void setPenAndDrawBackground(QPainter *p, const QPen &defaultPen, const Q
64
65 QBrush bg = chf.background();
66 if (bg.style() != Qt::NoBrush && !chf.property(SuppressBackground).toBool())
67- p->fillRect(r, bg);
68+ p->fillRect(QRectF(qFloor(r.x()), qFloor(r.y()), r.width(), r.height()), bg);
69 if (c.style() != Qt::NoBrush) {
70 p->setPen(QPen(c, 0));
71 }
72--
731.8.4
74
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 1adf422e..b9193e4e 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -7,28 +7,24 @@ QT_MODULE = "qtbase"
7 7
8require qt5-native.inc 8require qt5-native.inc
9 9
10# shared with target qtbase, all except 10# common with target version
11# 0005-qmake-is-already-built-in-qtbase-native.patch 11# common with -native and target version
12# 0006-Allow-building-a-separate-qmake-for-the-target.patch 12SRC_URI += "\
13
14SRC_URI += " \
15 file://0001-Add-linux-oe-g-platform.patch \ 13 file://0001-Add-linux-oe-g-platform.patch \
16 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 14 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
17 file://0003-Add-external-hostbindir-option.patch \ 15 file://0003-Add-external-hostbindir-option.patch \
18 file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ 16 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
19 file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ 17 file://0005-qt_module-Fix-pkgconfig-replacement.patch \
20 file://0008-qt_module-Fix-pkgconfig-replacement.patch \ 18 file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
21 file://0009-qt_module-Fix-paths-in-.prl-files.patch \ 19 file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
22 file://0010-wayland-scanner-disable-silent-rules.patch \ 20 file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
23 file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ 21 file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
24 file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
25 file://0013-Disable-mkv8snapshot.patch \
26 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
27 file://0015-qtbase-allow-build-of-examples.patch \
28" 22"
29 23
30# specific for native version 24# specific for native version
31SRC_URI += "file://0001-Always-build-uic.patch" 25SRC_URI += " \
26 file://0010-Always-build-uic.patch \
27"
32 28
33QT_CONF_PATH = "${B}/qt.conf" 29QT_CONF_PATH = "${B}/qt.conf"
34 30
diff --git a/recipes-qt/qt5/qtbase-native_5.1.1.bb b/recipes-qt/qt5/qtbase-native_5.2.0.bb
index 612553c6..8ccd16df 100644
--- a/recipes-qt/qt5/qtbase-native_5.1.1.bb
+++ b/recipes-qt/qt5/qtbase-native_5.2.0.bb
@@ -7,5 +7,5 @@ do_install_append() {
7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
8} 8}
9 9
10SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd" 10SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
11SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9" 11SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 96e7c298..ce823d26 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,10 +1,31 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# common with target version
5SRC_URI = "\
6 git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
7 file://0001-Add-linux-oe-g-platform.patch \
8 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
9 file://0003-Add-external-hostbindir-option.patch \
10 file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
11 file://0005-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
12 file://0006-qt_module-Fix-pkgconfig-replacement.patch \
13 file://0007-qt_module-Fix-paths-in-.prl-files.patch \
14 file://0008-wayland-scanner-disable-silent-rules.patch \
15 file://0009-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
16 file://0010-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
17 file://0011-configure-make-pulseaudio-a-configurable-option.patch \
18 file://0012-configure-make-alsa-a-configurable-option.patch \
19 file://0013-configure-make-freetype-a-configurable-option.patch \
20 file://0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
21"
22
23SRC_URI += "file://0015-Always-build-uic.patch"
24
4do_install_append() { 25do_install_append() {
5 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt) 26 # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
6 # e.g. qt3d, qtwayland 27 # e.g. qt3d, qtwayland
7 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 28 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
8} 29}
9 30
10SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a" 31SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index ffb37ce4..cd3a939c 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -1,29 +1,24 @@
1require qt5.inc 1require qt5.inc
2 2
3SRC_URI += " \ 3# common with -native
4SRC_URI += "\
4 file://0001-Add-linux-oe-g-platform.patch \ 5 file://0001-Add-linux-oe-g-platform.patch \
5 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 6 file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
6 file://0003-Add-external-hostbindir-option.patch \ 7 file://0003-Add-external-hostbindir-option.patch \
7 file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ 8 file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
8 file://0005-qmake-is-already-built-in-qtbase-native.patch \ 9 file://0005-qt_module-Fix-pkgconfig-replacement.patch \
9 file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ 10 file://0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
10 file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ 11 file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
11 file://0008-qt_module-Fix-pkgconfig-replacement.patch \ 12 file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
12 file://0009-qt_module-Fix-paths-in-.prl-files.patch \ 13 file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
13 file://0010-wayland-scanner-disable-silent-rules.patch \ 14"
14 file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ 15
15 file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ 16SRC_URI += "\
16 file://0013-Disable-mkv8snapshot.patch \ 17 file://0010-qmake-is-already-built-in-qtbase-native.patch \
18 file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
19 file://0012-qtbase-allow-build-of-examples.patch \
20 file://0013-QOpenGLPaintDevice-sub-area-support.patch \
17 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \ 21 file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
18 file://0015-qtbase-allow-build-of-examples.patch \
19 file://0018-QOpenGLPaintDevice-sub-area-support.patch \
20 file://0020-Use-BGRA-extension-in-bindTexture.patch \
21 file://0021-configure-make-pulseaudio-a-configurable-option.patch \
22 file://0022-configure-make-alsa-a-configurable-option.patch \
23 file://0023-configure-make-freetype-a-configurable-option.patch \
24 file://0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
25 file://0026-Ensure-lastPixel.y-is-also-initalized-to-1-when-nece.patch \
26 file://0027-Fix-misaligned-selection-region-with-text-when-cente.patch \
27" 22"
28 23
29DEPENDS += "qtbase-native" 24DEPENDS += "qtbase-native"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 5c16ece5..0976c343 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 14fcd5be6d0665b5803a90a1b7887943b350285f Mon Sep 17 00:00:00 2001 1From f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/23] Add linux-oe-g++ platform 4Subject: [PATCH 01/14] 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
@@ -41,10 +41,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 42
43diff --git a/configure b/configure 43diff --git a/configure b/configure
44index 938b23b..dacfd30 100755 44index a330dd6..1b328ae 100755
45--- a/configure 45--- a/configure
46+++ b/configure 46+++ b/configure
47@@ -291,6 +291,16 @@ getQMakeConf() 47@@ -324,6 +324,16 @@ getQMakeConf()
48 getSingleQMakeVariable "$1" "$specvals" 48 getSingleQMakeVariable "$1" "$specvals"
49 } 49 }
50 50
@@ -61,7 +61,7 @@ index 938b23b..dacfd30 100755
61 getXQMakeConf() 61 getXQMakeConf()
62 { 62 {
63 if [ -z "$xspecvals" ]; then 63 if [ -z "$xspecvals" ]; then
64@@ -300,6 +310,16 @@ getXQMakeConf() 64@@ -333,6 +343,16 @@ getXQMakeConf()
65 getSingleQMakeVariable "$1" "$xspecvals" 65 getSingleQMakeVariable "$1" "$xspecvals"
66 } 66 }
67 67
@@ -78,7 +78,7 @@ index 938b23b..dacfd30 100755
78 compilerSupportsFlag() 78 compilerSupportsFlag()
79 { 79 {
80 cat >conftest.cpp <<EOF 80 cat >conftest.cpp <<EOF
81@@ -816,6 +836,18 @@ fi 81@@ -548,6 +568,18 @@ fi
82 # initalize variables 82 # initalize variables
83 #------------------------------------------------------------------------------- 83 #-------------------------------------------------------------------------------
84 84
@@ -97,7 +97,7 @@ index 938b23b..dacfd30 100755
97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" 97 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
98 for varname in $SYSTEM_VARIABLES; do 98 for varname in $SYSTEM_VARIABLES; do
99 qmakevarname="${varname}" 99 qmakevarname="${varname}"
100@@ -2894,7 +2926,7 @@ if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then 100@@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
101 CFG_QGTKSTYLE=no 101 CFG_QGTKSTYLE=no
102 fi 102 fi
103 103
@@ -106,7 +106,7 @@ index 938b23b..dacfd30 100755
106 106
107 TEST_COMPILER=$QMAKE_CONF_COMPILER 107 TEST_COMPILER=$QMAKE_CONF_COMPILER
108 108
109@@ -2929,7 +2961,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 109@@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
110 exit 1 110 exit 1
111 fi 111 fi
112 fi 112 fi
@@ -115,7 +115,7 @@ index 938b23b..dacfd30 100755
115 115
116 GCC_MACHINE_DUMP= 116 GCC_MACHINE_DUMP=
117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 117 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
118@@ -3967,6 +3999,14 @@ setBootstrapVariable() 118@@ -3860,6 +3892,14 @@ setBootstrapVariable()
119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 119 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
120 } 120 }
121 121
@@ -130,7 +130,7 @@ index 938b23b..dacfd30 100755
130 # build qmake 130 # build qmake
131 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 131 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
132 echo "Creating qmake..." 132 echo "Creating qmake..."
133@@ -4005,11 +4045,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 133@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
134 fi 134 fi
135 135
136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 136 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -300,5 +300,5 @@ index 0000000..dd12003
300+ 300+
301+#endif // QPLATFORMDEFS_H 301+#endif // QPLATFORMDEFS_H
302-- 302--
3031.8.3.2 3031.8.5.2
304 304
diff --git a/recipes-qt/qt5/qtbase-git/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 9f301c46..afc25cc4 100644
--- a/recipes-qt/qt5/qtbase-git/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,7 +1,7 @@
1From 64ac02980780a099618b8d47803a1e4da6016c84 Mon Sep 17 00:00:00 2001 1From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/23] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
5 using the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 1 file changed, 4 insertions(+), 1 deletion(-) 16 1 file changed, 4 insertions(+), 1 deletion(-)
17 17
18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 18diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
19index 53a3ebb..8ca2102 100644 19index 1c3b09f..c647a16 100644
20--- a/src/corelib/global/qlibraryinfo.cpp 20--- a/src/corelib/global/qlibraryinfo.cpp
21+++ b/src/corelib/global/qlibraryinfo.cpp 21+++ b/src/corelib/global/qlibraryinfo.cpp
22@@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() 22@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings()
23 23
24 QSettings *QLibraryInfoPrivate::findConfiguration() 24 QSettings *QLibraryInfoPrivate::findConfiguration()
25 { 25 {
@@ -32,5 +32,5 @@ index 53a3ebb..8ca2102 100644
32 if(!QFile::exists(qtconfig)) 32 if(!QFile::exists(qtconfig))
33 qtconfig = qt_libraryInfoFile(); 33 qtconfig = qt_libraryInfoFile();
34-- 34--
351.8.3.2 351.8.5.2
36 36
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index b80189f3..3f7854fd 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,50 +1,55 @@
1From 6e92a3eac477a534226f916018a6ba6996eff318 Mon Sep 17 00:00:00 2001 1From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/23] Add -external-hostbindir option 4Subject: [PATCH 03/14] 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
8 8
9* this way we can skip bootstraping tools we already have 9* this way we can skip bootstraping tools we already have
10 10
11* qt_functions: temporary remove isEmpty check
12* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
13* isEmpty works correctly only with qmake variables (e.g. $$FOO -
14 isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
15
11Upstream-Status: Pending 16Upstream-Status: Pending
12 17
13Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14--- 19---
15 configure | 14 ++++++++++++++ 20 configure | 15 +++++++++++++++
16 mkspecs/features/qt_functions.prf | 5 ++++- 21 mkspecs/features/qt_functions.prf | 9 ++++++++-
17 mkspecs/features/qt_tool.prf | 2 +- 22 mkspecs/features/qt_tool.prf | 3 +--
18 qmake/property.cpp | 1 + 23 qmake/property.cpp | 1 +
19 qtbase.pro | 12 +++++++++--- 24 qtbase.pro | 12 +++++++++---
20 src/corelib/global/qlibraryinfo.cpp | 3 ++- 25 src/corelib/global/qlibraryinfo.cpp | 3 ++-
21 src/corelib/global/qlibraryinfo.h | 1 + 26 src/corelib/global/qlibraryinfo.h | 1 +
22 tools/configure/configureapp.cpp | 8 ++++++++ 27 tools/configure/configureapp.cpp | 8 ++++++++
23 8 files changed, 40 insertions(+), 6 deletions(-) 28 8 files changed, 45 insertions(+), 7 deletions(-)
24 29
25diff --git a/configure b/configure 30diff --git a/configure b/configure
26index dacfd30..25980c0 100755 31index 1b328ae..46f7230 100755
27--- a/configure 32--- a/configure
28+++ b/configure 33+++ b/configure
29@@ -1046,6 +1046,7 @@ QT_HOST_PREFIX= 34@@ -785,6 +785,7 @@ QT_HOST_BINS=
30 QT_HOST_BINS=
31 QT_HOST_LIBS= 35 QT_HOST_LIBS=
32 QT_HOST_DATA= 36 QT_HOST_DATA=
37 QT_EXT_PREFIX=
33+QT_EXTERNAL_HOST_BINS= 38+QT_EXTERNAL_HOST_BINS=
34 39
35 #flags for SQL drivers 40 #flags for SQL drivers
36 QT_CFLAGS_PSQL= 41 QT_CFLAGS_PSQL=
37@@ -1170,6 +1171,7 @@ while [ "$#" -gt 0 ]; do 42@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do
38 -testsdir| \ 43 -testsdir| \
39 -hostdatadir| \ 44 -hostdatadir| \
40 -hostbindir| \ 45 -hostbindir| \
41+ -external-hostbindir| \ 46+ -external-hostbindir| \
42 -hostlibdir| \ 47 -hostlibdir| \
48 -extprefix| \
43 -sysroot| \ 49 -sysroot| \
44 -depths| \ 50@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do
45@@ -1379,6 +1381,9 @@ while [ "$#" -gt 0 ]; do 51 extprefix)
46 hostlibdir) 52 QT_EXT_PREFIX="$VAL"
47 QT_HOST_LIBS="$VAL"
48 ;; 53 ;;
49+ external-hostbindir) 54+ external-hostbindir)
50+ QT_EXTERNAL_HOST_BINS="$VAL" 55+ QT_EXTERNAL_HOST_BINS="$VAL"
@@ -52,29 +57,30 @@ index dacfd30..25980c0 100755
52 pkg-config) 57 pkg-config)
53 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 58 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
54 CFG_PKGCONFIG="$VAL" 59 CFG_PKGCONFIG="$VAL"
55@@ -3248,6 +3253,11 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 60@@ -2226,6 +2231,10 @@ Installation options:
56 QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
57 fi
58
59+# default is empty, don't call makeabs if it is empty
60+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
61+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
62+fi
63+
64 #-------------------------------------------------------------------------------
65 # help - interactive parts of the script _after_ this section please
66 #-------------------------------------------------------------------------------
67@@ -3416,6 +3426,9 @@ Installation options:
68 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 61 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
69 (default HOSTPREFIX) 62 (default HOSTPREFIX)
70 63
71+ -external-hostbindir <dir> Use external host executables instead of building them 64+ -external-hostbindir <dir> Use external host executables instead of building them
72+ (not used by defaut) 65+ (not used by defaut)
73+ 66+
67+
74 Configure options: 68 Configure options:
75 69
76 The defaults (*) are usually acceptable. A plus (+) denotes a default value 70 The defaults (*) are usually acceptable. A plus (+) denotes a default value
77@@ -3931,6 +3944,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { 71@@ -3133,6 +3142,11 @@ fi
72 # command line and environment validation
73 #-------------------------------------------------------------------------------
74
75+# default is empty, don't call makeabs if it is empty
76+if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
77+ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
78+fi
79+
80 # update QT_CONFIG to show our current predefined configuration
81 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
82 case "$CFG_QCONFIG" in
83@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
78 "qt_hbinpath=$QT_HOST_BINS", 84 "qt_hbinpath=$QT_HOST_BINS",
79 "qt_hlibpath=$QT_HOST_LIBS", 85 "qt_hlibpath=$QT_HOST_LIBS",
80 "qt_hdatpath=$QT_HOST_DATA", 86 "qt_hdatpath=$QT_HOST_DATA",
@@ -83,36 +89,41 @@ index dacfd30..25980c0 100755
83 "qt_hostspec=$shortspec", 89 "qt_hostspec=$shortspec",
84 #endif 90 #endif
85diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
86index 2f2c94c..4e12d3d 100644 92index 1dacfed..7229845 100644
87--- a/mkspecs/features/qt_functions.prf 93--- a/mkspecs/features/qt_functions.prf
88+++ b/mkspecs/features/qt_functions.prf 94+++ b/mkspecs/features/qt_functions.prf
89@@ -194,7 +194,10 @@ defineTest(qtAddRpathLink) { 95@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
90 defineTest(qtPrepareTool) { 96 defineTest(qtPrepareTool) {
91 $$1 = $$eval(QT_TOOL.$${2}.binary) 97 $$1 = $$eval(QT_TOOL.$${2}.binary)
92 isEmpty($$1) { 98 isEmpty($$1) {
93- $$1 = $$[QT_HOST_BINS]/$$2 99- $$1 = $$[QT_HOST_BINS]/$$2
94+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 100+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
95+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 101+ # for some reason isEmpty does not work here, FIXME before submitting upstream
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)
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) {
96+ $$1 = $$[QT_HOST_BINS]/$$2 106+ $$1 = $$[QT_HOST_BINS]/$$2
97+ } 107+ }
98 exists($$eval($$1).pl) { 108 exists($$eval($$1).pl) {
99 $$1 = perl -w $$eval($$1).pl 109 $$1 = perl -w $$eval($$1).pl
100 } else: contains(QMAKE_HOST.os, Windows) { 110 } else: contains(QMAKE_HOST.os, Windows) {
101diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 111diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
102index 9a6b963..83ef3a0 100644 112index f0864f9..50bfac8 100644
103--- a/mkspecs/features/qt_tool.prf 113--- a/mkspecs/features/qt_tool.prf
104+++ b/mkspecs/features/qt_tool.prf 114+++ b/mkspecs/features/qt_tool.prf
105@@ -16,7 +16,7 @@ CONFIG += console 115@@ -15,8 +15,7 @@ CONFIG += console
116
106 # If we are doing a prefix build, create a "module" pri which enables 117 # If we are doing a prefix build, create a "module" pri which enables
107 # qtPrepareTool() to work with the non-installed build. 118 # qtPrepareTool() to work with the non-installed build.
108 # Non-bootstrapped tools always need this because of the environment setup. 119-# Non-bootstrapped tools always need this because of the environment setup.
109-!build_pass:if(!host_build|!force_bootstrap|force_independent) { 120-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
110+!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { 121+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
111 isEmpty(MODULE):MODULE = $$TARGET 122 isEmpty(MODULE):MODULE = $$TARGET
112 123
113 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, ) 124 !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
114diff --git a/qmake/property.cpp b/qmake/property.cpp 125diff --git a/qmake/property.cpp b/qmake/property.cpp
115index 4685440..93eb1d4 100644 126index e50485c..71291ad 100644
116--- a/qmake/property.cpp 127--- a/qmake/property.cpp
117+++ b/qmake/property.cpp 128+++ b/qmake/property.cpp
118@@ -75,6 +75,7 @@ static const struct { 129@@ -75,6 +75,7 @@ static const struct {
@@ -124,7 +135,7 @@ index 4685440..93eb1d4 100644
124 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 135 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
125 }; 136 };
126diff --git a/qtbase.pro b/qtbase.pro 137diff --git a/qtbase.pro b/qtbase.pro
127index d6726b5..28ca7d5 100644 138index 7576db7..d51af0e 100644
128--- a/qtbase.pro 139--- a/qtbase.pro
129+++ b/qtbase.pro 140+++ b/qtbase.pro
130@@ -70,16 +70,22 @@ CONFIG -= qt 141@@ -70,16 +70,22 @@ CONFIG -= qt
@@ -154,10 +165,10 @@ index d6726b5..28ca7d5 100644
154 165
155 # If we are doing a prefix build, create a "module" pri which enables 166 # If we are doing a prefix build, create a "module" pri which enables
156diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 167diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
157index 8ca2102..9f5d444 100644 168index c647a16..da82913 100644
158--- a/src/corelib/global/qlibraryinfo.cpp 169--- a/src/corelib/global/qlibraryinfo.cpp
159+++ b/src/corelib/global/qlibraryinfo.cpp 170+++ b/src/corelib/global/qlibraryinfo.cpp
160@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() 171@@ -281,7 +281,7 @@ QLibraryInfo::isDebugBuild()
161 */ 172 */
162 173
163 static const struct { 174 static const struct {
@@ -166,7 +177,7 @@ index 8ca2102..9f5d444 100644
166 } qtConfEntries[] = { 177 } qtConfEntries[] = {
167 { "Prefix", "." }, 178 { "Prefix", "." },
168 { "Documentation", "doc" }, // should be ${Data}/doc 179 { "Documentation", "doc" }, // should be ${Data}/doc
169@@ -296,6 +296,7 @@ static const struct { 180@@ -307,6 +307,7 @@ static const struct {
170 { "HostBinaries", "bin" }, 181 { "HostBinaries", "bin" },
171 { "HostLibraries", "lib" }, 182 { "HostLibraries", "lib" },
172 { "HostData", "." }, 183 { "HostData", "." },
@@ -175,7 +186,7 @@ index 8ca2102..9f5d444 100644
175 { "HostSpec", "" }, 186 { "HostSpec", "" },
176 #endif 187 #endif
177diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h 188diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
178index b275e01..0e6baed 100644 189index 17864b5..a14bc0f 100644
179--- a/src/corelib/global/qlibraryinfo.h 190--- a/src/corelib/global/qlibraryinfo.h
180+++ b/src/corelib/global/qlibraryinfo.h 191+++ b/src/corelib/global/qlibraryinfo.h
181@@ -84,6 +84,7 @@ public: 192@@ -84,6 +84,7 @@ public:
@@ -187,11 +198,11 @@ index b275e01..0e6baed 100644
187 HostSpecPath, 198 HostSpecPath,
188 LastHostPath = HostSpecPath, 199 LastHostPath = HostSpecPath,
189diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 200diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
190index 5b62e8f..c752df3 100644 201index e2fef2c..ab475c3 100644
191--- a/tools/configure/configureapp.cpp 202--- a/tools/configure/configureapp.cpp
192+++ b/tools/configure/configureapp.cpp 203+++ b/tools/configure/configureapp.cpp
193@@ -1162,6 +1162,13 @@ void Configure::parseCmdLine() 204@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine()
194 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); 205 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
195 } 206 }
196 207
197+ else if (configCmdLine.at(i) == "-external-hostbindir") { 208+ else if (configCmdLine.at(i) == "-external-hostbindir") {
@@ -204,7 +215,7 @@ index 5b62e8f..c752df3 100644
204 else if (configCmdLine.at(i) == "-make-tool") { 215 else if (configCmdLine.at(i) == "-make-tool") {
205 ++i; 216 ++i;
206 if (i == argCount) 217 if (i == argCount)
207@@ -3715,6 +3722,7 @@ void Configure::generateQConfigCpp() 218@@ -3852,6 +3859,7 @@ void Configure::generateQConfigCpp()
208 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl 219 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
209 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl 220 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
210 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl 221 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
@@ -213,5 +224,5 @@ index 5b62e8f..c752df3 100644
213 << " \"qt_hostspec=" << hostSpec << "\"," << endl 224 << " \"qt_hostspec=" << hostSpec << "\"," << endl
214 << "#endif" << endl 225 << "#endif" << endl
215-- 226--
2161.8.3.2 2271.8.5.2
217 228
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
new file mode 100644
index 00000000..71a45969
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,29 @@
1From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Upstream-Status: Pending
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index ab475c3..68cd43d 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri()
17 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 configStream << "}" << endl;
26 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
27--
281.8.5.2
29
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
new file mode 100644
index 00000000..f85fb33b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
@@ -0,0 +1,117 @@
1From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9* in situation like this:
10 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
11 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
12 QT_INSTALL_LIBS/raw:/usr/lib
13 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
14
15 I don't want the replacement like this:
16 sed
17 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
18 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
19 "../../lib/pkgconfig/Qt5Core.pc"
20 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
21 because that way I'll end with -L/usr/lib in .pc file which is
22 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
23 in my case
24
25* qt_module: Fix paths in .prl files
26* qmake does not prefix them with QT_SYSROOT when using them
27 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
28 variable, which is unsafe for cross-compilation
29* writting QT_SYSROOT in .prl files is dangerous for sstate when
30 builds are in different directories, so we need
31 SSTATE_SCAN_FILES += "*.pri *.prl"
32 to make them relocateble
33
34* fix paths in packageconfig files
35 This reverts parts of:
36 enable path replacement in installed prl files on all platforms
37 Task-number: QTBUG-33794
38 Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
39 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
40
41Upstream-Status: Pending
42
43Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
45---
46 mkspecs/features/qt_module.prf | 43 ++++++++++++++++++++++++++++++------------
47 1 file changed, 31 insertions(+), 12 deletions(-)
48
49diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
50index 11509ee..2f95684 100644
51--- a/mkspecs/features/qt_module.prf
52+++ b/mkspecs/features/qt_module.prf
53@@ -135,30 +135,49 @@ load(qt_installs)
54 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
55 else: \
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-lib_replace.match = $$rplbase/lib
61-host_build: \
62- lib_replace.replace = $$[QT_HOST_LIBS]
63-else: \
64+pkgconfig_include_replace.match = $$rplbase/include
65+pkgconfig_include_replace.replace = "\$$\\{includedir}"
66+pkgconfig_lib_replace.match = $$rplbase/lib
67+pkgconfig_lib_replace.replace = "\$$\\{libdir}"
68+!exists($$[QT_SYSROOT]) {
69+ include_replace.match = $$rplbase/include
70+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
71+ include_replace.CONFIG = path
72+ lib_replace.match = $$rplbase/lib
73 lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
74-lib_replace.CONFIG = path
75+ lib_replace.CONFIG = path
76+ lafile_replace.match = $$rplbase
77+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
78+} else {
79+ # include_replace and lib_replace are duplicate, but we don't want to
80+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
81+ include_replace.match = $$rplbase
82+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
83+ include_replace.CONFIG = path
84+ lib_replace.match = $$rplbase
85+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
86+ lib_replace.CONFIG = path
87+ lafile_replace.match = $$rplbase
88+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
89+}
90 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
91
92 unix|win32-g++* {
93 CONFIG += create_pc
94- QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
95- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
96+ host_build: \
97+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
98+ else: \
99+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
100+ QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
101 QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
102 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
103- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
104+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
105 }
106
107 unix {
108 CONFIG += create_libtool explicitlib
109 QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace
110- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
111+ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace
112 }
113
114 unix|win32-g++* {
115--
1161.8.5.2
117
diff --git a/recipes-qt/qt5/qtbase-git/0011-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
index 6117e7fb..82e028d7 100644
--- a/recipes-qt/qt5/qtbase-git/0011-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
@@ -1,7 +1,7 @@
1From df07d747bdbb5652165a3c9395247729a4bf2fce Mon Sep 17 00:00:00 2001 1From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 8 May 2013 23:54:35 +0200 3Date: Wed, 8 May 2013 23:54:35 +0200
4Subject: [PATCH 11/23] configure: don't export SYSTEM_VARIABLES to .qmake.vars 4Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars
5 5
6* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is 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 7 causing issues as we need g++ to be used as linker
@@ -10,14 +10,14 @@ Upstream-Status: Pending
10 10
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 12---
13 configure | 15 +-------------- 13 configure | 14 --------------
14 1 file changed, 1 insertion(+), 14 deletions(-) 14 1 file changed, 14 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index 74f9e65..7a9a77c 100755 17index 46f7230..96c56c8 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -849,20 +849,7 @@ fi'` 20@@ -581,20 +581,6 @@ fi'`
21 done 21 done
22 22
23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" 23 SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
@@ -35,10 +35,9 @@ index 74f9e65..7a9a77c 100755
35-fi'` 35-fi'`
36- eval "$cmd" 36- eval "$cmd"
37-done 37-done
38+
39 # Use CC/CXX to run config.tests 38 # Use CC/CXX to run config.tests
40 mkdir -p "$outpath/config.tests" 39 mkdir -p "$outpath/config.tests"
41 rm -f "$outpath/config.tests/.qmake.cache" 40 rm -f "$outpath/config.tests/.qmake.cache"
42-- 41--
431.8.3.2 421.8.5.2
44 43
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0012-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
index b6c3ae31..b2b5ef9c 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0012-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
@@ -1,7 +1,7 @@
1From b4f8c636cb265951979868a65006ce49f442e5e7 Mon Sep 17 00:00:00 2001 1From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 9 May 2013 10:06:50 +0200 3Date: Thu, 9 May 2013 10:06:50 +0200
4Subject: [PATCH 12/22] configure.prf: Allow to add extra arguments to make 4Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make
5 5
6* sometimes we would like to add -e or define some variable and respect it from both 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 7 Makefiles used in configure tests and also Makefiles to build the application
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
15 15
16diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 16diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
17index b4569df..d189e50 100644 17index 39144e7..de48b07 100644
18--- a/mkspecs/features/configure.prf 18--- a/mkspecs/features/configure.prf
19+++ b/mkspecs/features/configure.prf 19+++ b/mkspecs/features/configure.prf
20@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { 20@@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
21 qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" 21 qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
22 22
23 # Clean up after previous run 23 # Clean up after previous run
@@ -33,5 +33,5 @@ index b4569df..d189e50 100644
33 msg = "test $$1 succeeded" 33 msg = "test $$1 succeeded"
34 write_file($$QMAKE_CONFIG_LOG, msg, append) 34 write_file($$QMAKE_CONFIG_LOG, msg, append)
35-- 35--
361.8.3.1 361.8.5.2
37 37
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
new file mode 100644
index 00000000..eea0c343
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
@@ -0,0 +1,49 @@
1From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a
5 configurable option
6
7Upstream-Status: Pending
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11---
12 configure | 21 +++++++++++++++++++++
13 1 file changed, 21 insertions(+)
14
15diff --git a/configure b/configure
16index 96c56c8..b3854aa 100755
17--- a/configure
18+++ b/configure
19@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do
20 UNKNOWN_OPT=yes
21 fi
22 ;;
23+ pulseaudio)
24+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
25+ CFG_PULSEAUDIO="$VAL"
26+ else
27+ UNKNOWN_OPT=yes
28+ fi
29+ ;;
30+ alsa)
31+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
32+ CFG_ALSA="$VAL"
33+ else
34+ UNKNOWN_OPT=yes
35+ fi
36+ ;;
37+ freetype)
38+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
39+ CFG_LIBFREETYPE="$VAL"
40+ else
41+ UNKNOWN_OPT=yes
42+ fi
43+ ;;
44 gtkstyle)
45 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
46 CFG_QGTKSTYLE="$VAL"
47--
481.8.5.2
49
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
index 70c0c0e0..b35597b7 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
@@ -1,12 +1,13 @@
1From b4d383bf47374c7132ecbcaec2c6aea31f858f54 Mon Sep 17 00:00:00 2001 1From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000 3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 21/22] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path 4Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to
5 to host binaries 5 determine path to host binaries
6 6
7Upstream-Status: Inappropiate (configuration) 7Upstream-Status: Inappropiate (configuration)
8 8
9Signed-off-by: Simon Busch <morphis@gravedo.de> 9Signed-off-by: Simon Busch <morphis@gravedo.de>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10--- 11---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 12 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- 13 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
@@ -14,7 +15,7 @@ Signed-off-by: Simon Busch <morphis@gravedo.de>
14 3 files changed, 6 insertions(+), 6 deletions(-) 15 3 files changed, 6 insertions(+), 6 deletions(-)
15 16
16diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 17diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
17index e01b448..5382730 100644 18index 1e00c74..a99b5bf 100644
18--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 19--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
19+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 20+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
20@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 21@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -80,5 +81,5 @@ index e5650ff..16ff007 100644
80 _qt5_Widgets_check_file_exists(${imported_location}) 81 _qt5_Widgets_check_file_exists(${imported_location})
81 82
82-- 83--
831.8.3.1 841.8.5.2
84 85
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
new file mode 100644
index 00000000..91370f17
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
@@ -0,0 +1,38 @@
1From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 10/12] Always build uic
5
6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target.
8
9Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
10Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 src/src.pro | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/src.pro b/src/src.pro
17index b7887a6..8801544 100644
18--- a/src/src.pro
19+++ b/src/src.pro
20@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 }
22 }
23 }
24-SUBDIRS += src_plugins src_tools_qdoc
25+SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
26
27 nacl: SUBDIRS -= src_network src_testlib
28
29@@ -156,4 +156,4 @@ TR_EXCLUDE = \
30 src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
31
32 sub-tools.depends = $$TOOLS
33-QMAKE_EXTRA_TARGETS = sub-tools
34\ No newline at end of file
35+QMAKE_EXTRA_TARGETS = sub-tools
36--
371.8.5.2
38
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch
index 1f5b62dc..1b1d85e3 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0005-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
1From 777d4bfc7a94256ec46f61bd80bc6058cdf55ebb Mon Sep 17 00:00:00 2001 1From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 05/22] qmake is already built in qtbase-native 4Subject: [PATCH 10/14] qmake is already built in qtbase-native
5 5
6Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 39a5deb..40f2b02 100755 16index b3854aa..15c89c7 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -4014,7 +4014,7 @@ setBootstrapEvalVariable() 19@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable()
20 20
21 21
22 # build qmake 22 # build qmake
@@ -26,5 +26,5 @@ index 39a5deb..40f2b02 100755
26 26
27 mkdir -p "$outpath/qmake" || exit 27 mkdir -p "$outpath/qmake" || exit
28-- 28--
291.8.3.1 291.8.5.2
30 30
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch
index 56b0fdd4..65b65aa7 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0006-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
1From c36477f621c7d682ee7140156127ad32e91a40ad Mon Sep 17 00:00:00 2001 1From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 29 Oct 2012 20:26:36 -0700 3Date: Mon, 29 Oct 2012 20:26:36 -0700
4Subject: [PATCH 06/22] Allow building a separate qmake for the target 4Subject: [PATCH 11/14] Allow building a separate qmake for the target
5 5
6Upstream-Status: Inappropriate [config] 6Upstream-Status: Inappropriate [config]
7 7
@@ -9,21 +9,22 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com> 9Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 10Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11--- 11---
12 qmake/qmake.pro | 1 + 12 qmake/qmake.pro | 2 ++
13 1 file changed, 1 insertion(+) 13 1 file changed, 2 insertions(+)
14 14
15diff --git a/qmake/qmake.pro b/qmake/qmake.pro 15diff --git a/qmake/qmake.pro b/qmake/qmake.pro
16index a81d0cd..ed7aebf 100644 16index 89d6ea5..7c605b9 100644
17--- a/qmake/qmake.pro 17--- a/qmake/qmake.pro
18+++ b/qmake/qmake.pro 18+++ b/qmake/qmake.pro
19@@ -8,6 +8,7 @@ CONFIG -= qt shared app_bundle uic 19@@ -8,6 +8,8 @@ CONFIG -= qt
20 DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ 20 DEFINES += \
21 PROEVALUATOR_FULL PROEVALUATOR_DEBUG 21 QT_BUILD_QMAKE \
22 DESTDIR = ../bin/ 22 PROEVALUATOR_FULL
23+DESTDIR = ../bin/
23+TARGET = qmake 24+TARGET = qmake
24 25
25 OBJECTS_DIR = . 26 VPATH += \
26 MOC_DIR = . 27 ../src/corelib/global \
27-- 28--
281.8.3.1 291.8.5.2
29 30
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch
index 048eab76..9335610d 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,7 +1,8 @@
1From 6cd7ade28662730e5de89a171501e3902b321ffc Mon Sep 17 00:00:00 2001 1From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500 3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH] configure: preserve built qmake and swap with native one 4Subject: [PATCH 11/12] configure: preserve built qmake and swap with native
5 one
5 6
6Let configure script build the real qmake, but right after it's built, swap 7Let configure script build the real qmake, but right after it's built, swap
7it with a native qmake for further internal use, preserving the real one. 8it with a native qmake for further internal use, preserving the real one.
@@ -12,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
12 1 file changed, 2 insertions(+) 13 1 file changed, 2 insertions(+)
13 14
14diff --git a/configure b/configure 15diff --git a/configure b/configure
15index 140c7b4..304d30f 100755 16index b3854aa..20836a6 100755
16--- a/configure 17--- a/configure
17+++ b/configure 18+++ b/configure
18@@ -4104,6 +4104,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 19@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
19 20
20 (cd "$outpath/qmake"; "$MAKE") || exit 2 21 (cd "$outpath/qmake"; "$MAKE") || exit 2
21 fi # Build qmake 22 fi # Build qmake
@@ -25,5 +26,5 @@ index 140c7b4..304d30f 100755
25 echo "Running configuration tests..." 26 echo "Running configuration tests..."
26 27
27-- 28--
281.8.3.2 291.8.5.2
29 30
diff --git a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch
index 3b312b67..d235797d 100644
--- a/recipes-qt/qt5/qtbase-5.1.1/0001-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
1From 9500744fee36c908d0cb7e034f8c8dd3dd1c4fa4 Mon Sep 17 00:00:00 2001 1From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:27:30 -0500 3Date: Mon, 11 Nov 2013 20:27:30 -0500
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters
5 5
6Increase the path length that gets hardcoded into generated config.cpp file 6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long. 7from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,18 +12,18 @@ 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
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index 304d30f..a37a587 100755 15index 20836a6..50661f4 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -3870,7 +3870,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 18@@ -3805,7 +3805,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 */
22-static const char qt_configure_prefix_path_strs[][256 + 12] = { 22-static const char qt_configure_prefix_path_strs[][256 + 12] = {
23+static const char qt_configure_prefix_path_strs[][512 + 12] = { 23+static const char qt_configure_prefix_path_strs[][512 + 12] = {
24 "qt_prfxpath=$QT_INSTALL_PREFIX", 24 #ifndef QT_BUILD_QMAKE
25 "qt_docspath=$QT_INSTALL_DOCS", 25 "qt_prfxpath=$QT_SYSROOT_PREFIX",
26 "qt_hdrspath=$QT_INSTALL_HEADERS", 26 "qt_docspath=$QT_SYSROOT_DOCS",
27-- 27--
281.8.3.2 281.8.5.2
29 29
diff --git a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch
index 9cf06419..591be8e5 100644
--- a/recipes-qt/qt5/qtbase-git/0015-qtbase-allow-build-of-examples.patch
+++ b/recipes-qt/qt5/qtbase/0012-qtbase-allow-build-of-examples.patch
@@ -1,7 +1,7 @@
1From 1936e953e2273c204230c931c0b86b34107340c7 Mon Sep 17 00:00:00 2001 1From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sat, 25 May 2013 17:34:32 +0200 3Date: Sat, 25 May 2013 17:34:32 +0200
4Subject: [PATCH 15/23] qtbase: allow build of examples 4Subject: [PATCH 12/14] qtbase: allow build of examples
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644
44- } 44- }
45 } 45 }
46-- 46--
471.8.3.2 471.8.5.2
48 48
diff --git a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
index e26d237f..9bef55af 100644
--- a/recipes-qt/qt5/qtbase-git/0018-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From b485950725b776bc1f0cf4edd5330d61732262cb Mon Sep 17 00:00:00 2001 1From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 18/23] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 5 files changed, 23 insertions(+), 4 deletions(-) 20 5 files changed, 23 insertions(+), 4 deletions(-)
21 21
22diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp 22diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
23index f0e7e49..fe9a30c 100644 23index fa392d1..5df1762 100644
24--- a/src/gui/opengl/qopenglpaintdevice.cpp 24--- a/src/gui/opengl/qopenglpaintdevice.cpp
25+++ b/src/gui/opengl/qopenglpaintdevice.cpp 25+++ b/src/gui/opengl/qopenglpaintdevice.cpp
26@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate 26@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
@@ -76,10 +76,10 @@ index c05571c..01eb1bc 100644
76 void setSize(const QSize &size); 76 void setSize(const QSize &size);
77 void setDevicePixelRatio(qreal devicePixelRatio); 77 void setDevicePixelRatio(qreal devicePixelRatio);
78diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp 78diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
79index 78f5080..20db620 100644 79index 0513551..f6aeb15 100644
80--- a/src/gui/opengl/qopenglpaintengine.cpp 80--- a/src/gui/opengl/qopenglpaintengine.cpp
81+++ b/src/gui/opengl/qopenglpaintengine.cpp 81+++ b/src/gui/opengl/qopenglpaintengine.cpp
82@@ -2004,7 +2004,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) 82@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
83 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) 83 for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
84 d->vertexAttributeArraysEnabledState[i] = false; 84 d->vertexAttributeArraysEnabledState[i] = false;
85 85
@@ -90,7 +90,7 @@ index 78f5080..20db620 100644
90 d->width = sz.width(); 90 d->width = sz.width();
91 d->height = sz.height(); 91 d->height = sz.height();
92 d->mode = BrushDrawingMode; 92 d->mode = BrushDrawingMode;
93@@ -2092,7 +2095,7 @@ void QOpenGL2PaintEngineEx::ensureActive() 93@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
94 d->device->ensureActiveTarget(); 94 d->device->ensureActiveTarget();
95 95
96 d->transferMode(BrushDrawingMode); 96 d->transferMode(BrushDrawingMode);
@@ -99,7 +99,7 @@ index 78f5080..20db620 100644
99 d->needsSync = false; 99 d->needsSync = false;
100 d->lastMaskTextureUsed = 0; 100 d->lastMaskTextureUsed = 0;
101 d->shaderManager->setDirty(); 101 d->shaderManager->setDirty();
102@@ -2135,6 +2138,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 102@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
103 if (bounds == QRect(0, 0, width, height)) { 103 if (bounds == QRect(0, 0, width, height)) {
104 glDisable(GL_SCISSOR_TEST); 104 glDisable(GL_SCISSOR_TEST);
105 } else { 105 } else {
@@ -107,7 +107,7 @@ index 78f5080..20db620 100644
107 glEnable(GL_SCISSOR_TEST); 107 glEnable(GL_SCISSOR_TEST);
108 setScissor(bounds); 108 setScissor(bounds);
109 } 109 }
110@@ -2143,14 +2147,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() 110@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
111 111
112 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) 112 void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
113 { 113 {
@@ -137,10 +137,10 @@ index d51f0e5..0d4b38d 100644
137 QOpenGLContext *ctx; 137 QOpenGLContext *ctx;
138 EngineMode mode; 138 EngineMode mode;
139diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp 139diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
140index 7d49c03..d9eb3fe 100644 140index 3b62d1d..a5d1f7e 100644
141--- a/src/gui/opengl/qopengltextureglyphcache.cpp 141--- a/src/gui/opengl/qopengltextureglyphcache.cpp
142+++ b/src/gui/opengl/qopengltextureglyphcache.cpp 142+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
143@@ -271,7 +271,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) 143@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
144 funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); 144 funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
145 145
146 if (pex != 0) { 146 if (pex != 0) {
@@ -150,5 +150,5 @@ index 7d49c03..d9eb3fe 100644
150 } else { 150 } else {
151 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR)); 151 m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
152-- 152--
1531.8.3.2 1531.8.5.2
154 154
diff --git a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
index a2dc5fb8..5b5d18f0 100644
--- a/recipes-qt/qt5/qtbase-git/0014-enables-tslib-device-to-be-read-from-env-variable.patch
+++ b/recipes-qt/qt5/qtbase/0014-enables-tslib-device-to-be-read-from-env-variable.patch
@@ -1,7 +1,7 @@
1From 99c5a9d546a37e244bfc12b0aa134fccd31905b9 Mon Sep 17 00:00:00 2001 1From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Mon, 27 May 2013 18:32:37 +0200 3Date: Mon, 27 May 2013 18:32:37 +0200
4Subject: [PATCH 14/23] enables tslib device to be read from env variable 4Subject: [PATCH 14/14] enables tslib device to be read from env variable
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -31,5 +31,5 @@ index 6986fd5..2ed4a69 100644
31 device = specification.toLocal8Bit(); 31 device = specification.toLocal8Bit();
32 32
33-- 33--
341.8.3.2 341.8.5.2
35 35
diff --git a/recipes-qt/qt5/qtbase_5.1.1.bb b/recipes-qt/qt5/qtbase_5.1.1.bb
deleted file mode 100644
index 8fd161a8..00000000
--- a/recipes-qt/qt5/qtbase_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "955d1e4da875f3872ef3208f21a757dd"
5SRC_URI[sha256sum] = "d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9"
diff --git a/recipes-qt/qt5/qtbase_5.2.0.bb b/recipes-qt/qt5/qtbase_5.2.0.bb
new file mode 100644
index 00000000..aca8dea0
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
5SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 30d5b237..bd8a6f69 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,6 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRC_URI += "file://0025-QHttpMultiPart-fix-data-corruption-in-readData-metho.patch" 4SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
5
6SRCREV = "bd1dc60d6555a901fb3005273d7a86efe470739a"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 334ae353..4373e5ea 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${BPN}.inc 2require ${BPN}.inc
3 3
4SRCREV = "c21addb23f2eb67dc55853b115e5b735df065891" 4SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953"
diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
deleted file mode 100644
index d355e488..00000000
--- a/recipes-qt/qt5/qtdeclarative-5.1.1/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 6d28b0ec1bc93fea7502fadfbc12f8198ccf9d14 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
3Date: Wed, 5 Jun 2013 19:23:32 +0200
4Subject: [PATCH 3/3] Fix wrong calculation of viewPort for transitions
5
6Viewport is calculated wrong for horizontal layout in a second instance
7
8Task-number: QTBUG-29944
9Task-Number: QTBUG-31546
10
11Upstream-Status: Pending
12
13Looks like backport of https://codereview.qt-project.org/49226 but this
14one was applied in previous patch, this change looks the same but is
15in different part of qquickitemview.cpp and ISN'T applied yet in dev
16branch.
17
18Signed-off-by: Florian Haenel <florian.haenel@lge.com>
19Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20
21Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
22---
23 src/quick/items/qquickitemview.cpp | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
27index a6dabee..290f283 100644
28--- a/src/quick/items/qquickitemview.cpp
29+++ b/src/quick/items/qquickitemview.cpp
30@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout()
31
32 prepareVisibleItemTransitions();
33
34- QRectF viewBounds(0, position(), q->width(), q->height());
35+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
36 for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
37 it != releasePendingTransition.end(); ) {
38 FxViewItem *item = *it;
39--
401.8.3.2
41
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
deleted file mode 100644
index 7a68dd53..00000000
--- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH 1/3] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Signed-off-by: Eric Bénard <eric@eukrea.com>
15---
16 examples/qmltest/qmltest/qmltest.pro | 2 +-
17 tools/qmltestrunner/qmltestrunner.pro | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
21index b5893c5..1b00e6c 100644
22--- a/examples/qmltest/qmltest/qmltest.pro
23+++ b/examples/qmltest/qmltest/qmltest.pro
24@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
25 # This code exists solely for the purpose of building this example
26 # inside the examples/ hierarchy.
27
28-QT += qml qmltest
29+QT += qml qmltest quick
30
31 macx: CONFIG -= app_bundle
32
33diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
34index 5184c1f..668cf17 100644
35--- a/tools/qmltestrunner/qmltestrunner.pro
36+++ b/tools/qmltestrunner/qmltestrunner.pro
37@@ -1,5 +1,5 @@
38 SOURCES += main.cpp
39
40-QT += qml qmltest
41+QT += qml qmltest quick
42
43 load(qt_tool)
44--
451.8.3.2
46
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index 6569c69e..12e650fa 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -1,3 +1,8 @@
1require qt5.inc 1require qt5.inc
2 2
3DEPENDS += "qtjsbackend qtsvg qtxmlpatterns" 3SRC_URI += " \
4 file://0001-qmltestexample-fix-link.patch \
5 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
6"
7
8DEPENDS += "qtsvg qtxmlpatterns"
diff --git a/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index 7a68dd53..7a68dd53 100644
--- a/recipes-qt/qt5/qtdeclarative-5.1.1/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
diff --git a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
index 84f8f661..84f8f661 100644
--- a/recipes-qt/qt5/qtdeclarative-git/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
diff --git a/recipes-qt/qt5/qtdeclarative_5.1.1.bb b/recipes-qt/qt5/qtdeclarative_5.1.1.bb
deleted file mode 100644
index be724691..00000000
--- a/recipes-qt/qt5/qtdeclarative_5.1.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI += " \
5 file://0001-qmltestexample-fix-link.patch \
6 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
7"
8
9SRC_URI[md5sum] = "486fc16ad7b7d0c1488ba5482536d66c"
10SRC_URI[sha256sum] = "0ee989a5d45a94e927609b22e2413c7f2788a7b4a23af66ecfa15c31db2a9b31"
11
12# /usr/lib/qt5/qml/QtQuick/Dialogs/images/*.png
13FILES_${PN}-qmlplugins += " \
14 ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
15"
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.0.bb b/recipes-qt/qt5/qtdeclarative_5.2.0.bb
new file mode 100644
index 00000000..a88f50f2
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202"
5SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 407dd886..9190800c 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,9 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRC_URI += " \ 4SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de"
5 file://0001-qmltestexample-fix-link.patch \
6 file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
7"
8
9SRCREV = "672354676d8e968e2523d1aeb450213a46b8b27c"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb
deleted file mode 100644
index 311f1134..00000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "40d0989d68fb08c1184b7d5088da9c48"
5SRC_URI[sha256sum] = "347c33ee496d67d98d64b6fa43797c45eae85752bb0026eb234bfb420f77febf"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb
new file mode 100644
index 00000000..df36dc6a
--- /dev/null
+++ b/recipes-qt/qt5/qtgraphicaleffects_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd"
5SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 3f0f8790..c1bd9fad 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "94ba2a255c4ca7f07e024c9dedf5547f371fd3a2" 4SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb"
diff --git a/recipes-qt/qt5/qtimageformats_5.1.1.bb b/recipes-qt/qt5/qtimageformats_5.1.1.bb
deleted file mode 100644
index ccb539ac..00000000
--- a/recipes-qt/qt5/qtimageformats_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "209edddd5899b36ea7ea7ad52204a593"
5SRC_URI[sha256sum] = "3bbb7825c0298c7d95d26b205e48da02c5bac3b35d66a601f939f8ee8b3463a4"
diff --git a/recipes-qt/qt5/qtimageformats_5.2.0.bb b/recipes-qt/qt5/qtimageformats_5.2.0.bb
new file mode 100644
index 00000000..a12e5d8b
--- /dev/null
+++ b/recipes-qt/qt5/qtimageformats_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55"
5SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 1bb88ae0..856bfba7 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "a196fc62304ae23e68f60ae85a6106692f419f98" 4SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571"
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
deleted file mode 100644
index 1f94e4ce..00000000
--- a/recipes-qt/qt5/qtjsbackend-5.1.1/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 973d4f0974c0b9c2504c56a2b9b8d6c709275ee4 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:20:13 -0800
4Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
9---
10 src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
14index 16beb02..5e327f7 100644
15--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
16+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
17@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
18
19 # We don't need to install this tool, it's only used for building v8.
20 # However we do have to make sure that 'make install' builds it.
21-dummytarget.CONFIG = dummy_install
22-INSTALLS += dummytarget
23+#dummytarget.CONFIG = dummy_install
24+#INSTALLS += dummytarget
25+
26+# Install the tool so that during target cross compilation we have access to the native side binary
27+target.path = $$[QT_HOST_BINS]
28+INSTALLS += target
29+
30--
311.8.3.2
32
diff --git a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch
deleted file mode 100644
index d9bb5b43..00000000
--- a/recipes-qt/qt5/qtjsbackend-5.1.1/0002-v8.pro-respect-external-host-bindir-when-set.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From b0610cdb0c53be6da6d8f94be9af40bf50075368 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 02:45:01 +0200
4Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/v8/v8.pro | 5 ++++-
11 1 file changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/v8/v8.pro b/src/v8/v8.pro
14index 2be6a19..d3da4e1 100644
15--- a/src/v8/v8.pro
16+++ b/src/v8/v8.pro
17@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
18 include(v8.pri)
19
20 contains(QT_CONFIG, v8snapshot) {
21- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
22+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
23+ !exists($$mkv8snapshot.tool): \
24+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
25+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
26 DUMMY_FILE = v8.pro
27 mkv8snapshot.input = DUMMY_FILE
28 mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
29--
301.8.3.2
31
diff --git a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch b/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
deleted file mode 100644
index e823b761..00000000
--- a/recipes-qt/qt5/qtjsbackend-git/0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 8ae71a0a3b898f95485148c9b2e89aeee9cf27e9 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 4 Dec 2012 11:20:13 -0800
4Subject: [PATCH 1/2] Install the mkv8snapshot tool to the native side
5
6Upstream-Status: Inappropriate [configuration]
7
8Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
9---
10 src/tools/mkv8snapshot/mkv8snapshot.pro | 9 +++++++--
11 1 file changed, 7 insertions(+), 2 deletions(-)
12
13diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro
14index 16beb02..5e327f7 100644
15--- a/src/tools/mkv8snapshot/mkv8snapshot.pro
16+++ b/src/tools/mkv8snapshot/mkv8snapshot.pro
17@@ -24,5 +24,10 @@ unix:LIBS += -lpthread
18
19 # We don't need to install this tool, it's only used for building v8.
20 # However we do have to make sure that 'make install' builds it.
21-dummytarget.CONFIG = dummy_install
22-INSTALLS += dummytarget
23+#dummytarget.CONFIG = dummy_install
24+#INSTALLS += dummytarget
25+
26+# Install the tool so that during target cross compilation we have access to the native side binary
27+target.path = $$[QT_HOST_BINS]
28+INSTALLS += target
29+
30--
311.8.3.2
32
diff --git a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch b/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch
deleted file mode 100644
index b0ac27d1..00000000
--- a/recipes-qt/qt5/qtjsbackend-git/0002-v8.pro-respect-external-host-bindir-when-set.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From c40e89b048e225cfb961ac65a96a30ce3ec624f5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 02:45:01 +0200
4Subject: [PATCH 2/2] v8.pro: respect external-host-bindir, when set
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/v8/v8.pro | 5 ++++-
11 1 file changed, 4 insertions(+), 1 deletion(-)
12
13diff --git a/src/v8/v8.pro b/src/v8/v8.pro
14index 2be6a19..d3da4e1 100644
15--- a/src/v8/v8.pro
16+++ b/src/v8/v8.pro
17@@ -25,7 +25,10 @@ INCLUDEPATH -= $$MODULE_INCLUDES $$MODULE_INCLUDES/..
18 include(v8.pri)
19
20 contains(QT_CONFIG, v8snapshot) {
21- mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
22+ mkv8snapshot.tool=$$[QT_EXTERNAL_HOST_BINS]/mkv8snapshot$$qtPlatformTargetSuffix()
23+ !exists($$mkv8snapshot.tool): \
24+ mkv8snapshot.tool=../../bin/mkv8snapshot$$qtPlatformTargetSuffix()
25+ mkv8snapshot.commands = $$mkv8snapshot.tool ${QMAKE_FILE_OUT}
26 DUMMY_FILE = v8.pro
27 mkv8snapshot.input = DUMMY_FILE
28 mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp
29--
301.8.3.2
31
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc
deleted file mode 100644
index 30663b87..00000000
--- a/recipes-qt/qt5/qtjsbackend-native.inc
+++ /dev/null
@@ -1,24 +0,0 @@
1# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git
2LICENSE = "LGPL-2.1 | GPL-3.0"
3LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
4 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
5 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
6"
7
8DEPENDS = "qtbase-native"
9
10QT_MODULE = "qtjsbackend"
11
12require qt5-native.inc
13
14SRC_URI += "\
15 file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
16"
17
18do_configure() {
19 ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
20}
21
22do_install() {
23 oe_runmake install INSTALL_ROOT=${D}
24}
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb
deleted file mode 100644
index aac7b850..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f"
5SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
diff --git a/recipes-qt/qt5/qtjsbackend-native_git.bb b/recipes-qt/qt5/qtjsbackend-native_git.bb
deleted file mode 100644
index 29e97c49..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_git.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require qt5-git.inc
2require ${PN}.inc
3
4SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
diff --git a/recipes-qt/qt5/qtjsbackend.inc b/recipes-qt/qt5/qtjsbackend.inc
deleted file mode 100644
index 66afc948..00000000
--- a/recipes-qt/qt5/qtjsbackend.inc
+++ /dev/null
@@ -1,14 +0,0 @@
1require qt5.inc
2
3# doesn't have GFDL-1.3 like qtbase, LICENSE files are missing in 5.0.0 and 5.0.1, this is for 5.0.2 and git
4LICENSE = "LGPL-2.1 | GPL-3.0"
5LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
6 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
7 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
8"
9
10DEPENDS += "qtbase qtjsbackend-native"
11
12SRC_URI += " \
13 file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
14"
diff --git a/recipes-qt/qt5/qtjsbackend_5.1.1.bb b/recipes-qt/qt5/qtjsbackend_5.1.1.bb
deleted file mode 100644
index aac7b850..00000000
--- a/recipes-qt/qt5/qtjsbackend_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "7225169d7d166cc5660384a85e4d4a2f"
5SRC_URI[sha256sum] = "42628eac133738df30e9104c2014eb70478e8fcf2cc86c1f500359c12216b192"
diff --git a/recipes-qt/qt5/qtjsbackend_git.bb b/recipes-qt/qt5/qtjsbackend_git.bb
deleted file mode 100644
index 29e97c49..00000000
--- a/recipes-qt/qt5/qtjsbackend_git.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require qt5-git.inc
2require ${PN}.inc
3
4SRCREV = "904d8b8825aa82dbc6b888968f983ba6aa339832"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 66032b6a..d5d7e844 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,10 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# qtlocation wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 4SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382"
5PV = "4.999+5.0.0-beta1+git${SRCPV}"
6
7# drop when bumping SRCREV
8PR = "r1"
9
10SRCREV = "f28408346243cf090326f4738fd838219c21e00f"
diff --git a/recipes-qt/qt5/qtmultimedia_5.1.1.bb b/recipes-qt/qt5/qtmultimedia_5.1.1.bb
deleted file mode 100644
index f8b61ce4..00000000
--- a/recipes-qt/qt5/qtmultimedia_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "4b6e74bd7752bc241617f41539632bba"
5SRC_URI[sha256sum] = "df907a81c4ef15c9aec216c1f57aa72a7a7b274ea3cb3950f87fa1b04e369ebe"
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.0.bb b/recipes-qt/qt5/qtmultimedia_5.2.0.bb
new file mode 100644
index 00000000..9f3f5b1a
--- /dev/null
+++ b/recipes-qt/qt5/qtmultimedia_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365"
5SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index d1eced6c..8ba720f1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "c74b544610376c753ea0a29ff2465e2bcfe70e1d" 4SRCREV = "ea9f9788d502d4a4307a464d87a00be198df09ad"
diff --git a/recipes-qt/qt5/qtquick1_5.1.1.bb b/recipes-qt/qt5/qtquick1_5.1.1.bb
deleted file mode 100644
index bc076004..00000000
--- a/recipes-qt/qt5/qtquick1_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "05956168e0a4bba44c31b61dd4fc5e6e"
5SRC_URI[sha256sum] = "f5dc431fb33a195414d2d75d7dff1c101f4101489f38b4ea9c5e8782b1807a64"
diff --git a/recipes-qt/qt5/qtquick1_5.2.0.bb b/recipes-qt/qt5/qtquick1_5.2.0.bb
new file mode 100644
index 00000000..bc3df43f
--- /dev/null
+++ b/recipes-qt/qt5/qtquick1_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "4535ff78b5a9a18ffba702298a48e22e"
5SRC_URI[sha256sum] = "ae868892a586cd0622a558fda6ebada8edadb575edf3b50e5569fd7115b6e805"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 1d4a7253..1a83f108 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" 4SRCREV = "2866c00375313d1726cc0473b6b7bfc87b984c78"
diff --git a/recipes-qt/qt5/qtquickcontrols_5.1.1.bb b/recipes-qt/qt5/qtquickcontrols_5.1.1.bb
deleted file mode 100644
index ea6c7f97..00000000
--- a/recipes-qt/qt5/qtquickcontrols_5.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "6482ee0c4b11119ae5cb5080e61c18c0"
5SRC_URI[sha256sum] = "52fe58cb83f7b76d46abd12485713a7bd62a3b2739a7271098e0a1ea25d9fec3"
6
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.0.bb b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb
new file mode 100644
index 00000000..99c5bc0c
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_5.2.0.bb
@@ -0,0 +1,6 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "748ab947f59fb104db2ac1fefa073d81"
5SRC_URI[sha256sum] = "c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c"
6
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index ded017bd..76f96ea4 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "c304d741a27b5822a35d1fb83f8f5e65719907ce" 4SRCREV = "1d684b38a4fb0b8ce33401fa9c8f415eba6097bf"
diff --git a/recipes-qt/qt5/qtscript_5.1.1.bb b/recipes-qt/qt5/qtscript_5.1.1.bb
deleted file mode 100644
index d43e7891..00000000
--- a/recipes-qt/qt5/qtscript_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "5c0e8633fbf560f711b7af689f8bcb99"
5SRC_URI[sha256sum] = "d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364"
diff --git a/recipes-qt/qt5/qtscript_5.2.0.bb b/recipes-qt/qt5/qtscript_5.2.0.bb
new file mode 100644
index 00000000..c477d9ec
--- /dev/null
+++ b/recipes-qt/qt5/qtscript_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "37d32c983c3fdf5b29f932265046f2e3"
5SRC_URI[sha256sum] = "ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 4328b583..fd98b672 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "a8e3602554c3225046a831cad7a727a56501439b" 4SRCREV = "15bb30b0e90c628cc3812627923d1d459d461505"
diff --git a/recipes-qt/qt5/qtsensors_5.1.1.bb b/recipes-qt/qt5/qtsensors_5.1.1.bb
deleted file mode 100644
index a363d872..00000000
--- a/recipes-qt/qt5/qtsensors_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "219607895e15348d723fa67324d7061a"
5SRC_URI[sha256sum] = "07f2d94964b47786a33ba1e24049c81b29e95b791647f9116ea350dc4cbc814f"
diff --git a/recipes-qt/qt5/qtsensors_5.2.0.bb b/recipes-qt/qt5/qtsensors_5.2.0.bb
new file mode 100644
index 00000000..7eabd189
--- /dev/null
+++ b/recipes-qt/qt5/qtsensors_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "718606a6f76afa20c6cd2e0433356ac2"
5SRC_URI[sha256sum] = "5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 7d082a1d..db5f8169 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "0862901b142f36e91b98dbdcb2c36585020bb33d" 4SRCREV = "8b501195f623fbcf31b591a1414e1726dbb7ce84"
diff --git a/recipes-qt/qt5/qtserialport.inc b/recipes-qt/qt5/qtserialport.inc
index bbb05a65..d559677e 100644
--- a/recipes-qt/qt5/qtserialport.inc
+++ b/recipes-qt/qt5/qtserialport.inc
@@ -1,3 +1,9 @@
1require qt5.inc 1require qt5.inc
2 2
3# whitespace change in LGPL_EXCEPTION.txt and a bit different formating in LICENSE.LGPL
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
5 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
6 file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\
7"
8
3DEPENDS += "qtbase" 9DEPENDS += "qtbase"
diff --git a/recipes-qt/qt5/qtserialport_5.1.1.bb b/recipes-qt/qt5/qtserialport_5.1.1.bb
deleted file mode 100644
index 78c982a5..00000000
--- a/recipes-qt/qt5/qtserialport_5.1.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
5 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
6 file://LGPL_EXCEPTION.txt;md5=eb6c371255e1262c55ae9b652a90b528\
7"
8
9SRC_URI[md5sum] = "83bba7e8f27d6d6d5a0d2fdcb5641d7f"
10SRC_URI[sha256sum] = "aee1a277b64dc70be6d7d0504e35f2df52a83b41ab65c344119e76222ceb063b"
diff --git a/recipes-qt/qt5/qtserialport_5.2.0.bb b/recipes-qt/qt5/qtserialport_5.2.0.bb
new file mode 100644
index 00000000..03dae6c0
--- /dev/null
+++ b/recipes-qt/qt5/qtserialport_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "7b90e0707b698331226e662bd39945e9"
5SRC_URI[sha256sum] = "c7d5bb58d6c574275102d088159d0323aac40a639ceb4224aa06c34d2fe8d292"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
new file mode 100644
index 00000000..af2cf22b
--- /dev/null
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -0,0 +1,4 @@
1require qt5-git.inc
2require ${PN}.inc
3
4SRCREV = "97bbe2acd8b4c14315653a3d9dc5757d6518220e"
diff --git a/recipes-qt/qt5/qtsvg_5.1.1.bb b/recipes-qt/qt5/qtsvg_5.1.1.bb
deleted file mode 100644
index 4dcb243e..00000000
--- a/recipes-qt/qt5/qtsvg_5.1.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "9db8209602b0ea942273e01a874ea5b7"
5SRC_URI[sha256sum] = "6bfe7705ff58391205ca797d84ca6dda57ebcce106fdff52d4908b0e443567bf"
6
diff --git a/recipes-qt/qt5/qtsvg_5.2.0.bb b/recipes-qt/qt5/qtsvg_5.2.0.bb
new file mode 100644
index 00000000..e300b4c8
--- /dev/null
+++ b/recipes-qt/qt5/qtsvg_5.2.0.bb
@@ -0,0 +1,6 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "3f6132475f6edcd7b6cfb57650846185"
5SRC_URI[sha256sum] = "bad23ebcebf8e91cc727b229a3f87f95829edfd2a7653d47e97b154aac687c59"
6
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index fef5ecdb..a727e833 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "a29af8f024c8fb4bfdf1ce9e6c03387c3abcaffa" 4SRCREV = "b719b93770393bbf20251e1dffc70498061e612c"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 5456dfb7..80c9309d 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -1,12 +1,9 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 4# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
5PV = "4.999+5.0.0-beta1+git${SRCPV}" 5# # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0
6
7# drop when bumping SRCREV
8PR = "r1"
9 6
10QT_MODULE_BRANCH = "dev" 7QT_MODULE_BRANCH = "dev"
11 8
12SRCREV = "701442ad6358b9f27978aafae82074124468f88c" 9SRCREV = "d6104a92321c2e72b140156fddf0378c9795cdb4"
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
deleted file mode 100644
index b1145be1..00000000
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ /dev/null
@@ -1,138 +0,0 @@
1From 3a1d11f3391d7745a01a68629d04f8b5b3c40ffb Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
13---
14 examples/examples.pro | 4 ++--
15 src/designer/src/src.pro | 16 +++++++++-------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 10 ++++++----
18 tests/auto/auto.pro | 22 ++++++++++++----------
19 5 files changed, 30 insertions(+), 24 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 4955969..8e86419 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,3 +1,3 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28-
29+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
30+qtHaveModule(widgets): SUBDIRS += linguist uitools
31diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
32index e02ca8e..49527c5 100644
33--- a/src/designer/src/src.pro
34+++ b/src/designer/src/src.pro
35@@ -1,18 +1,20 @@
36 TEMPLATE = subdirs
37
38-SUBDIRS = \
39- uitools \
40- lib \
41- components \
42- designer
43+!linguistonly {
44+ SUBDIRS = \
45+ lib \
46+ components \
47+ designer
48+}
49+SUBDIRS += uitools
50
51-contains(QT_CONFIG, shared): SUBDIRS += plugins
52+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
53
54 components.depends = lib
55 designer.depends = components
56 plugins.depends = lib
57
58-qtNomakeTools( \
59+!linguistonly:qtNomakeTools( \
60 lib \
61 components \
62 designer \
63diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
64index df3c0c7..75bdf26 100644
65--- a/src/linguist/linguist.pro
66+++ b/src/linguist/linguist.pro
67@@ -3,7 +3,7 @@ SUBDIRS = \
68 lrelease \
69 lupdate \
70 lconvert
71-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
72+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
73
74 qtNomakeTools( \
75 linguist \
76diff --git a/src/src.pro b/src/src.pro
77index c8756db..d71c4a0 100644
78--- a/src/src.pro
79+++ b/src/src.pro
80@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
81 no-png {
82 message("Some graphics-related tools are unavailable without PNG support")
83 } else {
84- SUBDIRS = assistant \
85+ !linguistonly {
86+ SUBDIRS = assistant \
87 pixeltool \
88- qtestlib \
89- designer
90+ qtestlib
91+ }
92+ SUBDIRS += designer
93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
94
95 linguist.depends = designer
96@@ -20,7 +22,7 @@ mac {
97 SUBDIRS += macdeployqt
98 }
99
100-qtHaveModule(dbus): SUBDIRS += qdbus
101+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
102
103 qtNomakeTools( \
104 pixeltool \
105diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
106index eaf440b..1778ad1 100644
107--- a/tests/auto/auto.pro
108+++ b/tests/auto/auto.pro
109@@ -1,14 +1,16 @@
110 TEMPLATE=subdirs
111-SUBDIRS=\
112- linguist \
113- host.pro \
114- qhelpcontentmodel \
115- qhelpenginecore \
116- qhelpgenerator \
117- qhelpindexmodel \
118- qhelpprojectdata \
119- cmake \
120- installed_cmake
121+!linguistonly {
122+ SUBDIRS=\
123+ linguist \
124+ host.pro \
125+ qhelpcontentmodel \
126+ qhelpenginecore \
127+ qhelpgenerator \
128+ qhelpindexmodel \
129+ qhelpprojectdata \
130+ cmake \
131+ installed_cmake
132+}
133
134 installed_cmake.depends = cmake
135
136--
1371.8.3.2
138
diff --git a/recipes-qt/qt5/qttools-native_5.1.1.bb b/recipes-qt/qt5/qttools-native_5.1.1.bb
deleted file mode 100644
index e10484e3..00000000
--- a/recipes-qt/qt5/qttools-native_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "022073d32ff9d408de0182b5d1f01781"
5SRC_URI[sha256sum] = "2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6"
diff --git a/recipes-qt/qt5/qttools-native_5.2.0.bb b/recipes-qt/qt5/qttools-native_5.2.0.bb
new file mode 100644
index 00000000..0effa1bf
--- /dev/null
+++ b/recipes-qt/qt5/qttools-native_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
5SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index bc1ec2a1..72006ed8 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "441f3d964301942e417b238b6e71b2ad13b976f0" 4SRCREV = "a60aa90f5ca00e32a1271a476f5da650dddebfda"
diff --git a/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index a5f26a3c..ec82bb94 100644
--- a/recipes-qt/qt5/qttools-5.1.1/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
1From 9337242944c936104db5eee64df804a27fb02bb8 Mon Sep 17 00:00:00 2001 1From a4af5dd2b0449df19271b22a62a03f70598106f0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
@@ -61,7 +61,7 @@ index e02ca8e..49527c5 100644
61 components \ 61 components \
62 designer \ 62 designer \
63diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro 63diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
64index df3c0c7..75bdf26 100644 64index 2979a23..663bdd5 100644
65--- a/src/linguist/linguist.pro 65--- a/src/linguist/linguist.pro
66+++ b/src/linguist/linguist.pro 66+++ b/src/linguist/linguist.pro
67@@ -3,7 +3,7 @@ SUBDIRS = \ 67@@ -3,7 +3,7 @@ SUBDIRS = \
@@ -74,7 +74,7 @@ index df3c0c7..75bdf26 100644
74 qtNomakeTools( \ 74 qtNomakeTools( \
75 linguist \ 75 linguist \
76diff --git a/src/src.pro b/src/src.pro 76diff --git a/src/src.pro b/src/src.pro
77index c8756db..d71c4a0 100644 77index 866a199..ec08874 100644
78--- a/src/src.pro 78--- a/src/src.pro
79+++ b/src/src.pro 79+++ b/src/src.pro
80@@ -4,10 +4,12 @@ qtHaveModule(widgets) { 80@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -93,15 +93,15 @@ index c8756db..d71c4a0 100644
93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig 93 # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
94 94
95 linguist.depends = designer 95 linguist.depends = designer
96@@ -20,7 +22,7 @@ mac { 96@@ -25,7 +27,7 @@ android {
97 SUBDIRS += macdeployqt 97 SUBDIRS += androiddeployqt
98 } 98 }
99 99
100-qtHaveModule(dbus): SUBDIRS += qdbus 100-qtHaveModule(dbus): SUBDIRS += qdbus
101+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus 101+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
102 102
103 qtNomakeTools( \ 103 win32|winrt:SUBDIRS += windeployqt
104 pixeltool \ 104
105diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro 105diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
106index eaf440b..1778ad1 100644 106index eaf440b..1778ad1 100644
107--- a/tests/auto/auto.pro 107--- a/tests/auto/auto.pro
@@ -134,5 +134,5 @@ index eaf440b..1778ad1 100644
134 installed_cmake.depends = cmake 134 installed_cmake.depends = cmake
135 135
136-- 136--
1371.8.3.1 1371.8.4.3
138 138
diff --git a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch b/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
deleted file mode 100644
index 0571ea5e..00000000
--- a/recipes-qt/qt5/qtwayland-git/0001-xcbcommon-should-not-be-a-mandatory-dependency.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 7f97da120b5b3dde22c9d89a8da8a4f35a9f2a26 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Tue, 19 Feb 2013 11:16:05 -0800
4Subject: [PATCH 1/3] xcbcommon should not be a mandatory dependency
5
6Not all platforms that use qtwayland depend on xcbcommon to be present
7for them to be functional
8
9This change won't be needed when this commit from dev branch is merged
10to stable:
11commit 894adf8a447865119be7c6c4d01577d8032f4177
12Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
13Date: Mon Apr 8 12:54:58 2013 +0200
14
15make failure to configure wayland non-fatal for a top-level build of qt
16
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18---
19 qtwayland.pro | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/qtwayland.pro b/qtwayland.pro
23index 24e104b..66dd38a 100644
24--- a/qtwayland.pro
25+++ b/qtwayland.pro
26@@ -11,7 +11,7 @@ qtCompileTest(xcomposite)
27 load(qt_parts)
28
29 !config_wayland {
30- error(QtWayland requires Wayland 1.0.3 or higher)
31+ error("QtWayland requires Wayland 1.0.3 or higher")
32 }
33
34 !config_xkbcommon {
35@@ -19,7 +19,7 @@ load(qt_parts)
36 }
37
38 !config_wayland_scanner {
39- error(QtWayland requires wayland-scanner)
40+ error("QtWayland requires wayland-scanner")
41 }
42
43 !config_wayland_egl {
44--
451.8.2.1
46
diff --git a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch b/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch
deleted file mode 100644
index 77172908..00000000
--- a/recipes-qt/qt5/qtwayland-git/0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5b7c89d211a193acfd182eb0519b658629af3193 Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Fri, 1 Mar 2013 13:00:53 -0800
4Subject: [PATCH 2/3] Temporarily patching this out as Qt5.0.0 does not have
5 qtHaveModule
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 src/compositor/compositor_api/compositor_api.pri | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri
13index f0bbe76..e7905e5 100644
14--- a/src/compositor/compositor_api/compositor_api.pri
15+++ b/src/compositor/compositor_api/compositor_api.pri
16@@ -12,7 +12,7 @@ SOURCES += \
17
18 QT += core-private
19
20-qtHaveModule(quick) {
21+#qtHaveModule(quick) {
22 SOURCES += \
23 compositor_api/qwaylandsurfaceitem.cpp \
24 compositor_api/qwaylandsurfacenode.cpp \
25@@ -27,4 +27,4 @@ qtHaveModule(quick) {
26
27 QT += qml quick
28 QT += quick-private gui-private
29-}
30+#}
31--
321.8.2.1
33
diff --git a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch b/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
deleted file mode 100644
index 58f82663..00000000
--- a/recipes-qt/qt5/qtwayland-git/0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 2d707f8dc9f0658d889aef4f4c5a62595598402c Mon Sep 17 00:00:00 2001
2From: Mikko Levonmaa <mikko.levonmaa@palm.com>
3Date: Wed, 6 Mar 2013 10:18:49 -0800
4Subject: [PATCH 3/3] eglCreateImageKHR requires the context to be NULL
5
6As per the EGL spec the context passed to that function should
7be null.
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 .../wayland-egl/waylandeglintegration.cpp | 16 ++--------------
12 1 file changed, 2 insertions(+), 14 deletions(-)
13
14diff --git a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
15index 73877c4..16e77fb 100644
16--- a/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
17+++ b/src/plugins/waylandcompositors/wayland-egl/waylandeglintegration.cpp
18@@ -101,7 +101,6 @@ public:
19
20 PFNGLEGLIMAGETARGETTEXTURE2DOESPROC gl_egl_image_target_texture_2d;
21
22- QPlatformNativeInterface::NativeResourceForContextFunction get_egl_context;
23 };
24
25 WaylandEglIntegration::WaylandEglIntegration()
26@@ -121,10 +120,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
27 const char *extensionString = eglQueryString(d->egl_display, EGL_EXTENSIONS);
28 if (extensionString && strstr(extensionString, "EGL_WL_bind_wayland_display"))
29 {
30- d->get_egl_context = nativeInterface->nativeResourceFunctionForContext("get_egl_context");
31- if (!d->get_egl_context) {
32- qWarning("Failed to retrieve the get_egl_context function");
33- }
34 d->egl_bind_wayland_display =
35 reinterpret_cast<PFNEGLBINDWAYLANDDISPLAYWL>(eglGetProcAddress("eglBindWaylandDisplayWL"));
36 d->egl_unbind_wayland_display =
37@@ -137,7 +132,6 @@ void WaylandEglIntegration::initializeHardware(QtWayland::Display *waylandDispla
38 reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
39
40 if (d->egl_bind_wayland_display
41- && d->get_egl_context
42 && d->egl_unbind_wayland_display
43 && d->egl_create_image
44 && d->egl_destroy_image
45@@ -162,10 +156,7 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGL
46 return 0;
47 }
48
49- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
50- EGLContext egl_context = d->get_egl_context(context);
51-
52- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context,
53+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL,
54 EGL_WAYLAND_BUFFER_WL,
55 buffer, NULL);
56
57@@ -229,10 +220,7 @@ void *WaylandEglIntegration::lockNativeBuffer(struct wl_buffer *buffer, QOpenGLC
58 {
59 Q_D(const WaylandEglIntegration);
60
61- QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
62- EGLContext egl_context = d->get_egl_context(context);
63-
64- EGLImageKHR image = d->egl_create_image(d->egl_display, egl_context,
65+ EGLImageKHR image = d->egl_create_image(d->egl_display, NULL,
66 EGL_WAYLAND_BUFFER_WL,
67 buffer, NULL);
68 return image;
69--
701.8.2.1
71
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 20cd2519..2ffaff61 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -2,8 +2,7 @@ require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 4# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
5# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 5# this PV is only to indicate that this recipe is compatible with qt5 5.2.0
6# while qtwayland_git stays compatible with 5.0.2 6PV = "5.2.0+git${SRCPV}"
7PV = "5.1.0+git${SRCPV}"
8 7
9SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5" 8SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5"
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc
index 15802235..eec26b67 100644
--- a/recipes-qt/qt5/qtwayland.inc
+++ b/recipes-qt/qt5/qtwayland.inc
@@ -7,18 +7,11 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod
7 7
8# wayland-native is already in wayland DEPENDS, but add it here 8# wayland-native is already in wayland DEPENDS, but add it here
9# explicitly, because it's native wayland-scanner we're looking for 9# explicitly, because it's native wayland-scanner we're looking for
10# libxkbcommon isn't mandatory with 0001-xcbcommon-should-not-be-a-mandatory-dependency.patch 10# libxkbcommon isn't mandatory make it easier to remove by .bbappend
11# make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't 11# (e.g. for building qtwayland with danny which doesn't have libxkbcommon in oe-core).
12# have libxkbcommon in oe-core).
13XKB_DEPENDS = "libxkbcommon xproto" 12XKB_DEPENDS = "libxkbcommon xproto"
14DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}" 13DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_DEPENDS}"
15 14
16SRC_URI += " \
17 file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \
18 file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \
19 file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \
20"
21
22QT_WAYLAND_CONFIG ?= "wayland-compositor" 15QT_WAYLAND_CONFIG ?= "wayland-compositor"
23QT_WAYLAND_DEFINES ?= "" 16QT_WAYLAND_DEFINES ?= ""
24QT_WAYLAND_BUILD_PARTS ?= "examples" 17QT_WAYLAND_BUILD_PARTS ?= "examples"
diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
index 1fac95b7..1fac95b7 100644
--- a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
diff --git a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch
deleted file mode 100644
index 6bbbaa1e..00000000
--- a/recipes-qt/qt5/qtwayland/fix.missing.v8.public.api.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001
2From: Carsten Munk <carsten.munk@jollamobile.com>
3Date: Wed, 17 Jul 2013 07:28:04 +0000
4Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: ***
5 [sub-qml-compositor-make_first] Error 3
6
7Cherry-picked from:
8https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1
9
10Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
11---
12 qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
16index 0bc0b02..e397002 100644
17--- a/examples/qml-compositor/qml-compositor.pro
18+++ b/examples/qml-compositor/qml-compositor.pro
19@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK
20
21 LIBS += -L ../../lib
22
23-QT += quick qml v8
24+QT += quick qml
25 QT += quick-private
26
27 QT += compositor
28--
291.8.4
30
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 02971d66..640373e0 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -2,11 +2,6 @@ require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 4# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
5# this PV is only to indicate that this recipe is compatible with qt5 5.1.0 5# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.0
6PV = "5.1.0+git${SRCPV}"
7 6
8SRC_URI += "file://fix.missing.v8.public.api.patch" 7SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5"
9
10# newer revisions depend on newer wayland-1.1 APIs
11SRCREV = "87dba733acfddecd8562e8e26ce5f994aa499fe3"
12# SRCREV = "ede872db1cdfdc2810c2dd29edd5fb6e1cdac0f5"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb
deleted file mode 100644
index d0f61de4..00000000
--- a/recipes-qt/qt5/qtwebkit-examples_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "660b4e169a13074d2edcc3110a7b5ba8"
5SRC_URI[sha256sum] = "1297212198790f186cb647dcfa929fd2de0824bd04578cf041355e4eabb33ff2"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb
new file mode 100644
index 00000000..93487363
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit-examples_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "8431a8476213b3a3587e04b023a2435f"
5SRC_URI[sha256sum] = "80e7eb55ea6c4a4e92f44eb1d3cd7c9ecd85f9d5e48e682a31473633fa46a64e"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 67c2091d..582833e1 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "08118e862731b5ce91368d326a04b4a565e7f483" 4SRCREV = "634cddbfef6a40b991bcdf8e68e5329747f43c57"
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index 2d211c7b..8f475d7d 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -3,7 +3,7 @@ require qt5.inc
3LICENSE = "BSD & LGPLv2+" 3LICENSE = "BSD & LGPLv2+"
4LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ 4LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \
5 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ 5 file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
6 file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" 6 file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
7 7
8DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" 8DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
9 9
@@ -15,6 +15,7 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
15PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " 15PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
16 16
17SRC_URI += "file://fix-rpath.patch" 17SRC_URI += "file://fix-rpath.patch"
18SRC_URI += "file://0001-jsc-Add-licuuc-licui18n-LIBS.patch"
18 19
19# make sure rb files are used from sysroot, not from host 20# make sure rb files are used from sysroot, not from host
20# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` 21# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
diff --git a/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch b/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch
new file mode 100644
index 00000000..f9e97cb9
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0001-jsc-Add-licuuc-licui18n-LIBS.patch
@@ -0,0 +1,443 @@
1From 19da0b2f95c4c4ad3cc35ea3c6bb34adf4886a32 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 15:47:13 +0100
4Subject: [PATCH] jsc: Add -licuuc -licui18n LIBS
5
6* fails to link without them:
7OE @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore $ x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-O1 -o ../../bin/jsc .obj/release-shared/jsc.o -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lQt5Core -lpthread -lpthread /OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)':
8Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51'
9/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)':
10Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51'
11/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer<unsigned short>::nextTokenIsColon()':
12Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51'
13/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer<unsigned short>::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)':
14Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51'
15/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(YarrInterpreter.o): In function `JSC::Yarr::ByteCompiler::emitDisjunction(JSC::Yarr::PatternDisjunction*, unsigned int, unsigned int)':
16YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1117): undefined reference to `u_tolower_51'
17YarrInterpreter.cpp:(.text._ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj[_ZN3JSC4Yarr12ByteCompiler15emitDisjunctionEPNS0_18PatternDisjunctionEjj]+0x1126): undefined reference to `u_toupper_51'
18/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(DatePrototype.o): In function `JSC::formatLocaleDate(JSC::ExecState*, JSC::DateInstance*, double, JSC::LocaleDateTimeFormat) [clone .isra.61]':
19DatePrototype.cpp:(.text+0x57cc): undefined reference to `udat_open_51'
20DatePrototype.cpp:(.text+0x57f8): undefined reference to `udat_format_51'
21DatePrototype.cpp:(.text+0x5802): undefined reference to `udat_close_51'
22/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(FunctionPrototype.o): In function `JSC::functionProtoFuncToString(JSC::ExecState*)':
23FunctionPrototype.cpp:(.text+0x2666): undefined reference to `u_charType_51'
24/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::isStrWhiteSpace(unsigned short)':
25JSGlobalObjectFunctions.cpp:(.text+0x458): undefined reference to `u_charType_51'
26/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o): In function `JSC::jsToNumber(WTF::String const&)':
27JSGlobalObjectFunctions.cpp:(.text+0x789): undefined reference to `u_charType_51'
28JSGlobalObjectFunctions.cpp:(.text+0x7bf): undefined reference to `u_charType_51'
29JSGlobalObjectFunctions.cpp:(.text+0xc75): undefined reference to `u_charType_51'
30/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(JSGlobalObjectFunctions.o):JSGlobalObjectFunctions.cpp:(.text+0x1cd1): more undefined references to `u_charType_51' follow
31/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(WTF::String const&, WTF::Vector<char, 0ul, WTF::CrashOnOverflow>&, WTF::Base64DecodePolicy)':
32Base64.cpp:(.text+0x5c8): undefined reference to `u_charDirection_51'
33/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(Base64.o): In function `WTF::base64Decode(char const*, unsigned int, WTF::Vector<char, 0ul, WTF::CrashOnOverflow>&, WTF::Base64DecodePolicy)':
34Base64.cpp:(.text+0x1441): undefined reference to `u_charDirection_51'
35/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned char const*, unsigned char const*, unsigned int)':
36StringImpl.cpp:(.text+0x6e4): undefined reference to `u_foldCase_51'
37StringImpl.cpp:(.text+0x6f1): undefined reference to `u_foldCase_51'
38/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(unsigned short const*, unsigned char const*, unsigned int)':
39StringImpl.cpp:(.text+0x754): undefined reference to `u_foldCase_51'
40StringImpl.cpp:(.text+0x761): undefined reference to `u_foldCase_51'
41/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::findIgnoringCase(WTF::StringImpl*, unsigned int)':
42StringImpl.cpp:(.text+0x2eb4): undefined reference to `u_memcasecmp_51'
43/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::reverseFindIgnoringCase(WTF::StringImpl*, unsigned int)':
44StringImpl.cpp:(.text+0x35f3): undefined reference to `u_memcasecmp_51'
45/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCase(WTF::StringImpl const*, unsigned char const*)':
46StringImpl.cpp:(.text+0x4139): undefined reference to `u_foldCase_51'
47StringImpl.cpp:(.text+0x4149): undefined reference to `u_foldCase_51'
48StringImpl.cpp:(.text+0x421d): undefined reference to `u_foldCase_51'
49StringImpl.cpp:(.text+0x422d): undefined reference to `u_foldCase_51'
50/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::equalIgnoringCaseNonNull(WTF::StringImpl const*, WTF::StringImpl const*)':
51StringImpl.cpp:(.text+0x42a5): undefined reference to `u_memcasecmp_51'
52/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::defaultWritingDirection(bool*)':
53StringImpl.cpp:(.text+0x438b): undefined reference to `u_charDirection_51'
54StringImpl.cpp:(.text+0x43b6): undefined reference to `u_charDirection_51'
55/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::simplifyWhiteSpace()':
56StringImpl.cpp:(.text+0x48b1): undefined reference to `u_charDirection_51'
57StringImpl.cpp:(.text+0x48e1): undefined reference to `u_charDirection_51'
58StringImpl.cpp:(.text+0x49f1): undefined reference to `u_charDirection_51'
59/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o):StringImpl.cpp:(.text+0x4a19): more undefined references to `u_charDirection_51' follow
60/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::lower()':
61StringImpl.cpp:(.text+0x69bd): undefined reference to `u_strToLower_51'
62StringImpl.cpp:(.text+0x6b51): undefined reference to `u_strToLower_51'
63StringImpl.cpp:(.text+0x6c31): undefined reference to `u_tolower_51'
64/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::foldCase()':
65StringImpl.cpp:(.text+0x6cde): undefined reference to `u_tolower_51'
66StringImpl.cpp:(.text+0x6d9e): undefined reference to `u_strFoldCase_51'
67StringImpl.cpp:(.text+0x6e12): undefined reference to `u_strFoldCase_51'
68/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(StringImpl.o): In function `WTF::StringImpl::upper()':
69StringImpl.cpp:(.text+0x6f9f): undefined reference to `u_strToUpper_51'
70StringImpl.cpp:(.text+0x7031): undefined reference to `u_strToUpper_51'
71StringImpl.cpp:(.text+0x70ec): undefined reference to `u_toupper_51'
72StringImpl.cpp:(.text+0x71ea): undefined reference to `u_toupper_51'
73/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned char const*, unsigned long, bool*, int)':
74WTFString.cpp:(.text+0x2d81): undefined reference to `u_charDirection_51'
75WTFString.cpp:(.text+0x3031): undefined reference to `u_charDirection_51'
76/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToIntStrict(unsigned short const*, unsigned long, bool*, int)':
77WTFString.cpp:(.text+0x30c1): undefined reference to `u_charDirection_51'
78WTFString.cpp:(.text+0x3331): undefined reference to `u_charDirection_51'
79/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o): In function `WTF::charactersToUIntStrict(unsigned char const*, unsigned long, bool*, int)':
80WTFString.cpp:(.text+0x3451): undefined reference to `u_charDirection_51'
81/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(WTFString.o):WTFString.cpp:(.text+0x36b9): more undefined references to `u_charDirection_51' follow
82/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::~Collator()':
83CollatorICU.cpp:(.text+0x98): undefined reference to `ucol_close_51'
84/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::createCollator() const':
85CollatorICU.cpp:(.text+0x174): undefined reference to `ucol_getLocaleByType_51'
86CollatorICU.cpp:(.text+0x18b): undefined reference to `ucol_getAttribute_51'
87CollatorICU.cpp:(.text+0x1d0): undefined reference to `ucol_open_51'
88CollatorICU.cpp:(.text+0x1f3): undefined reference to `ucol_open_51'
89CollatorICU.cpp:(.text+0x211): undefined reference to `ucol_setAttribute_51'
90CollatorICU.cpp:(.text+0x226): undefined reference to `ucol_setAttribute_51'
91/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::releaseCollator()':
92CollatorICU.cpp:(.text+0x368): undefined reference to `ucol_close_51'
93/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release/libWTF.a(CollatorICU.o): In function `WTF::Collator::collate(unsigned short const*, unsigned long, unsigned short const*, unsigned long) const':
94CollatorICU.cpp:(.text+0x2e6): undefined reference to `ucol_strcoll_51'
95CollatorICU.cpp:(.text+0x327): undefined reference to `ucol_strcoll_51'
96collect2: error: ld returned 1 exit status
97
98* and later when linking main library:
99E @ ~/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source $ make -j 9 MAKEFLAGS='-j 9' OE_QMAKE_COMPILER='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CC='x86_64-oe-linux-gcc -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CXX='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_CFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types' OE_QMAKE_CXXFLAGS=' -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden' OE_QMAKE_LINK='x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64' OE_QMAKE_LDFLAGS='-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' OE_QMAKE_AR='x86_64-oe-linux-ar' OE_QMAKE_STRIP='echo' OE_QMAKE_WAYLAND_SCANNER='/OE/build/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/wayland-scanner' -f Makefile.api
100rm -f libQt5WebKit.so.5.2.0 libQt5WebKit.so libQt5WebKit.so.5 libQt5WebKit.so.5.2
101x86_64-oe-linux-g++ -m64 --sysroot=/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--no-undefined -Wl,-O1 -shared -Wl,-Bsymbolic-functions -Wl,-soname,libQt5WebKit.so.5 -o libQt5WebKit.so.5.2.0 -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release -Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit2/release -lrt -Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release -lz -lXrender -ludev -lXcomposite -lXrender -ljpeg -lpng -Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/ThirdParty/ANGLE/release -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WTF/release -lXext -lX11 -lm -lX11 -lxslt -lxml2 -lz -lm -ldl -lm -lxml2 -lxml2 -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstapp-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstinterfaces-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstpbutils-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lgstvideo-0.10 -lgstbase-0.10 -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -pthread -lgthread-2.0 -pthread -lglib-2.0 -lxml2 -lsqlite3 -lQt5Quick -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Positioning -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -ldl -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lpthread -lQt5Qml -ldl -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sql -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Gui -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Network -L/OE/build/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/lib -lQt5Core -lpthread -lpthread -lQt5Sensors -lQt5Core -lpthread -lpthread -lQt5Core -lpthread -lGL
102/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentStart(int)':
103Lexer.cpp:(.text+0x5): undefined reference to `u_charType_51'
104/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::isNonLatin1IdentPart(int)':
105Lexer.cpp:(.text+0x24): undefined reference to `u_charType_51'
106/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer<unsigned short>::nextTokenIsColon()':
107Lexer.cpp:(.text._ZN3JSC5LexerItE16nextTokenIsColonEv[_ZN3JSC5LexerItE16nextTokenIsColonEv]+0x80): undefined reference to `u_charType_51'
108/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/JavaScriptCore/release/libJavaScriptCore.a(Lexer.o): In function `JSC::Lexer<unsigned short>::lex(JSC::JSTokenData*, JSC::JSTokenLocation*, unsigned int, bool)':
109Lexer.cpp:(.text._ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb[_ZN3JSC5LexerItE3lexEPNS_11JSTokenDataEPNS_15JSTokenLocationEjb]+0xb5): undefined reference to `u_charType_51'
110/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o): In function `WTF::HashTable<WTF::AtomicString, WTF::KeyValuePair<WTF::AtomicString, WTF::String>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WTF::AtomicString, WTF::String> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits<WTF::HashTraits<WTF::AtomicString>, WTF::HashTraits<WTF::String> >, WTF::HashTraits<WTF::AtomicString> >::rehash(int)':
111FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xdc): undefined reference to `u_foldCase_51'
112FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0xf3): undefined reference to `u_foldCase_51'
113FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51'
114FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x313): undefined reference to `u_foldCase_51'
115FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E6rehashEi]+0x357): undefined reference to `u_foldCase_51'
116/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebKit/release/libWebKit1.a(FrameLoaderClientQt.o):FrameLoaderClientQt.cpp:(.text._ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_[_ZN3WTF9HashTableINS_12AtomicStringENS_12KeyValuePairIS1_NS_6StringEEENS_24KeyValuePairKeyExtractorIS4_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS9_IS3_EEEESA_E4findINS_22IdentityHashTranslatorIS7_EES1_EENS_17HashTableIteratorIS1_S4_S6_S7_SC_SA_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow
117/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TypeAhead.o): In function `WebCore::TypeAhead::handleEvent(WebCore::KeyboardEvent*, unsigned int)':
118TypeAhead.cpp:(.text._ZN7WebCore9TypeAhead11handleEventEPNS_13KeyboardEventEj+0x511): undefined reference to `u_charDirection_51'
119/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CanvasRenderingContext2D.o): In function `WTF::isSpaceOrNewline(unsigned short)':
120CanvasRenderingContext2D.cpp:(.text._ZN3WTFL16isSpaceOrNewlineEt+0x30): undefined reference to `u_charDirection_51'
121/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginAccessControl.o): In function `WebCore::isOnAccessControlResponseHeaderWhitelist(WTF::String const&)':
122CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x8c): undefined reference to `u_foldCase_51'
123CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0xa3): undefined reference to `u_foldCase_51'
124CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1dc): undefined reference to `u_foldCase_51'
125CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x1f3): undefined reference to `u_foldCase_51'
126CrossOriginAccessControl.cpp:(.text._ZN7WebCore40isOnAccessControlResponseHeaderWhitelistERKN3WTF6StringE+0x226): undefined reference to `u_foldCase_51'
127/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZNK7WebCore35CrossOriginPreflightResultCacheItem24allowsCrossOriginHeadersERKNS_13HTTPHeaderMapERN3WTF6StringE+0xac): more undefined references to `u_foldCase_51' follow
128/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList<WTF::StringHash>(WTF::String const&, unsigned int, unsigned int, WTF::HashSet<WTF::String, WTF::StringHash, WTF::HashTraits<WTF::String> >&)':
129CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51'
130CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF10StringHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x19c): undefined reference to `u_charDirection_51'
131/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o): In function `void WebCore::addToAccessControlAllowList<WTF::CaseFoldingHash>(WTF::String const&, unsigned int, unsigned int, WTF::HashSet<WTF::String, WTF::CaseFoldingHash, WTF::HashTraits<WTF::String> >&)':
132CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x3c): undefined reference to `u_charDirection_51'
133CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x13c): undefined reference to `u_foldCase_51'
134CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x153): undefined reference to `u_foldCase_51'
135CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x254): undefined reference to `u_charDirection_51'
136CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2d4): undefined reference to `u_foldCase_51'
137CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x2eb): undefined reference to `u_foldCase_51'
138CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x327): undefined reference to `u_foldCase_51'
139CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x45c): undefined reference to `u_foldCase_51'
140CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x473): undefined reference to `u_foldCase_51'
141/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(CrossOriginPreflightResultCache.o):CrossOriginPreflightResultCache.cpp:(.text._ZN7WebCoreL27addToAccessControlAllowListIN3WTF15CaseFoldingHashEEEvRKNS1_6StringEjjRNS1_7HashSetIS3_T_NS1_10HashTraitsIS3_EEEE+0x5cc): more undefined references to `u_foldCase_51' follow
142/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ContextMenuController.o): In function `WebCore::selectionContainsPossibleWord(WebCore::Frame*)':
143ContextMenuController.cpp:(.text._ZN7WebCoreL29selectionContainsPossibleWordEPNS_5FrameE+0x96): undefined reference to `u_charType_51'
144/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontGlyphs.o): In function `WebCore::FontGlyphs::glyphDataAndPageForCharacter(WebCore::FontDescription const&, int, bool, WebCore::FontDataVariant) const':
145FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x49d): undefined reference to `u_charMirror_51'
146FontGlyphs.cpp:(.text._ZNK7WebCore10FontGlyphs28glyphDataAndPageForCharacterERKNS_15FontDescriptionEibNS_15FontDataVariantE+0x5b6): undefined reference to `u_toupper_51'
147/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Font.o): In function `WebCore::Font::canReceiveTextEmphasis(int)':
148Font.cpp:(.text._ZN7WebCore4Font22canReceiveTextEmphasisEi+0x4): undefined reference to `u_charType_51'
149/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o): In function `WTF::HashTableIterator<WebCore::FontPlatformDataCacheKey, WTF::KeyValuePair<WebCore::FontPlatformDataCacheKey, WTF::OwnPtr<WebCore::FontPlatformData> >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::FontPlatformDataCacheKey, WTF::OwnPtr<WebCore::FontPlatformData> > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits<WebCore::FontPlatformDataCacheKeyTraits, WTF::HashTraits<WTF::OwnPtr<WebCore::FontPlatformData> > >, WebCore::FontPlatformDataCacheKeyTraits> WTF::HashTable<WebCore::FontPlatformDataCacheKey, WTF::KeyValuePair<WebCore::FontPlatformDataCacheKey, WTF::OwnPtr<WebCore::FontPlatformData> >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::FontPlatformDataCacheKey, WTF::OwnPtr<WebCore::FontPlatformData> > >, WebCore::FontPlatformDataCacheKeyHash, WTF::HashMapValueTraits<WebCore::FontPlatformDataCacheKeyTraits, WTF::HashTraits<WTF::OwnPtr<WebCore::FontPlatformData> > >, WebCore::FontPlatformDataCacheKeyTraits>::find<WTF::IdentityHashTranslator<WebCore::FontPlatformDataCacheKeyHash>, WebCore::FontPlatformDataCacheKey>(WebCore::FontPlatformDataCacheKey const&)':
150FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0xec): undefined reference to `u_foldCase_51'
151FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x100): undefined reference to `u_foldCase_51'
152FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x23c): undefined reference to `u_foldCase_51'
153FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x250): undefined reference to `u_foldCase_51'
154FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E4findINS_22IdentityHashTranslatorISA_EES2_EENS_17HashTableIteratorIS2_S7_S9_SA_SF_SC_EERKT0_]+0x27f): undefined reference to `u_foldCase_51'
155/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(FontCache.o):FontCache.cpp:(.text._ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi[_ZN3WTF9HashTableIN7WebCore24FontPlatformDataCacheKeyENS_12KeyValuePairIS2_NS_6OwnPtrINS1_16FontPlatformDataEEEEENS_24KeyValuePairKeyExtractorIS7_EENS1_28FontPlatformDataCacheKeyHashENS_18HashMapValueTraitsINS1_30FontPlatformDataCacheKeyTraitsENS_10HashTraitsIS6_EEEESC_E6rehashEi]+0x17d): more undefined references to `u_foldCase_51' follow
156/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(GraphicsContext.o): In function `WebCore::GraphicsContext::drawBidiText(WebCore::Font const&, WebCore::TextRun const&, WebCore::FloatPoint const&, WebCore::Font::CustomFontNotReadyAction)':
157GraphicsContext.cpp:(.text._ZN7WebCore15GraphicsContext12drawBidiTextERKNS_4FontERKNS_7TextRunERKNS_10FloatPointENS1_24CustomFontNotReadyActionE+0x4de): undefined reference to `u_charDirection_51'
158/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGGlyph.o): In function `WebCore::charactersWithArabicForm(WTF::String const&, bool)':
159SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x59): undefined reference to `ublock_getCode_51'
160SVGGlyph.cpp:(.text._ZN7WebCore24charactersWithArabicFormERKN3WTF6StringEb+0x8e): undefined reference to `ublock_getCode_51'
161/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SurrogatePairAwareTextIterator.o): In function `WebCore::SurrogatePairAwareTextIterator::normalizeVoicingMarks()':
162SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x28): undefined reference to `u_getCombiningClass_51'
163SurrogatePairAwareTextIterator.cpp:(.text._ZN7WebCore30SurrogatePairAwareTextIterator21normalizeVoicingMarksEv+0x6d): undefined reference to `unorm_normalize_51'
164/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal<WebCore::SurrogatePairAwareTextIterator>(WebCore::SurrogatePairAwareTextIterator&, WebCore::GlyphBuffer*)':
165WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x109e): undefined reference to `u_toupper_51'
166WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_30SurrogatePairAwareTextIteratorEEEjRT_PNS_11GlyphBufferE]+0x10be): undefined reference to `u_toupper_51'
167/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(WidthIterator.o): In function `unsigned int WebCore::WidthIterator::advanceInternal<WebCore::Latin1TextIterator>(WebCore::Latin1TextIterator&, WebCore::GlyphBuffer*)':
168WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x106f): undefined reference to `u_toupper_51'
169WidthIterator.cpp:(.text._ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE[_ZN7WebCore13WidthIterator15advanceInternalINS_18Latin1TextIteratorEEEjRT_PNS_11GlyphBufferE]+0x108d): undefined reference to `u_toupper_51'
170/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WebCore::appendEncodedHostname(WTF::Vector<unsigned short, 512ul, WTF::CrashOnOverflow>&, unsigned short const*, unsigned int) [clone .part.54]':
171KURL.cpp:(.text._ZN7WebCoreL21appendEncodedHostnameERN3WTF6VectorItLm512ENS0_15CrashOnOverflowEEEPKtj.part.54+0x39): undefined reference to `uidna_IDNToASCII_51'
172/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o): In function `WTF::HashTable<WTF::String, WTF::KeyValuePair<WTF::String, unsigned int>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WTF::String, unsigned int> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits<WTF::HashTraits<WTF::String>, WTF::HashTraits<unsigned int> >, WTF::HashTraits<WTF::String> >::rehash(int)':
173KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51'
174KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51'
175KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51'
176KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x303): undefined reference to `u_foldCase_51'
177KURL.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_jEENS_24KeyValuePairKeyExtractorIS3_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENS8_IjEEEES9_E6rehashEi]+0x348): undefined reference to `u_foldCase_51'
178/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(KURL.o):KURL.cpp:(.text._ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj[_ZN3WTF7HashMapINS_6StringEjNS_15CaseFoldingHashENS_10HashTraitsIS1_EENS3_IjEEE3setERKS1_RKj]+0x7c): more undefined references to `u_foldCase_51' follow
179/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(Length.o): In function `WebCore::parseLength(unsigned short const*, unsigned int)':
180Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x176): undefined reference to `u_charDirection_51'
181Length.cpp:(.text._ZN7WebCoreL11parseLengthEPKtj+0x230): undefined reference to `u_charDirection_51'
182/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o): In function `WTF::HashTable<WTF::String, WTF::KeyValuePair<WTF::String, WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow>*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WTF::String, WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow>*> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits<WTF::HashTraits<WTF::String>, WTF::HashTraits<WTF::Vector<WTF::String, 0ul, WTF::CrashOnOverflow>*> >, WTF::HashTraits<WTF::String> >::rehash(int)':
183MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51'
184MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51'
185MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2fc): undefined reference to `u_foldCase_51'
186MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x313): undefined reference to `u_foldCase_51'
187MIMETypeRegistry.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PNS_6VectorIS1_Lm0ENS_15CrashOnOverflowEEEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x358): undefined reference to `u_foldCase_51'
188/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(MIMETypeRegistry.o):MIMETypeRegistry.cpp:(.text._ZN7WebCoreL16mediaMIMETypeMapEv+0xcc): more undefined references to `u_foldCase_51' follow
189/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTTPParsers.o): In function `WebCore::extractMIMETypeFromMediaType(WTF::String const&)':
190HTTPParsers.cpp:(.text._ZN7WebCore28extractMIMETypeFromMediaTypeERKN3WTF6StringE+0x1a4): undefined reference to `u_charDirection_51'
191/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceRequestBase.o): In function `WebCore::ResourceRequestBase::setHTTPHeaderField(WTF::AtomicString const&, WTF::String const&)':
192ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x9d): undefined reference to `u_foldCase_51'
193ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0xb5): undefined reference to `u_foldCase_51'
194ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x31f): undefined reference to `u_foldCase_51'
195ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x36d): undefined reference to `u_foldCase_51'
196ResourceRequestBase.cpp:(.text._ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x385): undefined reference to `u_foldCase_51'
197/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ResourceResponseBase.o):ResourceResponseBase.cpp:(.text._ZN7WebCore20ResourceResponseBase18setHTTPHeaderFieldERKN3WTF12AtomicStringERKNS1_6StringE+0x8c): more undefined references to `u_foldCase_51' follow
198/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `charCat(unsigned short) [clone .part.4]':
199XPathParser.cpp:(.text._ZL7charCatt.part.4+0x8): undefined reference to `u_charType_51'
200/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(XPathParser.o): In function `WebCore::XPath::Parser::skipWS()':
201XPathParser.cpp:(.text._ZN7WebCore5XPath6Parser6skipWSEv+0x3d): undefined reference to `u_charDirection_51'
202/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::addAllCodePoints(USet*, WTF::String const&)':
203SmartReplaceICU.cpp:(.text._ZN7WebCoreL16addAllCodePointsEP4USetRKN3WTF6StringE+0x46): undefined reference to `uset_add_51'
204/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)':
205SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x2b): undefined reference to `uset_contains_51'
206SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x7e): undefined reference to `uset_openPattern_51'
207SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x93): undefined reference to `uset_addRange_51'
208SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xa5): undefined reference to `uset_addRange_51'
209SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xb7): undefined reference to `uset_addRange_51'
210SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xc9): undefined reference to `uset_addRange_51'
211SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xdb): undefined reference to `uset_addRange_51'
212/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o):SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0xed): more undefined references to `uset_addRange_51' follow
213/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SmartReplaceICU.o): In function `WebCore::isCharacterSmartReplaceExempt(int, bool)':
214SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x209): undefined reference to `uset_openPattern_51'
215SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x217): undefined reference to `uset_addAll_51'
216SmartReplaceICU.cpp:(.text._ZN7WebCore29isCharacterSmartReplaceExemptEib+0x21f): undefined reference to `uset_close_51'
217/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o): In function `WTF::HashTable<WTF::String, WTF::KeyValuePair<WTF::String, WTF::PassRefPtr<WebCore::Archive> (*)(WebCore::KURL const&, WebCore::SharedBuffer*)>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WTF::String, WTF::PassRefPtr<WebCore::Archive> (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits<WTF::HashTraits<WTF::String>, WTF::HashTraits<WTF::PassRefPtr<WebCore::Archive> (*)(WebCore::KURL const&, WebCore::SharedBuffer*)> >, WTF::HashTraits<WTF::String> >::rehash(int)':
218ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51'
219ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51'
220ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51'
221ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x303): undefined reference to `u_foldCase_51'
222ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E6rehashEi]+0x348): undefined reference to `u_foldCase_51'
223/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(ArchiveFactory.o):ArchiveFactory.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PFNS_10PassRefPtrIN7WebCore7ArchiveEEERKNS4_4KURLEPNS4_12SharedBufferEEEENS_24KeyValuePairKeyExtractorISE_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSJ_ISD_EEEESK_E4findINS_22IdentityHashTranslatorISH_EES1_EENS_17HashTableIteratorIS1_SE_SG_SH_SM_SK_EERKT0_]+0x74): more undefined references to `u_foldCase_51' follow
224/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(SVGAllInOne.o): In function `WebCore::SVGFontData::createStringWithMirroredCharacters(unsigned short const*, unsigned int) const':
225SVGAllInOne.cpp:(.text._ZNK7WebCore11SVGFontData34createStringWithMirroredCharactersEPKtj+0x129): undefined reference to `u_charMirror_51'
226/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::(anonymous namespace)::parseToken(unsigned short const*, unsigned short const*, unsigned short const**, unsigned short const**)':
227InspectorAllInOne.cpp:(.text._ZN7WebCore12_GLOBAL__N_110parseTokenEPKtS2_PS2_S3_+0x49): undefined reference to `u_charDirection_51'
228/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorStyleTextEditor::internalReplaceProperty(WebCore::InspectorStyleProperty const&, WTF::String const&, WebCore::SourceRange*, unsigned int*)':
229InspectorAllInOne.cpp:(.text._ZN7WebCore24InspectorStyleTextEditor23internalReplacePropertyERKNS_22InspectorStylePropertyERKN3WTF6StringEPNS_11SourceRangeEPj+0x43a): undefined reference to `u_charDirection_51'
230/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(InspectorAllInOne.o): In function `WebCore::InspectorResourceAgent::willLoadXHR(WebCore::ThreadableLoaderClient*, WTF::String const&, WebCore::KURL const&, bool, WTF::PassRefPtr<WebCore::FormData>, WebCore::HTTPHeaderMap const&, bool)':
231InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x12c): undefined reference to `u_foldCase_51'
232InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x13b): undefined reference to `u_foldCase_51'
233InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3cc): undefined reference to `u_foldCase_51'
234InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x3db): undefined reference to `u_foldCase_51'
235InspectorAllInOne.cpp:(.text._ZN7WebCore22InspectorResourceAgent11willLoadXHREPNS_22ThreadableLoaderClientERKN3WTF6StringERKNS_4KURLEbNS3_10PassRefPtrINS_8FormDataEEERKNS_13HTTPHeaderMapEb+0x411): undefined reference to `u_foldCase_51'
236/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::setUpIterator(bool&, WebCore::TextBreakIterator*&, UBreakIteratorType, unsigned short const*, int)':
237TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x3e): undefined reference to `ubrk_setText_51'
238TextAllInOne.cpp:(.text._ZN7WebCoreL13setUpIteratorERbRPNS_17TextBreakIteratorE18UBreakIteratorTypePKti+0x80): undefined reference to `ubrk_open_51'
239/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackEscape(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)':
240TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51'
241TextAllInOne.cpp:(.text._ZN7WebCoreL17gbkCallbackEscapeEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x90): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51'
242/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkCallbackSubstitute(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)':
243TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x5d): undefined reference to `ucnv_cbFromUWriteUChars_51'
244TextAllInOne.cpp:(.text._ZN7WebCoreL21gbkCallbackSubstituteEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x98): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51'
245/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textClone(UText*, UText const*, signed char, UErrorCode*)':
246TextAllInOne.cpp:(.text._ZN7WebCoreL9textCloneEP5UTextPKS0_aP10UErrorCode+0x27): undefined reference to `utext_setup_51'
247/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::endOfFirstWordBoundaryContext(unsigned short const*, int)':
248TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x26): undefined reference to `u_getIntPropertyValue_51'
249TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0x84): undefined reference to `u_getIntPropertyValue_51'
250TextAllInOne.cpp:(.text._ZN7WebCore29endOfFirstWordBoundaryContextEPKti+0xa6): undefined reference to `u_getIntPropertyValue_51'
251/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::startOfLastWordBoundaryContext(unsigned short const*, int)':
252TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x1e): undefined reference to `u_getIntPropertyValue_51'
253TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x77): undefined reference to `u_getIntPropertyValue_51'
254/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o):TextAllInOne.cpp:(.text._ZN7WebCore30startOfLastWordBoundaryContextEPKti+0x96): more undefined references to `u_getIntPropertyValue_51' follow
255/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::NonSharedCharacterBreakIterator::~NonSharedCharacterBreakIterator()':
256TextAllInOne.cpp:(.text._ZN7WebCore31NonSharedCharacterBreakIteratorD2Ev+0x24): undefined reference to `ubrk_close_51'
257/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numGraphemeClusters(WTF::String const&)':
258TextAllInOne.cpp:(.text._ZN7WebCore19numGraphemeClustersERKN3WTF6StringE+0x48): undefined reference to `ubrk_next_51'
259/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::numCharactersInGraphemeClusters(WTF::String const&, unsigned int)':
260TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0x9d): undefined reference to `ubrk_next_51'
261TextAllInOne.cpp:(.text._ZN7WebCore31numCharactersInGraphemeClustersERKN3WTF6StringEj+0xe9): undefined reference to `ubrk_current_51'
262/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFirst(WebCore::TextBreakIterator*)':
263TextAllInOne.cpp:(.text._ZN7WebCore14textBreakFirstEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_first_51'
264/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakNext(WebCore::TextBreakIterator*)':
265TextAllInOne.cpp:(.text._ZN7WebCore13textBreakNextEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_next_51'
266/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakPreceding(WebCore::TextBreakIterator*, int)':
267TextAllInOne.cpp:(.text._ZN7WebCore18textBreakPrecedingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_preceding_51'
268/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakFollowing(WebCore::TextBreakIterator*, int)':
269TextAllInOne.cpp:(.text._ZN7WebCore18textBreakFollowingEPNS_17TextBreakIteratorEi+0x1): undefined reference to `ubrk_following_51'
270/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::textBreakCurrent(WebCore::TextBreakIterator*)':
271TextAllInOne.cpp:(.text._ZN7WebCore16textBreakCurrentEPNS_17TextBreakIteratorE+0x1): undefined reference to `ubrk_current_51'
272/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isTextBreak(WebCore::TextBreakIterator*, int)':
273TextAllInOne.cpp:(.text._ZN7WebCore11isTextBreakEPNS_17TextBreakIteratorEi+0x5): undefined reference to `ubrk_isBoundary_51'
274/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::isWordTextBreak(WebCore::TextBreakIterator*)':
275TextAllInOne.cpp:(.text._ZN7WebCore15isWordTextBreakEPNS_17TextBreakIteratorE+0x5): undefined reference to `ubrk_getRuleStatus_51'
276/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::cursorMovementIterator(unsigned short const*, int)':
277TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0x43): undefined reference to `ubrk_setText_51'
278TextAllInOne.cpp:(.text._ZN7WebCore22cursorMovementIteratorEPKti+0xb3): undefined reference to `ubrk_openRules_51'
279/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::urlEscapedEntityCallback(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)':
280TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x1a): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51'
281TextAllInOne.cpp:(.text._ZN7WebCoreL24urlEscapedEntityCallbackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x59): undefined reference to `ucnv_cbFromUWriteBytes_51'
282/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::gbkUrlEscapedEntityCallack(void const*, UConverterFromUnicodeArgs*, unsigned short const*, int, int, UConverterCallbackReason, UErrorCode*)':
283TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x65): undefined reference to `ucnv_cbFromUWriteUChars_51'
284TextAllInOne.cpp:(.text._ZN7WebCoreL26gbkUrlEscapedEntityCallackEPKvP25UConverterFromUnicodeArgsPKtii24UConverterCallbackReasonP10UErrorCode+0x9d): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51'
285/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::ICUConverterWrapper::~ICUConverterWrapper()':
286TextAllInOne.cpp:(.text._ZN7WebCore19ICUConverterWrapperD2Ev+0x9): undefined reference to `ucnv_close_51'
287/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerEncodingNames(void (*)(char const*, char const*))':
288TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x21): undefined reference to `ucnv_countAvailable_51'
289TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x56): undefined reference to `ucnv_getStandardName_51'
290TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x7e): undefined reference to `ucnv_getAvailableName_51'
291TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x9b): undefined reference to `ucnv_getStandardName_51'
292TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x136): undefined reference to `ucnv_countAliases_51'
293TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E+0x182): undefined reference to `ucnv_getAlias_51'
294/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::registerCodecs(void (*)(char const*, WTF::PassOwnPtr<WebCore::TextCodec> (*)(WebCore::TextEncoding const&, void const*), void const*))':
295TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x38): undefined reference to `ucnv_getCanonicalName_51'
296TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x51): undefined reference to `ucnv_countAvailable_51'
297TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0x7e): undefined reference to `ucnv_getStandardName_51'
298TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xa0): undefined reference to `ucnv_getAvailableName_51'
299TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E+0xbd): undefined reference to `ucnv_getStandardName_51'
300/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::releaseICUConverter() const':
301TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x42): undefined reference to `ucnv_close_51'
302TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU19releaseICUConverterEv+0x4b): undefined reference to `ucnv_reset_51'
303/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::createICUConverter() const':
304TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x79): undefined reference to `ucnv_getName_51'
305TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0x95): undefined reference to `ucnv_open_51'
306TextAllInOne.cpp:(.text._ZNK7WebCore12TextCodecICU18createICUConverterEv+0xab): undefined reference to `ucnv_setFallback_51'
307/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::decode(char const*, unsigned long, bool, bool, bool&)':
308TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x49): undefined reference to `UCNV_TO_U_CALLBACK_SUBSTITUTE_51'
309TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x73): undefined reference to `ucnv_setToUCallBack_51'
310TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x122): undefined reference to `ucnv_toUnicode_51'
311TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x183): undefined reference to `ucnv_toUnicode_51'
312TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6decodeEPKcmbbRb+0x25d): undefined reference to `ucnv_setToUCallBack_51'
313/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextEncoding::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling) const':
314TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x68): undefined reference to `unorm_quickCheck_51'
315TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x9d): undefined reference to `unorm_normalize_51'
316TextAllInOne.cpp:(.text._ZNK7WebCore12TextEncoding6encodeEPKtmNS_19UnencodableHandlingE+0x1bf): undefined reference to `unorm_normalize_51'
317/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::TextCodecICU::encode(unsigned short const*, unsigned long, WebCore::UnencodableHandling)':
318TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x13f): undefined reference to `ucnv_fromUnicode_51'
319TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x198): undefined reference to `UCNV_FROM_U_CALLBACK_ESCAPE_51'
320TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x1b5): undefined reference to `ucnv_setFromUCallBack_51'
321TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x31c): undefined reference to `ucnv_setSubstChars_51'
322TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x330): undefined reference to `UCNV_FROM_U_CALLBACK_SUBSTITUTE_51'
323TextAllInOne.cpp:(.text._ZN7WebCore12TextCodecICU6encodeEPKtmNS_19UnencodableHandlingE+0x343): undefined reference to `ucnv_setFromUCallBack_51'
324/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned char const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)':
325TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x174): undefined reference to `utext_setup_51'
326TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1c9): undefined reference to `ubrk_setUText_51'
327TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x1dd): undefined reference to `utext_close_51'
328TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x2ac): undefined reference to `ubrk_open_51'
329TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKhiRKN3WTF12AtomicStringEPKtj+0x356): undefined reference to `ubrk_open_51'
330/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::acquireLineBreakIterator(unsigned short const*, int, WTF::AtomicString const&, unsigned short const*, unsigned int)':
331TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x168): undefined reference to `utext_setup_51'
332TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1bd): undefined reference to `ubrk_setUText_51'
333TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x1d1): undefined reference to `utext_close_51'
334TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x29c): undefined reference to `ubrk_open_51'
335TextAllInOne.cpp:(.text._ZN7WebCore24acquireLineBreakIteratorEPKtiRKN3WTF12AtomicStringES1_j+0x346): undefined reference to `ubrk_open_51'
336/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::releaseLineBreakIterator(WebCore::TextBreakIterator*)':
337TextAllInOne.cpp:(.text._ZN7WebCore24releaseLineBreakIteratorEPNS_17TextBreakIteratorE+0x190): undefined reference to `ubrk_close_51'
338/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(TextAllInOne.o): In function `WebCore::detectTextEncoding(char const*, unsigned long, char const*, WebCore::TextEncoding*)':
339TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x40): undefined reference to `ucsdet_open_51'
340TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x6c): undefined reference to `ucsdet_enableInputFilter_51'
341TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x7d): undefined reference to `ucsdet_setText_51'
342TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x95): undefined reference to `ucsdet_detectAll_51'
343TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x100): undefined reference to `ucsdet_getConfidence_51'
344TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x118): undefined reference to `ucsdet_getName_51'
345TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x14d): undefined reference to `ucsdet_close_51'
346TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x16c): undefined reference to `ucsdet_getName_51'
347TextAllInOne.cpp:(.text._ZN7WebCore18detectTextEncodingEPKcmS1_PNS_12TextEncodingE+0x197): undefined reference to `ucsdet_close_51'
348/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::StringImpl** WTF::HashTable<WTF::StringImpl*, WTF::StringImpl*, WTF::IdentityExtractor, WTF::CaseFoldingHash, WTF::HashTraits<WTF::StringImpl*>, WTF::HashTraits<WTF::StringImpl*> >::lookup<WTF::IdentityHashTranslator<WTF::CaseFoldingHash>, WTF::StringImpl*>(WTF::StringImpl* const&)':
349HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x64): undefined reference to `u_foldCase_51'
350HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x7b): undefined reference to `u_foldCase_51'
351HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x197): undefined reference to `u_foldCase_51'
352HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x1fc): undefined reference to `u_foldCase_51'
353HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x20b): undefined reference to `u_foldCase_51'
354/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6lookupINS_22IdentityHashTranslatorIS4_EES2_EEPS2_RKT0_]+0x286): more undefined references to `u_foldCase_51' follow
355/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WebCore::HTMLSelectElement::defaultEventHandler(WebCore::Event*)':
356HTMLElementsAllInOne.cpp:(.text._ZN7WebCore17HTMLSelectElement19defaultEventHandlerEPNS_5EventE+0xbe): undefined reference to `u_isprint_51'
357/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o): In function `WTF::HashTable<WTF::StringImpl*, WTF::StringImpl*, WTF::IdentityExtractor, WTF::CaseFoldingHash, WTF::HashTraits<WTF::StringImpl*>, WTF::HashTraits<WTF::StringImpl*> >::rehash(int)':
358HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51'
359HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51'
360HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x11e): undefined reference to `u_foldCase_51'
361HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2ac): undefined reference to `u_foldCase_51'
362HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x2c3): undefined reference to `u_foldCase_51'
363/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(HTMLElementsAllInOne.o):HTMLElementsAllInOne.cpp:(.text._ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi[_ZN3WTF9HashTableIPNS_10StringImplES2_NS_17IdentityExtractorENS_15CaseFoldingHashENS_10HashTraitsIS2_EES6_E6rehashEi]+0x337): more undefined references to `u_foldCase_51' follow
364/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::searcher()':
365EditingAllInOne.cpp:(.text._ZN7WebCoreL8searcherEv+0xba): undefined reference to `usearch_open_51'
366/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::normalizeCharacters(unsigned short const*, unsigned int, WTF::Vector<unsigned short, 0ul, WTF::CrashOnOverflow>&)':
367EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0x4c): undefined reference to `unorm_normalize_51'
368EditingAllInOne.cpp:(.text._ZN7WebCoreL19normalizeCharactersEPKtjRN3WTF6VectorItLm0ENS2_15CrashOnOverflowEEE+0xa3): undefined reference to `unorm_normalize_51'
369/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::SearchBuffer::search(unsigned long&)':
370EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x55): undefined reference to `usearch_setText_51'
371EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x63): undefined reference to `usearch_setOffset_51'
372EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x6e): undefined reference to `usearch_next_51'
373EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xb7): undefined reference to `usearch_getMatchedLength_51'
374EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x1d7): undefined reference to `usearch_next_51'
375EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x7b4): undefined reference to `u_charType_51'
376EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x8f2): undefined reference to `u_charType_51'
377EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0x9c4): undefined reference to `u_charType_51'
378EditingAllInOne.cpp:(.text._ZN7WebCore12SearchBuffer6searchERm[_ZN7WebCore12SearchBuffer6searchERm]+0xad8): undefined reference to `u_charType_51'
379/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WTF::HashTable<WTF::String, WTF::KeyValuePair<WTF::String, WebCore::EditorInternalCommand const*>, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WTF::String, WebCore::EditorInternalCommand const*> >, WTF::CaseFoldingHash, WTF::HashMapValueTraits<WTF::HashTraits<WTF::String>, WTF::HashTraits<WebCore::EditorInternalCommand const*> >, WTF::HashTraits<WTF::String> >::rehash(int)':
380EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xd4): undefined reference to `u_foldCase_51'
381EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0xeb): undefined reference to `u_foldCase_51'
382EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x2ec): undefined reference to `u_foldCase_51'
383EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x303): undefined reference to `u_foldCase_51'
384EditingAllInOne.cpp:(.text._ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi[_ZN3WTF9HashTableINS_6StringENS_12KeyValuePairIS1_PKN7WebCore21EditorInternalCommandEEENS_24KeyValuePairKeyExtractorIS7_EENS_15CaseFoldingHashENS_18HashMapValueTraitsINS_10HashTraitsIS1_EENSC_IS6_EEEESD_E6rehashEi]+0x348): undefined reference to `u_foldCase_51'
385/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o):EditingAllInOne.cpp:(.text._ZN7WebCoreL15internalCommandERKN3WTF6StringE+0x8c): more undefined references to `u_foldCase_51' follow
386/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::findPlainText(WebCore::Range const*, WTF::String const&, unsigned int)':
387EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x539): undefined reference to `usearch_getCollator_51'
388EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x555): undefined reference to `ucol_getStrength_51'
389EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x565): undefined reference to `ucol_setStrength_51'
390EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x56d): undefined reference to `usearch_reset_51'
391EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x5a1): undefined reference to `usearch_setPattern_51'
392EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0x75f): undefined reference to `usearch_setPattern_51'
393EditingAllInOne.cpp:(.text._ZN7WebCore13findPlainTextEPKNS_5RangeERKN3WTF6StringEj+0xf29): undefined reference to `u_charType_51'
394/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::VisibleSelection::appendTrailingWhitespace()':
395EditingAllInOne.cpp:(.text._ZN7WebCore16VisibleSelection24appendTrailingWhitespaceEv+0x305): undefined reference to `u_charDirection_51'
396/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::WordAwareIterator::advance()':
397EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x341): undefined reference to `u_charDirection_51'
398EditingAllInOne.cpp:(.text._ZN7WebCore17WordAwareIterator7advanceEv+0x3a9): undefined reference to `u_charDirection_51'
399/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::previousBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))':
400EditingAllInOne.cpp:(.text._ZN7WebCoreL16previousBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0x1a0): undefined reference to `u_getIntPropertyValue_51'
401/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::nextBoundary(WebCore::VisiblePosition const&, unsigned int (*)(unsigned short const*, unsigned int, unsigned int, WebCore::BoundarySearchContextAvailability, bool&))':
402EditingAllInOne.cpp:(.text._ZN7WebCoreL12nextBoundaryERKNS_15VisiblePositionEPFjPKtjjNS_33BoundarySearchContextAvailabilityERbE+0xe1): undefined reference to `u_getIntPropertyValue_51'
403/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWebCore.a(EditingAllInOne.o): In function `WebCore::Editor::insertTextWithoutSendingTextEvent(WTF::String const&, bool, WebCore::TextEvent*)':
404EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3cb): undefined reference to `u_ispunct_51'
405EditingAllInOne.cpp:(.text._ZN7WebCore6Editor33insertTextWithoutSendingTextEventERKN3WTF6StringEbPNS_9TextEventE+0x3d8): undefined reference to `u_charDirection_51'
406/OE/build/oe-core/tmp-eglibc/work/x86_64-oe-linux/qtwebkit/5.1.99+5.2.0-beta1+gitAUTOINC+2761751eca-r0/build/Source/WebCore/release/libWe
407...
408
409Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
410---
411 Source/JavaScriptCore/jsc.pro | 2 ++
412 Source/api.pri | 2 ++
413 2 files changed, 4 insertions(+)
414
415diff --git a/Source/JavaScriptCore/jsc.pro b/Source/JavaScriptCore/jsc.pro
416index dfd73e8..ef6e55d 100644
417--- a/Source/JavaScriptCore/jsc.pro
418+++ b/Source/JavaScriptCore/jsc.pro
419@@ -27,6 +27,8 @@ wince* {
420 LIBS += mmtimer.lib
421 }
422
423+LIBS += "-licuuc -licui18n"
424+
425 # Prevent warnings about difference in visibility on Mac OS X
426 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
427 unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
428diff --git a/Source/api.pri b/Source/api.pri
429index ccd206c..39c56dd 100644
430--- a/Source/api.pri
431+++ b/Source/api.pri
432@@ -29,6 +29,8 @@ use?(3D_GRAPHICS): WEBKIT += angle
433 MODULE = webkit
434 CONFIG += creating_module
435
436+LIBS += "-licuuc -licui18n"
437+
438 # This is the canonical list of dependencies for the public API of
439 # the QtWebKit library, and will end up in the library's prl file.
440 QT_API_DEPENDS = core gui network
441--
4421.8.4.3
443
diff --git a/recipes-qt/qt5/qtwebkit_5.1.1.bb b/recipes-qt/qt5/qtwebkit_5.1.1.bb
deleted file mode 100644
index afb2dc2e..00000000
--- a/recipes-qt/qt5/qtwebkit_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "70e956dafcee1969de53d4de7b4691ad"
5SRC_URI[sha256sum] = "d6ee1e9111b0996277a512ae71736a05faa7c0de6d69ac2978adce79c3116a24"
diff --git a/recipes-qt/qt5/qtwebkit_5.2.0.bb b/recipes-qt/qt5/qtwebkit_5.2.0.bb
new file mode 100644
index 00000000..1e16a89a
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "1378e18aecd8cc223deb729c8f0a735d"
5SRC_URI[sha256sum] = "390e16e719e41bcc94fd79866a0909b70235513778063c5e47227b8b9876e0cf"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index ebfc56c7..af8598a6 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "c31ff44d3a17fab37754acb2a0a29cd6eba10699" 4SRCREV = "4c86230bfe563ef1e3ef493b870203761bc9f32d"
diff --git a/recipes-qt/qt5/qtx11extras_5.1.1.bb b/recipes-qt/qt5/qtx11extras_5.1.1.bb
deleted file mode 100644
index 3d4d0308..00000000
--- a/recipes-qt/qt5/qtx11extras_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "b5910f7f503baf56082f89bce917651b"
5SRC_URI[sha256sum] = "a37f9e9436497ef96bd644b264752a415ffef57d5f5886010f079e332620c02a"
diff --git a/recipes-qt/qt5/qtx11extras_5.2.0.bb b/recipes-qt/qt5/qtx11extras_5.2.0.bb
new file mode 100644
index 00000000..75ba58cd
--- /dev/null
+++ b/recipes-qt/qt5/qtx11extras_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "1a11c4bb67503e2a5ef10b96bbe11b61"
5SRC_URI[sha256sum] = "98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 1d4a7253..ec4054eb 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "cb9d1a61b127030562a206c0142d99997eb82c8e" 4SRCREV = "120c2267e1960c03a22531c2d5bfe1d87d401ad9"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb
deleted file mode 100644
index 646e32a8..00000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.1.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "0db5f74de2a2e93bc2747a609ff81d5f"
5SRC_URI[sha256sum] = "bc7b48347ce3ab5d6a22223c001659f3d898cbd3ef9e35688d7ad1bf8e7510b5"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb
new file mode 100644
index 00000000..dede57b7
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns_5.2.0.bb
@@ -0,0 +1,5 @@
1require qt5-${PV}.inc
2require ${PN}.inc
3
4SRC_URI[md5sum] = "7c3e94cd04603c3f81e50d47daf5bbc7"
5SRC_URI[sha256sum] = "a8192ee70d8d3e9944a8d8f03521e3abf6beb7f6de1bf2d80871dfc4d9bd2a2a"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e824b8e7..8d357460 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "808c59c00f23109d1887022c2d9a6f4e5ecc72a4" 4SRCREV = "97f266a006d82cc8554915cba6bf767b93d71a06"