diff options
39 files changed, 45 insertions, 155 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 8e1fe206..3bc1279d 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -29,7 +29,6 @@ EXTRA_OEMAKE = " \ OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ OE_QMAKE_AR='${OE_QMAKE_AR}' \ OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ - OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \ " @@ -43,7 +42,6 @@ export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" # qmake reads if from shell environment export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" @@ -88,7 +86,7 @@ generate_qt_config_file_effective_paths() { [EffectivePaths] HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} HostData = ${OE_QMAKE_PATH_HOST_DATA} -HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native} +HostPrefix = ${STAGING_DIR_NATIVE} EOF } # diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2b8a4d33..77bea223 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -200,4 +200,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" +SRCREV = "f4c2fcc052e5c27e8765e68216f02e1e1915e5bc" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 31598de9..c0ef6849 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -3,6 +3,7 @@ From: Samuli Piippo <samuli.piippo@theqtcompany.com> Date: Wed, 10 Feb 2016 09:02:09 +0200 Subject: [PATCH] Allow a tools-only build +Change-Id: I4de6b96ec51fe297a0eeb757cef56d8fb40bd6f0 --- qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 19925b32..d831578f 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -37,6 +37,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "2970ef3dacda02fdf52ac25f3b93694eb06e6f7f" +SRCREV = "096500140bedb56bdac3b4c4daa4d0c210c691fb" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 0115a97f..9c9dd7a0 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -125,4 +125,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" +SRCREV = "f4c2fcc052e5c27e8765e68216f02e1e1915e5bc" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index e99a0c2b..130c5890 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From f289763d524fb4012c95191f1ed9c5c680c33b28 Mon Sep 17 00:00:00 2001 +From a77e7c2996ca25cc59b04b165a24575440dd7efa Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -23,9 +23,9 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> configure | 2 +- mkspecs/features/configure.prf | 4 ++-- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 43 ++++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 5 files changed, 48 insertions(+), 4 deletions(-) + 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -78,10 +78,10 @@ index 1903e50..c093dd4 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000..c1837e6 +index 0000000..30d31ed --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -95,7 +95,6 @@ index 0000000..c1837e6 +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs +QMAKE_STRIP = $$(OE_QMAKE_STRIP) -+QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER) + +include(../common/gcc-base-unix.conf) + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 13f401d3..0104a45c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -119,7 +119,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups" PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus" PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil" PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase" -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5" +PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5" PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql" PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc" PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" @@ -214,7 +214,7 @@ do_install_append() { touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri # Replace host paths with qmake built-in properties - sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ + sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri @@ -228,4 +228,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "f2095f2c66d0dae8525879f6c14165ace650e7f1" +SRCREV = "f4c2fcc052e5c27e8765e68216f02e1e1915e5bc" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index bdb46f8a..3979f504 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "5b920d86dbc00f05f5679bcf8fe9ee1ba19b06f7" +SRCREV = "9030337d37cdfad7d42b2ea1d3052e499df8f8dc" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 7a6f7a0c..6d3a2037 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "47e3a4b81832932f1500c61762fb6d47e0fa8cc2" +SRCREV = "0044a3519fb8be4ddab16b56fd33cf9835fdfe57" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index d6f9c068..02567751 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "b88b57c56b14c88dce83d7c267b5d52d18fd784a" +SRCREV = "6d2e1761ebd62ef60c39af83b7ef88ac986b2d1e" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index aa1daeb7..92ee4806 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "c3c6e604ee1193deb1bbff8e6f26ea2aeefdbe91" +SRCREV = "8aeab2c338a93222d937dac626d920e88cd354c8" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 42fc6c63..0f1a30fc 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "f23d1d54a06b0f3473e17300c3a1c495bcc25fdc" +SRCREV = "dfbe91853737ff8ab548925bbd40fc9183a6e05d" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index e07cc99c..b9a03b4e 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d1054b8e44d17ecbfae3cd455e07d6c379ef099a" +SRCREV = "853408648213fbf21217615cf24845064e24e138" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 6df632fc..84100f47 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "c9a0a0f661d5ce789e5ab6743782afa463dd289a" +SRCREV = "3d317f1bb018e6c519a54f428dc4c5309a24dfad" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index bef03e07..9b840f3c 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "bcc376e41f1e99a16bcf9c86b0d8112dd2010b52" +SRCREV = "0267be9dac0eb41b6121b1b9d861094dcd967722" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 0af39464..457ec9c7 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -29,7 +29,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "4f8604bf7a94e64f40f5bb769d2105ca4e2f8e9b" +SRCREV_qtlocation = "0008c4b6cc1b935915ba92982e7fea0b9af8dfb0" SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 0268c87a..c664bf6a 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -35,4 +35,4 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "01fd723848fd6007b03c27edd85d8e9c6b6ce881" +SRCREV = "c70e05a8e3977918541c1f92f7d948a674919b3e" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 7c89245c..73696a0d 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "92f6d5d612ec3f6ef702ab55d4887c7b06883bc8" +SRCREV = "e62fdc9887d4bdc2d1cfd07c918dd15cd1992baf" diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch deleted file mode 100644 index 42156dcc..00000000 --- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6af3818fd0008327839d27ab58cf2af5fa3bcce6 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko <denys@ti.com> -Date: Thu, 31 Mar 2016 19:57:01 -0400 -Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' - -Upstream-Status: Pending - -Signed-off-by: Denys Dmytriyenko <denys@ti.com> ---- - examples/quickcontrols/controls/texteditor/src/documenthandler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp -index 69da88f..9039191 100644 ---- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp -+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp -@@ -54,6 +54,7 @@ - #include <QtGui/QTextCursor> - #include <QtGui/QFontDatabase> - #include <QtCore/QFileInfo> -+#include <QtCore/QDebug> - - DocumentHandler::DocumentHandler() - : m_target(0) diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 8c8402ef..4248fd56 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "9a2950600087b0784b06b0521b409fce69960a2d" +SRCREV = "c51eea88704938fec93632c01d32c4587a6da015" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index c7c491da..3ec656ce 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -12,17 +12,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -RDEPENDS_${PN}-dev = "" - FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 -# 5.9.meta-qt5.5 -SRC_URI += " \ - file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ -" - -SRCREV = "75e9561d4fdf8e94c6d556b9a37bdccdaaf80c10" +SRCREV = "f050a32a4392628ee3e2cb5afe4dbdc792dc05c2" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 86739015..5508f124 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7aef155a56954da9cb29b36672b0ef7e8727010a" +SRCREV = "dc2a27771daefefe746310fd25aa06f716df0976" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index e2d52255..40b6e9d1 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -30,4 +30,4 @@ DEPENDS += "qtbase" # http://errors.yoctoproject.org/Errors/Build/44915/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "945a4b0ad718a3462660a9782d0a78974a0d8cb9" +SRCREV = "b67dcb4883e762269a49606b58ba0f77fdb25008" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 78f44596..0e326535 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "e5bfed810cdceedb8b7597d03c9649cddf9a5f3f" +SRCREV = "d37ce5ab3bcbdd3258d45a229ac4978f27ca0c12" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 # 5.9.meta-qt5.5 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 2017e00f..719da87a 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b50891d2d5c8677622eba5f2bb86af7be093c434" +SRCREV = "d552586debd5d2808e0e290e18ccd380dfceaebd" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 7b86b4ef..d84acd36 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "5165c67091da4438f2d37290f6c5855250d87eb0" +SRCREV = "9b1700a54e4199c08e9175709640d433420e77b0" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 7f3b959c..a99d3f05 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,7 +3,7 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "e40bf5347cb9298cafdb1004366ab436c1493cfe" +SRCREV = "fa6766b3971728d6388f454531753e86d1e6dc1c" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 54268bfb..98ba9f88 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "24273f154a4e4930d233e6711cbf718887576002" +SRCREV = "dec74295e8d378e7827c53c0ca665516cc22b013" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 1f24d290..d2070e64 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -31,7 +31,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "0c112f5980a39d370a90c34f8dfb778a6bd6a780" +SRCREV = "502f06a5617477a83f881963589de1b2fcce0b7c" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 88a390f9..afe0d74d 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -106,4 +106,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "23cc9020b9ed8a39d217d391d052bed62c1ed0cb" +SRCREV = "20f821fc8b8d5b4091e19ef070b4979632835628" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index e5906d66..e867714b 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "5c9ce0adf6ef8b28bc6196326f711a9d039738ea" +SRCREV = "0c52fc067c1b88d7b54703e8790a7f9be10920f1" diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch deleted file mode 100644 index b2ff754c..00000000 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c9c02d1a7d48f97bcbf85dca884e65b6ed3ec7c1 Mon Sep 17 00:00:00 2001 -From: Raphael Freudiger <laser_b@gmx.ch> -Date: Tue, 10 Jan 2017 15:49:55 +0100 -Subject: [PATCH] fix build without xkbcommon-evdev -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe -Signed-off-by: Raphael Freudiger <laser_b@gmx.ch> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/client/client.pro | 2 ++ - src/compositor/compositor.pro | 2 ++ - src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/client/client.pro b/src/client/client.pro -index eae7ad5..0bb7b18 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ - wayland-decoration-client \ - wayland-shell-integration - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d..4eebfd6 100644 ---- a/src/compositor/compositor.pro -+++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b1..e6f1a0b 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard.cpp -+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) - xkb_state = xkb_state_new(keymap); - } - --uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) --{ -- const uint offset = 8; -- Q_ASSERT(nativeScanCode >= offset); -- return nativeScanCode - offset; --} - - void QWaylandKeyboardPrivate::createXKBKeymap() - { -@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() - } - #endif - -+uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) -+{ -+ const uint offset = 8; -+ Q_ASSERT(nativeScanCode >= offset); -+ return nativeScanCode - offset; -+} -+ - void QWaylandKeyboardPrivate::sendRepeatInfo() - { - Q_FOREACH (Resource *resource, resourceMap()) { diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index e29bc94d..54eb778c 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,14 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "51b84d998b03cb95b6496e85d804e2788fc122d7" - -# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 -# 5.9.meta-qt5.5 -# From https://bugreports.qt.io/browse/QTBUG-57767 -SRC_URI += " \ - file://0001-fix-build-without-xkbcommon-evdev.patch \ -" +SRCREV = "f2bba05d44898c667068bff3f8d0ef09938a548e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a3d061a9..2c393cad 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "a9f8d06fe1a7e98f1fa38d8df1627dc66dc92c21" +SRCREV = "887564cc04bc2d1946862fd4fb37db7df2cf0abe" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index e8f44c5d..dc819966 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -25,7 +25,6 @@ DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ " -DEPENDS += "yasm-native" DEPENDS_append_libc-musl = " libexecinfo" EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm \ @@ -164,7 +163,7 @@ SRC_URI_append_libc-musl = "\ file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "7af0066e50aa4c73cadafe2d47bc368a5b0187f6" +SRCREV_qtwebengine = "8bbdfa215c81869a1b23a1d882a58bb5734f6b2d" SRCREV_chromium = "4f2e755be232c9083108e55a30876a19b67e25d4" SRCREV = "${SRCREV_qtwebengine}" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index ebf8a537..b82d5747 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)" +LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "74ea21a46daa8c8e3c1814ec517e360cb9503a9e" +SRCREV = "6b10c6283eefde9a8122bf3ae6f0a675b4606bb7" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index e60cc209..213d96f4 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "4acd68bc1c8b97c3764442d95515c10d226e564b" +SRCREV = "810bfc6b6d97f41696113f3e72cdb2f937ff96ae" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 57f8d850..83969701 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "4644f175b9abbe770818a77e058f08b888f6e8b7" +SRCREV = "a82b308b0138d585337f4ad65edb89209dae94f6" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 7f306f8e..b9dce820 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -15,6 +15,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3444bfc8039c5090b02fd7f98abe8064a73019d7" +SRCREV = "c7c568100450e4eedc88ab3e195a54259a7270ac" BBCLASSEXTEND =+ "native nativesdk" |