diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-09-08 15:31:48 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-09-09 10:47:33 +0000 |
commit | 8d3770b5fe81d13212d84151664ceb080fc60302 (patch) | |
tree | 07e371abd8430dccb767c666aa5e0c1faa37944c /recipes-qt/qt5 | |
parent | 70a09d3b12e3168d3e264eb572182d7f41540617 (diff) | |
download | meta-qt5-8d3770b5fe81d13212d84151664ceb080fc60302.tar.gz |
qt5: Update submodules
Change-Id: I8e71a3c84b439361eee8788c8315957fb1364e5a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
25 files changed, 38 insertions, 41 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2807a17e..ad9fb5cf 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -238,4 +238,4 @@ fakeroot do_generate_qt_environment_file() { | |||
238 | 238 | ||
239 | addtask generate_qt_environment_file after do_install before do_package | 239 | addtask generate_qt_environment_file after do_install before do_package |
240 | 240 | ||
241 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 241 | SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 1b48caf9..7b289dad 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 | ||
30 | SRCREV = "7fab1fa65675dfd62b1ddf6fed3226e465b37b67" | 30 | SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" |
31 | 31 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index c5795ed5..2bc7b9b0 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com> |
3 | 3 | ||
4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
5 | QT_MODULE_BRANCH ?= "5.6" | 5 | QT_MODULE_BRANCH ?= "5.6;nobranch=1" |
6 | 6 | ||
7 | # each module needs to define valid SRCREV | 7 | # each module needs to define valid SRCREV |
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 557f8607..cba36b21 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -116,4 +116,4 @@ do_install() { | |||
116 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt | 116 | ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt |
117 | } | 117 | } |
118 | 118 | ||
119 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 119 | SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" |
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 e596847b..70a71ff9 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 @@ | |||
1 | From 6b92250b1e3268c888319f76ca4cf6d9eee71b54 Mon Sep 17 00:00:00 2001 | 1 | From d98f945aade15bf49eb7c016d2eefd513351b360 Mon Sep 17 00:00:00 2001 |
2 | From: David Schulz <david.schulz@theqtcompany.com> | 2 | From: David Schulz <david.schulz@theqtcompany.com> |
3 | Date: Mon, 12 Oct 2015 09:55:30 +0200 | 3 | Date: Mon, 12 Oct 2015 09:55:30 +0200 |
4 | Subject: [PATCH] configure: Separate host and build platform. | 4 | Subject: [PATCH] configure: Separate host and build platform. |
@@ -51,7 +51,7 @@ index c50bd8b..cfb47de 100755 | |||
51 | 51 | ||
52 | ARCH="" | 52 | ARCH="" |
53 | diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test | 53 | diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test |
54 | index 69d4285..17e4154 100755 | 54 | index bc5258c..f5db184 100755 |
55 | --- a/config.tests/unix/compile.test | 55 | --- a/config.tests/unix/compile.test |
56 | +++ b/config.tests/unix/compile.test | 56 | +++ b/config.tests/unix/compile.test |
57 | @@ -10,7 +10,9 @@ OUTDIR=$5 | 57 | @@ -10,7 +10,9 @@ OUTDIR=$5 |
@@ -65,7 +65,7 @@ index 69d4285..17e4154 100755 | |||
65 | LFLAGS="$SYSROOT_FLAG" | 65 | LFLAGS="$SYSROOT_FLAG" |
66 | INCLUDEPATH="" | 66 | INCLUDEPATH="" |
67 | CFLAGS="$SYSROOT_FLAG" | 67 | CFLAGS="$SYSROOT_FLAG" |
68 | @@ -70,7 +72,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 | 68 | @@ -73,7 +75,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 |
69 | rm -f "$EXE" "${EXE}.exe" | 69 | rm -f "$EXE" "${EXE}.exe" |
70 | 70 | ||
71 | set -- \ | 71 | set -- \ |
@@ -76,7 +76,7 @@ index 69d4285..17e4154 100755 | |||
76 | -spec "$QMKSPEC" \ | 76 | -spec "$QMKSPEC" \ |
77 | "CONFIG+=$QMAKE_CONFIG" \ | 77 | "CONFIG+=$QMAKE_CONFIG" \ |
78 | diff --git a/configure b/configure | 78 | diff --git a/configure b/configure |
79 | index 2da6a78..85123e9 100755 | 79 | index 55b1886..ef9c29b 100755 |
80 | --- a/configure | 80 | --- a/configure |
81 | +++ b/configure | 81 | +++ b/configure |
82 | @@ -105,9 +105,11 @@ QT_CONFIG= | 82 | @@ -105,9 +105,11 @@ QT_CONFIG= |
@@ -394,16 +394,16 @@ index 2da6a78..85123e9 100755 | |||
394 | [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" | 394 | [ -n "$PKG_CONFIG" ] && [ "$OPT_VERBOSE" = "yes" ] && echo "Found pkg-config from mkspec: $PKG_CONFIG" |
395 | fi | 395 | fi |
396 | if [ -z "$PKG_CONFIG" ]; then | 396 | if [ -z "$PKG_CONFIG" ]; then |
397 | @@ -4313,7 +4437,7 @@ compileTest() | 397 | @@ -4317,7 +4441,7 @@ compileTest() |
398 | test_config="$QMAKE_CONFIG static" | 398 | TEST_CONFIG_FLAGS="QT_CONFIG+=no-pkg-config" |
399 | fi | 399 | fi |
400 | echo $ECHO_N "checking for $name... $ECHO_C" | 400 | echo $ECHO_N "checking for $name... $ECHO_C" |
401 | - "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS "$@" | 401 | - "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" $I_FLAGS $D_FLAGS $L_FLAGS $TEST_CONFIG_FLAGS "$@" |
402 | + "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" "$CFG_QMAKE_PATH" "$QTCONFFILE" $I_FLAGS $D_FLAGS $L_FLAGS "$@" | 402 | + "$unixtests/compile.test" "$XQMAKESPEC" "$test_config" $OPT_VERBOSE "$relpath" "$outpath" "$path" "$name" "$CFG_QMAKE_PATH" "$QTCONFFILE" $I_FLAGS $D_FLAGS $L_FLAGS $TEST_CONFIG_FLAGS "$@" |
403 | } | 403 | } |
404 | 404 | ||
405 | compileTestWithPkgConfig() | 405 | compileTestWithPkgConfig() |
406 | @@ -4362,7 +4486,7 @@ compileTestWithPkgConfig() | 406 | @@ -4366,7 +4490,7 @@ compileTestWithPkgConfig() |
407 | 407 | ||
408 | # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is | 408 | # Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is |
409 | OUTFILE=$outpath/arch.result | 409 | OUTFILE=$outpath/arch.result |
@@ -412,7 +412,7 @@ index 2da6a78..85123e9 100755 | |||
412 | if [ $? -eq 0 ]; then | 412 | if [ $? -eq 0 ]; then |
413 | eval `cat "$OUTFILE"` | 413 | eval `cat "$OUTFILE"` |
414 | else | 414 | else |
415 | @@ -4375,7 +4499,7 @@ rm -f "$OUTFILE" 2>/dev/null | 415 | @@ -4379,7 +4503,7 @@ rm -f "$OUTFILE" 2>/dev/null |
416 | 416 | ||
417 | if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then | 417 | if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then |
418 | # Do the same test again, using the host compiler | 418 | # Do the same test again, using the host compiler |
@@ -421,7 +421,7 @@ index 2da6a78..85123e9 100755 | |||
421 | if [ $? -eq 0 ]; then | 421 | if [ $? -eq 0 ]; then |
422 | eval `cat "$OUTFILE"` | 422 | eval `cat "$OUTFILE"` |
423 | else | 423 | else |
424 | @@ -4591,7 +4715,7 @@ fi | 424 | @@ -4595,7 +4719,7 @@ fi |
425 | 425 | ||
426 | # detect mips_dsp support | 426 | # detect mips_dsp support |
427 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then | 427 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then |
@@ -430,7 +430,7 @@ index 2da6a78..85123e9 100755 | |||
430 | CFG_MIPS_DSP=yes | 430 | CFG_MIPS_DSP=yes |
431 | else | 431 | else |
432 | CFG_MIPS_DSP=no | 432 | CFG_MIPS_DSP=no |
433 | @@ -4602,7 +4726,7 @@ fi | 433 | @@ -4606,7 +4730,7 @@ fi |
434 | 434 | ||
435 | # detect mips_dspr2 support | 435 | # detect mips_dspr2 support |
436 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then | 436 | if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then |
@@ -439,7 +439,7 @@ index 2da6a78..85123e9 100755 | |||
439 | CFG_MIPS_DSPR2=yes | 439 | CFG_MIPS_DSPR2=yes |
440 | else | 440 | else |
441 | CFG_MIPS_DSPR2=no | 441 | CFG_MIPS_DSPR2=no |
442 | @@ -7495,7 +7619,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null | 442 | @@ -7500,7 +7624,7 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null |
443 | cd .. | 443 | cd .. |
444 | fi | 444 | fi |
445 | 445 | ||
@@ -640,6 +640,3 @@ index 98ca86a..11cff9e 100644 | |||
640 | $$files($$PWD/mkspecs/*) | 640 | $$files($$PWD/mkspecs/*) |
641 | mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst | 641 | mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst |
642 | INSTALLS += mkspecs | 642 | INSTALLS += mkspecs |
643 | -- | ||
644 | 1.9.1 | ||
645 | |||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 467b1f9f..812e17e4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -251,4 +251,4 @@ sysroot_stage_dirs_append() { | |||
251 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} | 251 | rm -rf $to${OE_QMAKE_PATH_QT_FONTS} |
252 | } | 252 | } |
253 | 253 | ||
254 | SRCREV = "7bf002c3b3f8009138fca217c7fa0c234aed21bd" | 254 | SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index c7ec72ab..23029d50 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS = "qtdeclarative" | 11 | DEPENDS = "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "95884805facd1721eea025467afd85ed64a70504" | 13 | SRCREV = "2778071f6c80b5397a183db37114aef881ade855" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 94c331b5..886bcc81 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 | ||
28 | SRCREV = "71a0d199a29001cc31bfde15aabcc53cf88aae1e" | 28 | SRCREV = "21e7cb1bafdfc06c263e10067d02f9b103ff660f" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ecbca7a2..c5153d78 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -39,6 +39,6 @@ do_install_append_class-nativesdk() { | |||
39 | 39 | ||
40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 40 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
41 | 41 | ||
42 | SRCREV = "a05f59388e004160899d5d311884cfabe10c3b8c" | 42 | SRCREV = "dcede8bbe1a4e1401679d42bf7179305771d0c5a" |
43 | 43 | ||
44 | BBCLASSEXTEND =+ "native nativesdk" | 44 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 37e1f401..e7bce9de 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+ | |||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" |
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" |
30 | 30 | ||
31 | SRCREV = "99f384ac2353df89a1522e47c96cae6a945749e1" | 31 | SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 59be91fc..5416d8e8 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -29,4 +29,4 @@ do_configure_prepend() { | |||
29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" | 29 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" |
30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" | 30 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" |
31 | 31 | ||
32 | SRCREV = "04762a9eecafc80ebeb90c06258de551d451497f" | 32 | SRCREV = "7504b2ce36a90261ba2409e4160570b58d8b38e0" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 71e78abb..416959a4 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 | ||
38 | SRCREV = "d7d31d63db5f0029a4a5e24d998601baee8bade0" | 38 | SRCREV = "6d95682d7ff282180655f2f384d8aba69c4f67af" |
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index a2163ffe..6c2d3095 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb | |||
@@ -26,4 +26,4 @@ do_configure_prepend() { | |||
26 | sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro | 26 | sed -i 's#^qtHaveModule(webkitwidgets):#qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit):#g' ${S}/src/imports/imports.pro |
27 | } | 27 | } |
28 | 28 | ||
29 | SRCREV = "e90625f00a3727ca1c89a94407b7686327d03c19" | 29 | SRCREV = "5eab543c5c955f5057225b9bdb6b2757516dbd3e" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 66ec15e9..32053e45 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative" | |||
12 | 12 | ||
13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" | 13 | FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" |
14 | 14 | ||
15 | SRCREV = "eed9b9dd83f0db9cbfe794072d8f5147e3d1234a" | 15 | SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 42d504e2..344cb50e 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ SRC_URI += " \ | |||
17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ | 17 | file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "84a26f223b220a444dec2b43fffc71dab7e00d1d" | 20 | SRCREV = "846d04cec8d946c28ddbeecc79c63553e0891736" |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index e599617c..e5c5224e 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
@@ -14,4 +14,4 @@ LIC_FILES_CHKSUM = " \ | |||
14 | 14 | ||
15 | DEPENDS += "qtbase qtdeclarative" | 15 | DEPENDS += "qtbase qtdeclarative" |
16 | 16 | ||
17 | SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" | 17 | SRCREV = "46d9a630a88fc5388dec7fd99289d0e9e0e1f680" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 10780bea..725d0125 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ | |||
15 | 15 | ||
16 | DEPENDS += "qtbase" | 16 | DEPENDS += "qtbase" |
17 | 17 | ||
18 | SRCREV = "133dbd59fb04974149d2140b267fce91a7cfd4a2" | 18 | SRCREV = "b0e3e7469cf5249bb395d044c5344bbe88884553" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 87854aff..0e7b6697 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 31 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" | 32 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" |
33 | 33 | ||
34 | SRCREV = "bda7ece99a8162118a91e9f475c149be39846ecd" | 34 | SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e" |
35 | 35 | ||
36 | BBCLASSEXTEND = "native nativesdk" | 36 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 5e11d24f..5995c991 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 | ||
117 | SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" | 117 | SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119" |
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb index 786271d0..91dc96e5 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 | ||
28 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" | 28 | SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 3153dc06..dd774023 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 | ||
39 | SRCREV = "d8b4bef3ddff327598027c8f94a61e3d0b61a2dd" | 39 | SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 9682e81a..fbc00435 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -119,10 +119,10 @@ 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 | ||
122 | SRCREV_qtwebengine = "808ca6e6917cf17e4c30fcd3ac609164b36594cc" | 122 | SRCREV_qtwebengine = "2209add7a5b019afef7830d8bbf416fbb2a2ecf5" |
123 | # This is in git submodule, but we're using latest in 45-based | 123 | # This is in git submodule, but we're using latest in 45-based |
124 | # SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" | 124 | # SRCREV_chromium = "79930a541473b2e0f950d040c16ab6f22e4aeef3" |
125 | SRCREV_chromium = "9d6566ee193e8996fb867cf776dc13f697400f24" | 125 | SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" |
126 | SRCREV = "${SRCREV_qtwebengine}" | 126 | SRCREV = "${SRCREV_qtwebengine}" |
127 | 127 | ||
128 | SRCREV_FORMAT = "qtwebengine_chromium" | 128 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c71850a1..d679994a 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -71,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 71 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 72 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
73 | 73 | ||
74 | SRCREV = "a6c9dd667d534d3342bfba456f9d5c146a924de0" | 74 | SRCREV = "bb43bca1664721401c3a2c25b585913bb5e8cb4f" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 04f762ed..c71a69f3 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "e66dcd51d0e5517e88cd59912fd08501522a2902" | 14 | SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index e6962a60..f715f1e7 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \ | |||
13 | 13 | ||
14 | DEPENDS += "qtbase" | 14 | DEPENDS += "qtbase" |
15 | 15 | ||
16 | SRCREV = "c0b6fbcadbefcc8a91e5db7fd98662dddcd7a0f8" | 16 | SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" |
17 | 17 | ||
18 | BBCLASSEXTEND =+ "native nativesdk" | 18 | BBCLASSEXTEND =+ "native nativesdk" |