summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-04-11 09:45:32 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2016-04-13 08:19:18 +0000
commit46817620916ed6d8b8f07c720f29d1faa73eafae (patch)
tree4a4d3f0476d4bc1dc8534743d0e55f6233fa8cff
parente29477ac42b47f4fedd2cb4be27ec2e4aa70540c (diff)
downloadmeta-qt5-46817620916ed6d8b8f07c720f29d1faa73eafae.tar.gz
qt5: update submodules
Change-Id: I984a2f3d412f4d36c79fda1f08662bffda266649 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch49
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch30
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb4
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch13
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
31 files changed, 61 insertions, 91 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 2197c732..ef2de88b 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -239,4 +239,4 @@ fakeroot do_generate_qt_environment_file() {
239 239
240addtask generate_qt_environment_file after do_install before do_package 240addtask generate_qt_environment_file after do_install before do_package
241 241
242SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" 242SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index a19422b6..2b889430 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
28" 28"
29 29
30SRCREV = "9b9f34701f47824e8201453d148152fb0855f98a" 30SRCREV = "9c67288ea4791fee5e28d1b4f2981c232b95c9d0"
31 31
32BBCLASSEXTEND += "native nativesdk" 32BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 46a1f548..e1c7fb70 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -115,4 +115,4 @@ do_install() {
115 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 115 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
116} 116}
117 117
118SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" 118SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
diff --git a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
index bfe1ba8b..0b6aa544 100644
--- a/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
+++ b/recipes-qt/qt5/qtbase/0002-configure-Separate-host-and-build-platform.patch
@@ -1,4 +1,4 @@
1From 4a99cb44a7913ff86e644dc08578e579958983a4 Mon Sep 17 00:00:00 2001 1From b0e46ec8b5f3a220a1660677c87cefa5fc3a7fc9 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Mon, 12 Oct 2015 09:55:30 +0200 3Date: Mon, 12 Oct 2015 09:55:30 +0200
4Subject: [PATCH] configure: Separate host and build platform. 4Subject: [PATCH] configure: Separate host and build platform.
@@ -15,14 +15,14 @@ Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc
15--- 15---
16 config.tests/unix/arch.test | 6 +- 16 config.tests/unix/arch.test | 6 +-
17 config.tests/unix/compile.test | 6 +- 17 config.tests/unix/compile.test | 6 +-
18 configure | 163 ++++++++++++++++++++++++++++++++----- 18 configure | 164 ++++++++++++++++++++++++++++++++-----
19 mkspecs/features/device_config.prf | 15 ++-- 19 mkspecs/features/device_config.prf | 15 ++--
20 mkspecs/features/qt_functions.prf | 2 +- 20 mkspecs/features/qt_functions.prf | 2 +-
21 mkspecs/features/qt_tool.prf | 57 ++++++++----- 21 mkspecs/features/qt_tool.prf | 57 ++++++++-----
22 qmake/qmake-aux.pro | 11 +++ 22 qmake/qmake-aux.pro | 11 +++
23 qmake/qmake-docs.pro | 2 - 23 qmake/qmake-docs.pro | 2 -
24 qtbase.pro | 15 +--- 24 qtbase.pro | 15 +---
25 9 files changed, 210 insertions(+), 67 deletions(-) 25 9 files changed, 210 insertions(+), 68 deletions(-)
26 create mode 100644 qmake/qmake-aux.pro 26 create mode 100644 qmake/qmake-aux.pro
27 delete mode 100644 qmake/qmake-docs.pro 27 delete mode 100644 qmake/qmake-docs.pro
28 28
@@ -75,7 +75,7 @@ index 65bc874..45c365c 100755
75 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes 75 OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
76 else 76 else
77diff --git a/configure b/configure 77diff --git a/configure b/configure
78index d923bbb..175eb02 100755 78index 42e49c5..a244acb 100755
79--- a/configure 79--- a/configure
80+++ b/configure 80+++ b/configure
81@@ -104,9 +104,11 @@ QT_CONFIG= 81@@ -104,9 +104,11 @@ QT_CONFIG=
@@ -238,12 +238,12 @@ index d923bbb..175eb02 100755
238- if [ "$BUILD_ON_MSYS" = "yes" ]; then 238- if [ "$BUILD_ON_MSYS" = "yes" ]; then
239+ case `basename "$PLATFORM"` in 239+ case `basename "$PLATFORM"` in
240+ win32-g++*) 240+ win32-g++*)
241 EXTRA_CFLAGS="-DUNICODE" 241 EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE"
242 EXTRA_CXXFLAGS="-DUNICODE" 242 EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE"
243 EXTRA_OBJS="qfilesystemengine_win.o \ 243 EXTRA_OBJS="qfilesystemengine_win.o \
244@@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 244@@ -4078,7 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
245 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" 245 \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
246 EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32" 246 EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32"
247 EXEEXT=".exe" 247 EXEEXT=".exe"
248- else 248- else
249+ ;; 249+ ;;
@@ -251,17 +251,18 @@ index d923bbb..175eb02 100755
251 EXTRA_OBJS="qfilesystemengine_unix.o \ 251 EXTRA_OBJS="qfilesystemengine_unix.o \
252 qfilesystemiterator_unix.o \ 252 qfilesystemiterator_unix.o \
253 qfsfileengine_unix.o \ 253 qfsfileengine_unix.o \
254@@ -4068,7 +4103,8 @@ \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" 254@@ -4088,8 +4123,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
255 \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
255 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\"" 256 \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
256 EXEEXT= 257 EXEEXT=
257 258-
258- fi 259- fi
259+ ;; 260+ ;;
260+ esac 261+ esac
261 if [ "$BUILD_ON_MAC" = "yes" ]; then 262 if [ "$BUILD_ON_MAC" = "yes" ]; then
262 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile" 263 echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
263 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" 264 echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
264@@ -4089,6 +4125,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 265@@ -4110,6 +4145,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
265 if [ '!' -z "$D_FLAGS" ]; then 266 if [ '!' -z "$D_FLAGS" ]; then
266 EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" 267 EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS"
267 fi 268 fi
@@ -269,7 +270,7 @@ index d923bbb..175eb02 100755
269 echo >>"$mkfile" 270 echo >>"$mkfile"
270 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` 271 adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
271 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` 272 adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
272@@ -4178,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf" 273@@ -4179,7 +4215,81 @@ QTCONFFILE="$outpath/bin/qt.conf"
273 cat > "$QTCONFFILE" <<EOF 274 cat > "$QTCONFFILE" <<EOF
274 [EffectivePaths] 275 [EffectivePaths]
275 Prefix=.. 276 Prefix=..
@@ -291,7 +292,7 @@ index d923bbb..175eb02 100755
291+if [ -n "$QT_INSTALL_LIBS" ]; then 292+if [ -n "$QT_INSTALL_LIBS" ]; then
292+cat >> "$QTCONFFILE" <<EOF 293+cat >> "$QTCONFFILE" <<EOF
293+Libraries=$QT_INSTALL_LIBS 294+Libraries=$QT_INSTALL_LIBS
294 EOF 295+EOF
295+fi 296+fi
296+if [ -n "$QT_INSTALL_DOCS" ]; then 297+if [ -n "$QT_INSTALL_DOCS" ]; then
297+cat >> "$QTCONFFILE" <<EOF 298+cat >> "$QTCONFFILE" <<EOF
@@ -326,7 +327,7 @@ index d923bbb..175eb02 100755
326+if [ -n "$QT_INSTALL_DATA" ]; then 327+if [ -n "$QT_INSTALL_DATA" ]; then
327+cat >> "$QTCONFFILE" <<EOF 328+cat >> "$QTCONFFILE" <<EOF
328+Data=$QT_INSTALL_DATA 329+Data=$QT_INSTALL_DATA
329+EOF 330 EOF
330+fi 331+fi
331+if [ -n "$QT_HOST_PREFIX" ]; then 332+if [ -n "$QT_HOST_PREFIX" ]; then
332+cat >> "$QTCONFFILE" <<EOF 333+cat >> "$QTCONFFILE" <<EOF
@@ -351,7 +352,7 @@ index d923bbb..175eb02 100755
351 if [ x"$relpath" != x"$outpath" ]; then 352 if [ x"$relpath" != x"$outpath" ]; then
352 cat >> "$QTCONFFILE" <<EOF 353 cat >> "$QTCONFFILE" <<EOF
353 [EffectiveSourcePaths] 354 [EffectiveSourcePaths]
354@@ -4186,6 +4297,9 @@ Prefix=$relpath 355@@ -4187,6 +4297,9 @@ Prefix=$relpath
355 EOF 356 EOF
356 fi 357 fi
357 358
@@ -361,7 +362,7 @@ index d923bbb..175eb02 100755
361 #------------------------------------------------------------------------------- 362 #-------------------------------------------------------------------------------
362 # write out device config before we run the test. 363 # write out device config before we run the test.
363 #------------------------------------------------------------------------------- 364 #-------------------------------------------------------------------------------
364@@ -4198,9 +4312,20 @@ else 365@@ -4199,9 +4312,20 @@ else
365 fi 366 fi
366 367
367 #------------------------------------------------------------------------------- 368 #-------------------------------------------------------------------------------
@@ -383,7 +384,7 @@ index d923bbb..175eb02 100755
383 if [ $? != "0" ]; then 384 if [ $? != "0" ]; then
384 echo "Failed to process makespec for platform '$XPLATFORM'" 385 echo "Failed to process makespec for platform '$XPLATFORM'"
385 if [ "$OPT_VERBOSE" = "yes" ]; then 386 if [ "$OPT_VERBOSE" = "yes" ]; then
386@@ -4216,7 +4341,7 @@ fi 387@@ -4217,7 +4341,7 @@ fi
387 #------------------------------------------------------------------------------- 388 #-------------------------------------------------------------------------------
388 if [ -z "$PKG_CONFIG" ]; then 389 if [ -z "$PKG_CONFIG" ]; then
389 # See if PKG_CONFIG is set in the mkspec: 390 # See if PKG_CONFIG is set in the mkspec:
@@ -392,7 +393,7 @@ index d923bbb..175eb02 100755
392 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" 393 [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG"
393 fi 394 fi
394 if [ -z "$PKG_CONFIG" ]; then 395 if [ -z "$PKG_CONFIG" ]; then
395@@ -4291,7 +4416,7 @@ compileTest() 396@@ -4292,7 +4416,7 @@ compileTest()
396 if [ "$CFG_SHARED" = "no" ]; then 397 if [ "$CFG_SHARED" = "no" ]; then
397 test_config="$QMAKE_CONFIG static" 398 test_config="$QMAKE_CONFIG static"
398 fi 399 fi
@@ -401,7 +402,7 @@ index d923bbb..175eb02 100755
401 } 402 }
402 403
403 compileTestWithPkgConfig() 404 compileTestWithPkgConfig()
404@@ -4340,7 +4465,7 @@ compileTestWithPkgConfig() 405@@ -4341,7 +4465,7 @@ compileTestWithPkgConfig()
405 406
406 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is 407 # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
407 OUTFILE=$outpath/arch.result 408 OUTFILE=$outpath/arch.result
@@ -410,7 +411,7 @@ index d923bbb..175eb02 100755
410 if [ $? -eq 0 ]; then 411 if [ $? -eq 0 ]; then
411 eval `cat "$OUTFILE"` 412 eval `cat "$OUTFILE"`
412 else 413 else
413@@ -4353,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null 414@@ -4354,7 +4478,7 @@ rm -f "$OUTFILE" 2>/dev/null
414 415
415 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then 416 if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
416 # Do the same test again, using the host compiler 417 # Do the same test again, using the host compiler
@@ -419,7 +420,7 @@ index d923bbb..175eb02 100755
419 if [ $? -eq 0 ]; then 420 if [ $? -eq 0 ]; then
420 eval `cat "$OUTFILE"` 421 eval `cat "$OUTFILE"`
421 else 422 else
422@@ -4569,7 +4694,7 @@ fi 423@@ -4570,7 +4694,7 @@ fi
423 424
424 # detect mips_dsp support 425 # detect mips_dsp support
425 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then 426 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then
@@ -428,7 +429,7 @@ index d923bbb..175eb02 100755
428 CFG_MIPS_DSP=yes 429 CFG_MIPS_DSP=yes
429 else 430 else
430 CFG_MIPS_DSP=no 431 CFG_MIPS_DSP=no
431@@ -4580,7 +4705,7 @@ fi 432@@ -4581,7 +4705,7 @@ fi
432 433
433 # detect mips_dspr2 support 434 # detect mips_dspr2 support
434 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then 435 if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then
@@ -437,7 +438,7 @@ index d923bbb..175eb02 100755
437 CFG_MIPS_DSPR2=yes 438 CFG_MIPS_DSPR2=yes
438 else 439 else
439 CFG_MIPS_DSPR2=no 440 CFG_MIPS_DSPR2=no
440@@ -7467,7 +7592,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null 441@@ -7471,7 +7595,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null
441 cd .. 442 cd ..
442 fi 443 fi
443 444
@@ -475,10 +476,10 @@ index e0383ef..9281d3e 100644
475 # Provide a function to be used by mkspecs 476 # Provide a function to be used by mkspecs
476 defineTest(deviceSanityCheckCompiler) { 477 defineTest(deviceSanityCheckCompiler) {
477diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 478diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
478index b2c2507..c16005f 100644 479index 8639695..e250959 100644
479--- a/mkspecs/features/qt_functions.prf 480--- a/mkspecs/features/qt_functions.prf
480+++ b/mkspecs/features/qt_functions.prf 481+++ b/mkspecs/features/qt_functions.prf
481@@ -57,7 +57,7 @@ defineTest(qtHaveModule) { 482@@ -70,7 +70,7 @@ defineTest(qtHaveModule) {
482 defineTest(qtPrepareTool) { 483 defineTest(qtPrepareTool) {
483 cmd = $$eval(QT_TOOL.$${2}.binary) 484 cmd = $$eval(QT_TOOL.$${2}.binary)
484 isEmpty(cmd) { 485 isEmpty(cmd) {
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c4dc5609..1a99eaad 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -249,4 +249,4 @@ sysroot_stage_dirs_append() {
249 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 249 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
250} 250}
251 251
252SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" 252SRCREV = "8ce657d0279566ef327af1b88339534041ddc012"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 4990f348..5b12d1a7 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "b351fb164af327828c9bdbc414ffd8e47e387e8c" 13SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index cf6d3c51..8c52b844 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "dec32076b9153febc575a0418af702f8cb400258" 28SRCREV = "80b6557be3a23a5118ddf8c4b68bc28b66f52b49"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 24825ec2..141cde36 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -38,6 +38,6 @@ do_install_append_class-nativesdk() {
38 38
39EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 39EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 40
41SRCREV = "0fab5761d5428aa708edd66e40fc3c449adc4b11" 41SRCREV = "d438b4f4b93d04a841edf031359e26af617d889d"
42 42
43BBCLASSEXTEND =+ "native nativesdk" 43BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 5590abdd..c8806f14 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 12DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 13
14SRCREV = "60a135102aaa37d0d817883e4d6aed456372709d" 14SRCREV = "a6434420574f775d3afa6e8912eb2ede8429db90"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index c35cc809..606b873a 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "24f3fd69a2e953619c48b4a632262ce8419fee40" 20SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index b49940be..4c4431d4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "58f19cf8d51e06f1781f3142e6d872e5feb0690e" 31SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 50729032..d1dfec5b 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "03163a3c9129b7f982b690e750056506c3d06b41" 32SRCREV = "f40e92b147560be15e0f53dfd7f6b2d698c00fb9"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index ce423021..bb0a506d 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 36"
37 37
38SRCREV = "3b6de26fe585c586d055ac86c5911cc6df0e3887" 38SRCREV = "3fb3231a9e22dcb780d5b31ec57896429d40b0e5"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index e0a264d4..25e8b701 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
24} 24}
25 25
26SRCREV = "87f2415adf34da08e6cd58f5da6f6a7d0d9cf141" 26SRCREV = "bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 1e25d6e0..117c0079 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtdeclarative"
13 13
14RDEPENDS_${PN}-dev = "" 14RDEPENDS_${PN}-dev = ""
15 15
16SRCREV = "93d06fb27d7eae9290db33b6684916a225939f0b" 16SRCREV = "b1d29faf96ee6323bf2dad054291fd7c30a30c05"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 32f6ebf3..565ca843 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "a5e814fd8809dd6a8a3c3efd4b911b36e3325a2a" 30SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 4fbd15b1..16c20956 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase qtdeclarative" 16DEPENDS += "qtbase qtdeclarative"
17 17
18SRCREV = "fbaca62cd0a7309f04bf82101c8e20dbbf423192" 18SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index f32a8e13..4139db1f 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "02e4a66a8bd9ce4d2f7f8c89cd1bddf4b6385b5f" 18SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478"
diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
deleted file mode 100644
index c0e13898..00000000
--- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 5 Nov 2015 12:25:05 +0100
4Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other
5 examples
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 examples/svg/richtext/textobject/textobject.pro | 8 +++++---
10 1 file changed, 5 insertions(+), 3 deletions(-)
11
12diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro
13index 794ad32..0ecd2c7 100644
14--- a/examples/svg/richtext/textobject/textobject.pro
15+++ b/examples/svg/richtext/textobject/textobject.pro
16@@ -12,6 +12,8 @@ RESOURCES = resources.qrc
17 target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject
18 INSTALLS += target
19
20-filesToDeploy.files = files/*.svg
21-filesToDeploy.path = files
22-DEPLOYMENT += filesToDeploy
23+wince* {
24+ filesToDeploy.files = files/*.svg
25+ filesToDeploy.path = files
26+ DEPLOYMENT += filesToDeploy
27+}
28--
292.7.0
30
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index d2699f70..93dc51eb 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,6 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "a9ac71a443260de66f720f0184646847b03fcb46" 16SRCREV = "b722836765dccca04683939d0d4f72a9e2585d88"
17
18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index c4c0a14d..1e216e45 100644
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,4 +1,4 @@
1From 1140fd4bb5768d49cad9e834a9ce5eb05b711d0e Mon Sep 17 00:00:00 2001 1From 6ae63cf69985c740d2b45242c1f1bb962c6c8b4b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/4] assistant/help: fix linking of dependent libraries
@@ -18,15 +18,16 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
18 1 file changed, 2 insertions(+) 18 1 file changed, 2 insertions(+)
19 19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro 20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 168d23d..a9c3b59 100644 21index 37d5ba4..ca90a68 100644
22--- a/src/assistant/help/help.pro 22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro 23+++ b/src/assistant/help/help.pro
24@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \ 24@@ -59,4 +59,6 @@ HEADERS += qhelpenginecore.h \
25 # access to clucene
26 HEADERS += qhelpsearchindexwriter_clucene_p.h \ 25 HEADERS += qhelpsearchindexwriter_clucene_p.h \
27 qhelpsearchindexreader_clucene_p.h 26 qhelpsearchindexreader_clucene_p.h
28+ 27
29+LIBS += -lQt5CLucene 28+LIBS += -lQt5CLucene
29+
30 load(qt_module)
30-- 31--
312.7.0 321.9.1
32 33
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 89916337..eaeeca7b 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "05206b44cf25ca6a895cc9a8716f2b7f2f14191f" 34SRCREV = "aec1d10c66a676781c767099e81871faa040162f"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 7908a3e5..b7bdd7fc 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "ce85e4ee4ee22e5dea3b44707a27dab44319708e" 117SRCREV = "cbef985e3c3e9af2d124d40959fc674b3b8aa33f"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index c88cf696..21827d74 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -25,4 +25,4 @@ do_install() {
25 oe_runmake install INSTALL_ROOT=${D} 25 oe_runmake install INSTALL_ROOT=${D}
26} 26}
27 27
28SRCREV = "bebe9beff3e9874498474cec32634cf281ddc453" 28SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 78d8a3eb..1b4f899c 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -36,4 +36,4 @@ SRC_URI += " \
36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
37" 37"
38 38
39SRCREV = "bebe9beff3e9874498474cec32634cf281ddc453" 39SRCREV = "b94be41409a6dfa58d8b3ae8413c6930e76fc040"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index eb4475b6..79c6b23f 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "3fa1c9d2cf5e00e7431d042e7955a6dd75e6e2b1" 18SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 32a6459d..205193fa 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -119,8 +119,8 @@ SRC_URI += " \
119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
120" 120"
121 121
122SRCREV_qtwebengine = "3f02c25de46f5ff296b8189af3435ce5800b39a7" 122SRCREV_qtwebengine = "4ed08bb0a8195746c333dabbdb9da3400d174296"
123SRCREV_chromium = "779a2388fc123a7f3a178ce2ced921ee4a307e2c" 123SRCREV_chromium = "0a385bb01d9cf060fae4c9d350ee98561654df96"
124SRCREV = "${SRCREV_qtwebengine}" 124SRCREV = "${SRCREV_qtwebengine}"
125 125
126SRCREV_FORMAT = "qtwebengine_chromium" 126SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 04cefada..2e05b814 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -72,4 +72,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
72RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 72RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
73export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 73export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
74 74
75SRCREV = "d2ff5a085572b1ee24dcb42ae107063f3142d14e" 75SRCREV = "3b4c850361abbc2aae556dbf99c8e4c8086ae569"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index fbce6be6..6ddfd780 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "2d8c94cf11097b61689757f8a0162bb7dd9d7d0b" 14SRCREV = "3b128f9b45f4fafc305ff0c89cfc2cb665c856d5"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 0ae8e4a2..d8beb500 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "5df9fa8f3a7209c067a5d5068776b9aa52273d3b" 16SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index c4245628..398d4a3e 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "a8d103a05bc195dd045779f3aebdf67bd0140df1" 16SRCREV = "7a8d395a3b1eb5f24aa96509666326bad4218c14"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"