diff options
38 files changed, 75 insertions, 40 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 799181dc..842be2cd 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -42,6 +42,7 @@ SRC_URI += "\ | |||
| 42 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 42 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
| 43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
| 44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
| 45 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
| 45 | " | 46 | " |
| 46 | 47 | ||
| 47 | # common for qtbase-native and nativesdk-qtbase | 48 | # common for qtbase-native and nativesdk-qtbase |
| @@ -193,4 +194,4 @@ fakeroot do_generate_qt_environment_file() { | |||
| 193 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
| 194 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
| 195 | 196 | ||
| 196 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 197 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index fcb0a5d4..9c1d86ad 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
| @@ -36,6 +36,6 @@ do_configure_prepend() { | |||
| 36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | SRCREV = "a0496abe3890766638e8601c4bd11ba1755138e3" | 39 | SRCREV = "b0e11393968ceaad8c35e7df528c73a5e6111f32" |
| 40 | 40 | ||
| 41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8a9a4650..6641a4f6 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> |
| 3 | 3 | ||
| 4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
| 5 | QT_MODULE_BRANCH ?= "5.12" | 5 | QT_MODULE_BRANCH ?= "5.13" |
| 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" |
| 7 | 7 | ||
| 8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
| @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
| 16 | 16 | ||
| 17 | PV = "5.12.1+git${SRCPV}" | 17 | PV = "5.13.0+git${SRCPV}" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3bb6ae9a..5b11b8ea 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -37,6 +37,7 @@ SRC_URI += "\ | |||
| 37 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 37 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
| 38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
| 39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
| 40 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
| 40 | " | 41 | " |
| 41 | 42 | ||
| 42 | # common for qtbase-native and nativesdk-qtbase | 43 | # common for qtbase-native and nativesdk-qtbase |
| @@ -139,4 +140,4 @@ do_install() { | |||
| 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 140 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 140 | } | 141 | } |
| 141 | 142 | ||
| 142 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 143 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" |
diff --git a/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch b/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch new file mode 100644 index 00000000..a66145c4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | From d26359039f488f1569a581f3e266b1ff236600fc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
| 3 | Date: Mon, 7 Jan 2019 10:29:53 +0200 | ||
| 4 | Subject: [PATCH] qmake: use default libdirs to search for prl libs | ||
| 5 | |||
| 6 | Default libdirs are never added to the modules' LIBS and if | ||
| 7 | Qt was configured to use one of the default libdirs, module | ||
| 8 | might end up without any path to search for its prl files. | ||
| 9 | |||
| 10 | Add default libdirs to the search path similar as it's done | ||
| 11 | in unix/makefile generator. | ||
| 12 | |||
| 13 | Fixes: QTBUG-72855 | ||
| 14 | Change-Id: I43c5bae0d54ba9427ab0ad3eab61ba0c4e2cbde8 | ||
| 15 | Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> | ||
| 16 | --- | ||
| 17 | qmake/generators/win32/winmakefile.cpp | 2 ++ | ||
| 18 | 1 file changed, 2 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp | ||
| 21 | index 6e4b9a1eb5..a855fcd0a5 100644 | ||
| 22 | --- a/qmake/generators/win32/winmakefile.cpp | ||
| 23 | +++ b/qmake/generators/win32/winmakefile.cpp | ||
| 24 | @@ -84,6 +84,8 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) | ||
| 25 | if (impexts.isEmpty()) | ||
| 26 | impexts = project->values("QMAKE_EXTENSION_STATICLIB"); | ||
| 27 | QList<QMakeLocalFileName> dirs; | ||
| 28 | + for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) | ||
| 29 | + dirs.append(QMakeLocalFileName(dlib.toQString())); | ||
| 30 | static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE", | ||
| 31 | "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr }; | ||
| 32 | for (int i = 0; lflags[i]; i++) { | ||
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index a7867563..868dc0fc 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -33,6 +33,7 @@ SRC_URI += "\ | |||
| 33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ | 33 | file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ |
| 34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
| 35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
| 36 | file://0018-qmake-use-default-libdirs-to-search-for-prl-libs.patch \ | ||
| 36 | " | 37 | " |
| 37 | 38 | ||
| 38 | # for syncqt | 39 | # for syncqt |
| @@ -253,4 +254,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 253 | 254 | ||
| 254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 255 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 255 | 256 | ||
| 256 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" | 257 | SRCREV = "8c47c2a08ec69fe45a14f6c2334befcb2e074790" |
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index ad01fcc2..1009b940 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb | |||
| @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | 11 | ||
| 12 | DEPENDS = "qtdeclarative" | 12 | DEPENDS = "qtdeclarative" |
| 13 | 13 | ||
| 14 | SRCREV = "101fdeb344af67a65ae801248cccc11b9b576b8d" | 14 | SRCREV = "1319e0965f6008f44f9216a7bb76e106a1710767" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 84f45be7..45c419b9 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
| @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
| 8 | 8 | ||
| 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
| 10 | 10 | ||
| 11 | SRCREV = "5ea5bc7413901375a112f482fae365bfebd7c8aa" | 11 | SRCREV = "d63f5bd20034812b7661d6f2beb7f0025333953d" |
| 12 | 12 | ||
| 13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
| 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2d5637ad..3dfe31d0 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}" | |||
| 19 | 19 | ||
| 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 21 | 21 | ||
| 22 | SRCREV = "1b4bf7b4e82f5f320da9f78ef4c23a3330c41737" | 22 | SRCREV = "18b57342a009b310c280feeaec3d7cf9f6b98dcb" |
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 86e19e2a..5d7bdc32 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb | |||
| @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 8 | 8 | ||
| 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" |
| 10 | 10 | ||
| 11 | SRCREV = "7f661ab61611d48f4491c1fa9d7932e822e9b050" | 11 | SRCREV = "4a86aa5243c7f0bde37fe6094ecb4bc7a9da1721" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ab697e1e..fb4f3354 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
| 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | SRCREV = "95c050bb22f65ba5d8488b4a036f1c7a1223b138" | 27 | SRCREV = "f3919f5d94510cc049a438ba2267f9db4a252970" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 67472fc4..f850fb90 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" | |||
| 14 | 14 | ||
| 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 16 | 16 | ||
| 17 | SRCREV = "1f15fda174b53bc6dcaa19653dd5a791b4cbb4bd" | 17 | SRCREV = "1d664811805984e58cc44d4553c700d51389c389" |
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 0c1b3d35..0e127346 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb | |||
| @@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = "" | |||
| 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ | 18 | # http://errors.yoctoproject.org/Errors/Build/44912/ |
| 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 19 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 20 | 20 | ||
| 21 | SRCREV = "2c15783c02e3abfc3c528d270c448d1d555c8036" | 21 | SRCREV = "29e31fad480e097d7cca121c44fc16028ac3ffa9" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 479d7e22..4f2cfb92 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
| @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
| 25 | 25 | ||
| 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 27 | 27 | ||
| 28 | SRCREV = "3987e304dfa458457767fbe8b8a3d351dbb3b2c2" | 28 | SRCREV = "750f359fd7aa47775abefce2d2aa8ec423745622" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8fb6bd22..f7cafdb8 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
| @@ -31,7 +31,7 @@ SRC_URI += " \ | |||
| 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
| 32 | " | 32 | " |
| 33 | 33 | ||
| 34 | SRCREV_qtlocation = "bfb88b7a87e5dbed77d25998e386f8b5cc4e21d5" | 34 | SRCREV_qtlocation = "d73f9d59e352b096af242ebe69c645def30f5672" |
| 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
| 36 | 36 | ||
| 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 358d4693..0606e3d5 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
| @@ -37,4 +37,4 @@ SRC_URI += "\ | |||
| 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ | 37 | # http://errors.yoctoproject.org/Errors/Build/44914/ |
| 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 39 | 39 | ||
| 40 | SRCREV = "10ac932185707f0084cec7b1cfe0a6a2073b20a9" | 40 | SRCREV = "e2275ade82540561ca026325ff945fdfa90f13fe" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 7dcb1ee6..ff29bc44 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
| @@ -9,4 +9,4 @@ require qt5-git.inc | |||
| 9 | 9 | ||
| 10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
| 11 | 11 | ||
| 12 | SRCREV = "410c82cdd09bbcc2f236f8c2e85af726b1976904" | 12 | SRCREV = "8b881885c10d60c636fd777d973e60a75ab9a802" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 93b4dcd8..a307d4e2 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
| 12 | 12 | ||
| 13 | SRCREV = "9b316440eeabee1c3220241c3eb79954f1dc91bc" | 13 | SRCREV = "f1812309c36ce1e2a7c6b59381424b803cf37068" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 25b1c61c..c63d3587 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
| @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
| 12 | 12 | ||
| 13 | SRCREV = "1157ad6df74c746e96cadac1ee9a226811f4d084" | 13 | SRCREV = "efa04c2ae8427c70848477ace3d8f6e82baaab11" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 00f717ad..a39a0cae 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
| @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
| 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "9b88ca4f033135f1a60871873da7f0732bc19d4d" | 20 | SRCREV = "4f28f1c27ae17146348ae3b262f8f0036dd70c62" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 30ec4464..e6f2f8df 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" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "e1c0dbeadcfd34699f080edc49815761672616c1" | 27 | SRCREV = "00b89659758ab852a5a6fc18d3f211055f760212" |
| 28 | 28 | ||
| 29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index c0f12e0a..70d2d309 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
| @@ -36,4 +36,4 @@ DEPENDS += "qtbase" | |||
| 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ | 36 | # http://errors.yoctoproject.org/Errors/Build/44915/ |
| 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 38 | 38 | ||
| 39 | SRCREV = "6c51f94f5cd9afc90d5b28071c8a3ba9983d2853" | 39 | SRCREV = "3cc9fe5db038ee465f97603f94cbbb64979d8c0b" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 64fe6e6d..2beaee82 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
| @@ -10,7 +10,7 @@ require qt5-git.inc | |||
| 10 | 10 | ||
| 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
| 12 | 12 | ||
| 13 | SRCREV = "e64b9a5d33b6f13fce93a553661c29a8a4901087" | 13 | SRCREV = "7545237546f620d09d37f30cb74d18083b868e54" |
| 14 | 14 | ||
| 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
| 16 | # 5.12.meta-qt5.1 | 16 | # 5.12.meta-qt5.1 |
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 102fa0b1..93c59517 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtbase qtdeclarative" | 13 | DEPENDS += "qtbase qtdeclarative" |
| 14 | 14 | ||
| 15 | SRCREV = "83e59fedc5099168c4c1682f63b0e49a2ba61a22" | 15 | SRCREV = "37233436a5d01405dc93ebcfc90cb1a77ce206c1" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 2603381d..3bfaa11b 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
| @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | 11 | ||
| 12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
| 13 | 13 | ||
| 14 | SRCREV = "c6ff631f832f0e4f5aa703cd952530341ab74296" | 14 | SRCREV = "a4cf47ddfbfde719429ecd1c06bbb4b948cc9b9d" |
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 2fa82f7d..1d40c168 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
| 14 | 14 | ||
| 15 | SRCREV = "938fdd74f17d8f0e03b491bd0093340b90f52ff4" | 15 | SRCREV = "b9da7701d6f5ee454d138d02b983909e4f6a2077" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 118c6c84..4e108d40 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
| 14 | 14 | ||
| 15 | SRCREV = "71ddbcf502c5dafdcb98aa00c87fcf419aaa9b99" | 15 | SRCREV = "8571c19b95c62dc17a1ade1ecf49c615ea386a26" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index a90d0409..2f4c8d56 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
| @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
| 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
| 33 | " | 33 | " |
| 34 | 34 | ||
| 35 | SRCREV = "61383ceca69001c292b31188b04fba304f8fbbbe" | 35 | SRCREV = "5cb9ce406ee036fc587456281641ee1bb7eadf1f" |
| 36 | 36 | ||
| 37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
| 38 | 38 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 8d04a54e..7308f7a6 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb | |||
| @@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native" | |||
| 10 | 10 | ||
| 11 | do_install_append() { | 11 | do_install_append() { |
| 12 | # remove qtquick1 translations - qtquick1 is gone | 12 | # remove qtquick1 translations - qtquick1 is gone |
| 13 | for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do | 13 | for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do |
| 14 | rm $transfile | 14 | rm $transfile |
| 15 | done | 15 | done |
| 16 | } | 16 | } |
| @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ | |||
| 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ | 98 | ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ |
| 99 | " | 99 | " |
| 100 | 100 | ||
| 101 | SRCREV = "c36807f030790ed9bcf9e790d02f765d67d2b8ea" | 101 | SRCREV = "812d36d5f4f7e4858fecd23e18133b21a280dabf" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index f5a41560..836459fb 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
| @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
| 49 | 49 | ||
| 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
| 51 | 51 | ||
| 52 | SRCREV = "6f668860ede55d261a53163bc1a3956f84dd9d67" | 52 | SRCREV = "d72618934d83cb15e4f8116803f02e2e0d4e2cc8" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8c6c00ea..0eb74ea8 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
| @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
| 37 | 37 | ||
| 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
| 39 | 39 | ||
| 40 | SRCREV = "d296dea131ad51cfb4809e9a5e2d6908b2844a57" | 40 | SRCREV = "8a638d510db90364cef990e770b84f372bde9f6b" |
| 41 | 41 | ||
| 42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
| 43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f7fcdfa1..4cc7db60 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
| 14 | 14 | ||
| 15 | SRCREV = "b2d34596a1ed3cd1844eaa9ef3a338e12104ba3d" | 15 | SRCREV = "ba94889c325841c244f401f68267d0450d3ca444" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 167a766a..e5bb6b4b 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ | |||
| 172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
| 173 | " | 173 | " |
| 174 | 174 | ||
| 175 | SRCREV_qtwebengine = "dde9bbb40ceed6409862e4cd31091270f99ea346" | 175 | SRCREV_qtwebengine = "0763b7c40d3490250f5bca1e0029cefba635305c" |
| 176 | SRCREV_chromium = "fec48c17fa1853a1e42a5b6ce97680767464185d" | 176 | SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" |
| 177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
| 178 | 178 | ||
| 179 | SRCREV_FORMAT = "qtwebengine_chromium" | 179 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 9af4a3f9..fac7f7a8 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb | |||
| @@ -18,4 +18,4 @@ do_configure_prepend() { | |||
| 18 | 18 | ||
| 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 19 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
| 20 | 20 | ||
| 21 | SRCREV = "c76e2a37310f1e94002488fe33d56d6b00f2d626" | 21 | SRCREV = "9a1596059d40789f7909e44705d2323bbeb263fe" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 92296b7d..ac6b8b71 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 = "ef876a7d2964f53faf160af2b01798e930dfaa94" | 14 | SRCREV = "192a5ec7e93b15c931ac479abf400dc371697ef6" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 8ddcd9b7..ce1fc81a 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
| @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
| 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
| 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
| 21 | 21 | ||
| 22 | SRCREV = "85cf48d62a20652b150ce29b78c269d4937edf7c" | 22 | SRCREV = "f2e136c1a16bf2fe3a9ebe392fddd34ad83caede" |
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 352eb3a3..db0e8151 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb | |||
| @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
| 12 | 12 | ||
| 13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
| 14 | 14 | ||
| 15 | SRCREV = "857c981c6c4c9a9a1b242225d869e9c40861ba34" | 15 | SRCREV = "3ea03029664273be39c7fb5f72330c1a93387416" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 3daa5d85..8e9824f3 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
| @@ -25,7 +25,7 @@ do_configure_prepend() { | |||
| 25 | 25 | ||
| 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
| 27 | 27 | ||
| 28 | SRCREV = "fe5b5faf66f6e752f8425fd56326f47fd4888b76" | 28 | SRCREV = "5ca3040606c9dce1a410f1da059a501c03fc2cd9" |
| 29 | 29 | ||
| 30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |
| 31 | 31 | ||
