qt6: update submodules

* Update to Qt 6.0.0 RC2
* For non-essential Qt modules, change branch from dev to 6.0.0 where
  branching has been made

Task-number: QTBUG-86349
Change-Id: If641367ecc0113296c5cf60e2ff67bfab56942ae
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Mikko Gronoff 2020-11-30 10:04:53 +02:00
parent 2bb3541bcb
commit bb03bf6e28
20 changed files with 20 additions and 31 deletions

View File

@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
inherit features_check
QT_MODULE_BRANCH = "dev"
REQUIRED_DISTRO_FEATURES = "opengl"
include recipes-qt/qt6/qt6-git.inc
@ -26,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a
PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
SRCREV_FORMAT = "qt3d_assimp"
SRCREV_qt3d = "34e3fa58dcd1b746e0f890b6a78823f8cfee9b12"
SRCREV_qt3d = "0c26a37fc0156069b51b7a617a1555d37371f72c"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

View File

@ -17,4 +17,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
SRCREV = "4dc613848bb82c32d8783e028711b99494a29f20"
SRCREV = "2bd6756f3517acad9ba6b75dadfae42fac31fc95"

View File

@ -147,4 +147,4 @@ FILES_${PN}-tools += "\
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "bcd38a96149f5397375b57e948c05c7a8f172194"
SRCREV = "95730dd19cddd65588c902255513517556afc49f"

View File

@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -14,4 +12,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
SRCREV = "7dd7398388a3872983b5fd4e0f0c4cd1301d22ca"
SRCREV = "a2160c214f1bcbe1200878d57b7fb52424c28457"

View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "d037cc4ecc7d8b3094e558b20eb4b637a63d0f53"
SRCREV = "2952114cf8e71c9ad61bd3566b9b1063dd4acae1"

View File

@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "9d1404ce00464cbd334887abadd3d2ccc8fbe7da"
SRCREV = "ad82815e5a3578aedbc1ded255e6d6b5532f6ded"

View File

@ -13,8 +13,6 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -26,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
SRCREV = "9b0b68488ac75668da339bdcd1ab358db03f2932"
SRCREV = "ea2eed7930a5ae28c57a46afbc9f2a174b1d8c6c"

View File

@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -15,4 +13,4 @@ DEPENDS += "qtbase"
PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
SRCREV = "841b2de545466c8f9306a599d7b1b9647c2711d0"
SRCREV = "3ed510028391bbb16f7a9b4ff5aa658e5d2a3c4f"

View File

@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "3b18f76f21ae901b8a2beb42bd32bfdc2b8c9ab9"
SRCREV = "ab4d262968d5c6dc564d392e2990081915962a95"

View File

@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = " \
inherit qt6-cmake
QT_MODULE_BRANCH = "dev"
include recipes-qt/qt6/qt6-git.inc
include recipes-qt/qt6/qt6.inc
@ -23,4 +21,4 @@ SECURITY_STRINGFORMAT = ""
DEPENDS += "qtbase"
SRCREV = "65c13447a503f01d6a8bdf6cff8967d14fb3cf89"
SRCREV = "e32a176b8a663ac767d5d1ed41fbafe240bfff20"

View File

@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV_FORMAT = "qtquick3d_assimp"
SRCREV_qtquick3d = "43c7222a05a11d26c1b205fef67105188f84d7bf"
SRCREV_qtquick3d = "712b43a76572c5543e2704db40e8f314728eb243"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"

View File

@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "87704de66880f7e057f1ee5c0a67cf70ad60110c"
SRCREV = "6e10bcd19e234f37430637126ec158396cdb9f94"

View File

@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS = "qtbase qtdeclarative"
SRCREV = "1caa4e2f398491d0b4261994b3e9cb6feccdc956"
SRCREV = "f9f57e12410a6b94e693fa77ac1a0379632a94c1"

View File

@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "7f735da996812c6f0418f1f10104f5c71d63b74a"
SRCREV = "ea1da39626136737e8d5dd84a2f5cad762b5b957"

View File

@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
SRCREV = "181e3cd5c23cec27e77a474bfdcada7117667dc7"
SRCREV = "604054b92ade8da0f40625d705b85af4c4f60f9d"

View File

@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "c7770c6a102e03d6016a9035ca82a755835535b0"
SRCREV = "714a57096d8768da029d027e97f48b9d7d7aedcc"

View File

@ -18,4 +18,4 @@ python populate_packages_prepend () {
'Qt translations for %s', extra_depends='')
}
SRCREV = "74277c8ce10340c3f33e49bd147328cc4d85ba57"
SRCREV = "fb750a7665bfcfca96ba2508b1b2de11e4d4d140"

View File

@ -120,4 +120,4 @@ FILES_${PN} += "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
SRCREV = "b6a307ce124b53fccc953b0ca00f9cdda46f9bca"
SRCREV = "84a790bad0ad171948cba02ef2f60559598ba36a"

View File

@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
BBCLASSEXTEND =+ "native nativesdk"
SRCREV = "c4d90b2eeac8db102de94315f1c67052f25648af"
SRCREV = "49def5a27e37c23042ee8699ac8f123b6e63cbe7"

View File

@ -15,4 +15,4 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase qtdeclarative"
SRCREV = "3a4ad41be883a804218494b93b146bf8c6fa4589"
SRCREV = "e861ee912cb633643fc49d26db960b652e6f3357"