[Qt5] Update qt to 5.12.8 (#10749)

* make qt5 all features and add the missing qt modules * fix control * qt5 webengine enviromnent setup * copy qtminimal plugin to tools * add opengles3 option for testing * [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit 8b9b188. * apply the correct ci hack * fix wrapper to include macosx debug suffix * update baseline * first try to fix the Qt5 cmake configs at the root. * fix missing backslash * fix plugin patch * fix qt config patch * remove 90% of fixcmake.py * update baseline * experimental removal of fixcmake.py and dll copying into tools/qt5/bin * fix experimental dll copying. * fix static windows builds * fix static builds * fix plugin copy * add quotes around configuration to make it work * remove dll debug messages * note about the cmake fix * revert fontconfig changes on linux. Make qt.conf relative and not absolute * make qt.conf relative * trying to fix ogre osx ci regression * fix silly path error * Revert "trying to fix ogre osx ci regression" This reverts commit 708d825. * add ogre:x64-osx=fail to CI baseline * retry on osx * fix configure error. since in qt5-base everything is in the package directory and not in the installed * revert change to ci.baseline * update ci baseline * update Qt Control fields * update qt hashes to 5.12.7 * update baseline update missing hashes update empty include/packages add info for placeholder ports not yet correctly working (e.g. qt5-wayland) * fix linux qt targets not having debug properties. * remove most of the wrapper * actual forgot to commit the prl parser * fix the config a bit differently. have to check linux configs again * add xlib patch. * make qt-base fail to get logs on linux * Need logs from qt5-base * update versions I missed * ws change * lets see if this is enough to make qt5-x11extras happy * add upstream patch. * add newline to patch * ws change to trigger rebuild and maybe get logs on osx failure * need generated cmakescripts to check linkage. * rename cmake files to end on .log so that i can inspect them after CI failure * fix patch * make qt run * androidextras only supports android * qt5-doc will only be build on linux * ws ci trigger due to download failure * WS to retrigger CI due to download failure * add code for debug tools * lets see if we can do it with only the release tools * update baseline * fix create link error on linx * update baseline * revert changes which tried to use release tools only * fix dependencies * add debug qt.conf * add another copyright install * qtdoc does not have any include files * fix wrong copy pasta * update latest port hashes. * make the patches versions dependent * cleanup qt5 control a bit * update qt5-base control for ci run to use latest * fix patches for latest * forgot to commit the portfile changes * fix imageformat dependencies for latest qt * update last hash * fix translations dependencies * get cmake scripts from CI * new patch for creating correct configs * patch precompiled headers away from qt5-webengine * fix patch for 5.12.7. (Patch was for 5.14.1) * trigger CI rebuild * add simple gl path to fix the chormium build error * comment out debug message from prl parser * bump control * update webengine control * update CI to skip webengine. * update baseline * ws change to osg-qt * remove kd-soap from faillist * reset ci baseline to upstream/master * update baseline * fix osg-qt? * skip ms-angle on osx and linux since the normal angle port should be used! * update ci baseline * try adding fontconfig manually * update ci baseline to remove osg-qt for the time being * remove manual library. * remove wrapper and get plugin info also from linux and osx * allow build of complete qt * fix missing parameter in populate plugin. * need more info from CI * fix foreach CI loop * comment out CI code colllection to make a full qt5 ci run * fix qt5-imageformats regression on linux * update baseline * - add patch to find the debug library - manually fix EGL path in Qt5GuiConfigExtras.cmake * bump control * update hashes to 5.14.2 * comment out messages for debugging * bump version in control * fix create cmake patch * add qtmain path corrections for single configuration build. * fix escaping of . in regex * remove one to many \\ * remove latest as a default feature * reenable messages to debug osg-qt issue on osx. * small cmake options details. might need to patch cmakelists.txt if this is not working * remove unnecessary comment * make prl parser silent again. * remove canvas3d from the default features since it has been deprecated and will be removed in the future * fix some remaining absolute paths. * update qt to 5.12.8 * deactivate qt update script * removed merged patch * remove a trailing ws and fix the mqtt hash which was missing before * revert some ws changes * fix version numbers in qt5 metaport
microsoft · Apr 24, 2020 · 28ab0b1 · 28ab0b1
1 parent bd02300
commit 28ab0b1
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 77 deletions.
diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-3d
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
 Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats, qt5-gamepad
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-activeqt
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 ActiveQt Module - ActiveX components
 Build-Depends:  qt5-base
 Supports: windows
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-base
-Version: 5.12.7
+Version: 5.12.8
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)

diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake
@@ -1,55 +1,55 @@
 #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. 
 #So it is probably better to have a central location for these hashes and let the ports update via a script
 set(QT_MAJOR_MINOR_VER 5.12)
-set(QT_PATCH_VER 7)
+set(QT_PATCH_VER 8)
 set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
 
 set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
                  purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
                  webview winextras xmlpatterns)
 
-set(QT_HASH_qt5-base                c8b90e50ec1824236541273b81024f1332c604748a038a48bc377b4c8e0886bfc27132990758abfd8ab9ea2aa5f1e42181ff369a0df4bc879dad0ef95868fde3)
-set(QT_HASH_qt5-3d                  57c07756fb5838cf5201d4bf1ce5be843ba117356be768b5060750d3a8f117098ca97c8d10343d9554fa6d95ac00d7ee28ace6e6fb2770f18a1b575236b8afec)
-set(QT_HASH_qt5-activeqt            00daeba4ca2751d3c3f10bd798040316d817e1a9866a760a3acd6ac6055a0c87b888b87a77c112401fd9fed8a5a146ad0c274cd2bdc03c48088f667dfe182e8e)
-set(QT_HASH_qt5-charts              6e18b9e20616b43d95376ef229edd2eb2a2924bc05c44c9108b8e5fd94e20a80e34cadf03d36a1d45f62f2d7ba3a26b3e823def0af2c25c630830eb92bb22ceb)
-set(QT_HASH_qt5-connectivity        42d2831eafd136344839ec6dce1f408d6e8822dd55f593286a1aa74b61766aa5ecf35bcf918ace6fa551b68407b829c3602d67b32b8c5ce16d19325c33f61359)
-set(QT_HASH_qt5-datavis3d           a5c60318a7115cd7368b8d2e7c1a83c207734ab63e9c6b7dfa451a3752d9e1f5ca6d718b65d1b11ecd59a6049adb2de8e5f78a305f3ee5d828d664bb11c5b0a6)
-set(QT_HASH_qt5-declarative         119155aed8ad6e74f7be2d0e44bf630fc493227c6ad0fdbd9a85bba8770939a0dd6c21a8583851e5adf243d51bdeb64bf79e1c4898176898e05a3897052315b6)
-set(QT_HASH_qt5-gamepad             a7d3cc74e9a0b269acadfd5faa2a72ef3132762c51c31a346319899f165d67c9d92e0f1b80c4e748209c31502f30600bf0d012e8f478caf959f34ff33389ba05)
-set(QT_HASH_qt5-graphicaleffects    fd6b59198e834a9e36e58445055610ac6dcfcb96d405d2dc294e0397460d6fdd119cfd4b0f29f43009154d623071dcb335223e33872fbfb5b6004abe9b6f5a55)
-set(QT_HASH_qt5-imageformats        1d721969bdb64b9674ecde992424e02997f051422d8d762d0e7930ae549792d1152751398ee2a906055da9d26df02d93f565d82a2e80a2659dcbd3ad347b4727)
-set(QT_HASH_qt5-location            e82673e56f648a675df36c32a73217bf49b309a356c0de9e4defe14c3070d1d482d797fc11adca632edb59af9993f92e562dc5cb44dbcbad677ac3980c35676c)
-set(QT_HASH_qt5-macextras           3b5be4a929fef28061f195ad5aad2eafa9e5a3e03f405f8d3bf9eb5bfe66443d90a4d6ff6081a3cc1557017b896f70f617d828c874414572477d7950167291de )
-set(QT_HASH_qt5-mqtt                83c105ef7c4ccdb87cb2fa8d35da32ef6be32aeb57f6ec2b0176e9e565a7d8dd8989727e03b5c982073b63a752d39a865eeaa62a82d3cfaa22bfef60978cdef0 )
-set(QT_HASH_qt5-multimedia          25bce2851190cc4df47432c8ddee831fe9ea172f4a612a18bde6b1ce8c0f0fdc09ca0e484dad9e2d8659bfe0c84e2801a84c7f75d32976a5a9cdf1ba9e871f3c)
-set(QT_HASH_qt5-networkauth         484724ce60975c74e737c082f08dfc889e327618ca8efa83ed47b940ae515c836db9fd78ba67e930d27a1c1cd91cb14bdc055500c287c2e9853ddcfe1e1c43a6)
-set(QT_HASH_qt5-purchasing          08f2e97acab278e5fd53ef5ec9f3c9e15d3bf9d412f8d83ef4a0ab16619b4cc46940ee9ba5a770db98e79c4fbad24fca55d50de78ce3c30162ac6fb3ebf2d4c0)
-set(QT_HASH_qt5-quickcontrols       75f8600ec001131ac510057c6b16a5c34aae3a5ad6af5dc801ea3c63896e290c1bb5d71dd404613cf2958cdd965a924c1783029ec5d392f4db43aefa3ea0821c)
-set(QT_HASH_qt5-quickcontrols2      bd469316594e09da064fc6792c08ee87f345ab8c27bd33ae3fc38d184bebabf1ed824147eb960ac2700c67a683097c7615aebb0f717dc1a5ff1b330f27554ae9)
-set(QT_HASH_qt5-remoteobjects       7d0591e8b0232b65ce76fba18098aeee23390403430dae411f12e3bad4e3721c5160d6d46ed5fefcc38e01dcd593231f7a7f6eaf421ed91c6939af25d96bd9fc)
-set(QT_HASH_qt5-script              49a1b0563734908be0f3b99f0295f1f869f831d8e2b6ae77bd70c2a2f1fbc6bea8a8bda0092a1519d03f2969cfe38fede64530d9221734d907efd3137b9769be)
-set(QT_HASH_qt5-scxml               3c044127bb3f41945f959386c664d66035606dddac843fe029aeb52f0807f23e5ff2adced21e94533312d0030149866a80d49e0b3aa9222c6e6b99636d26dbd6)
-set(QT_HASH_qt5-sensors             baa576792347bd0a95178a7e0b5ad47bcd4828d64b3801bfb1394647d95f8255b8800e52d9be0bde50b2fc9f0633d21ada940d4b7ff17c8cce72499b7b4a06ee)
-set(QT_HASH_qt5-serialport          59d14147bfb9e4885e9c88f70b261c021d4947cc04ce9982e821ae8b307d6323d797e6788764c206bef7b3013c6b9bed9288573c2ede33d4321c9f5a6907d1f5)
-set(QT_HASH_qt5-speech              e3bc06f7952eee5c34f33c1a4404ccd12dd8886ef8d8af527dba41b58a27c5c667fea4bdaed7bfcfdcc9a2ca0f4a19f35c2c92995565a696828b5b4a41e31b3e)
-set(QT_HASH_qt5-svg                 13e6053c99cc0f5b31bc48df0a8b93cfa26e49f3aa2732850747c7a8b3e78ff0a1c620e2a8729d291b5a6cf935d9a481f361ec9f6a78ae090ca997b344786f47)
-set(QT_HASH_qt5-tools               d1e0b55e4eb5c22c9a912cf28a62f30e02d020a22085f5556e0ef9034aca849423cb2d6c9d27ffb3a6ffefe4a2e522b84ec1dd5ce700360d746c22be0c59c94b)
-set(QT_HASH_qt5-virtualkeyboard     c8ebd905d15d23ea72df5857c25438b25a50e49f332bcf79cc3c81a9951589a56d11c3aaf7986387065f5020ad770efe93ca1e2a14fdfc6f1333b8e6439dd66e)
-set(QT_HASH_qt5-webchannel          a5587abd6daf60f985cfa29c68449347bd22a8f63c6027400b02378b9c85cfbe1a45e8a844609b99b8646bcf980b0dd262b191226a0c8fd931b3e96696fe6469)
-set(QT_HASH_qt5-websockets          96762336abdb460a3279a6f47456e0b5690572f203a14fa2f0bf9e71a5cffbf6f512682e2c681ee3d3c2a87eb56ff5ac938f5ac828558b0e2745335f08201349)
-set(QT_HASH_qt5-webview             73e79c5f4d7b67b9cd2513abd709deccedcad3e5ab50755ba70f7e8123031acab6e38299eed7c03ccd3478f19d58cdc75726863f280a44b1c852aaa4d816f9a4)
-set(QT_HASH_qt5-winextras           450959c57e0cbcd35738232c4ba3ecaae1bec4c10fbca6d8ce31cf9029440835ddfea6811be7d9274a784b58c2a54c7bd721859e9b8439e2583bb15cfb9fda8e)
-set(QT_HASH_qt5-xmlpatterns         f228c9c20b5aa00fc4f0e6918a53b780f10d58288c2af2b0edb8e279f1d21dd7a22afb0a08115cd0e3cab7adec1b4d2ee44cd1aff9298fb62b60a77d8d147ea9)
+set(QT_HASH_qt5-base                8b6ed392dddaa7cd438fabbeb96c2e8d9dd6906a65eedcd193528ffd71ea42870071fa0ecd6f43cc65900b3938d19ae5316c43201b7d260ef9107dcc3a1e5441)
+set(QT_HASH_qt5-3d                  7ccb8f0d072536422b1e23c56d95134524c2d83ec56818754bcfd710fe9be89e365afcca197900cb4ed4b9365ea6856bbbda89818e6f4b23b58c5a02386e5cc4)
+set(QT_HASH_qt5-activeqt            74273e51d58ed91a2dd36eb76bfc1d9c4292ddd9b41c69999c4154445f6f86500f63ec365559287df1e0e2b4b783dcc5914a96a6397f5281e8ba6089f9b51b20)
+set(QT_HASH_qt5-charts              72a672b53edc27785f64aefaa8f1ddb6a6fd2e35f6ade49d69499cbb94a702d744e1da656be47afee46f5926333a8d9c441b4564ec8216e994e6073f4e1a97fb)
+set(QT_HASH_qt5-connectivity        d92d75f7efd246ca0b308811ade9f1d9f6678a4381e9ecb1f8e361dc27834a61aeae6aab1f067e3a1dba301397ef3d896a0e33019ed7bd1a39e143f80c3f70b4)
+set(QT_HASH_qt5-datavis3d           d732dbc3c35372141a86524e04abc847c7a73b739ddf4c3699d81f71de549c88b8cdb155789d2effcbb5d1fc5751fe7059e0b37a39ee79cdfd88e91c1f65fa3f)
+set(QT_HASH_qt5-declarative         10fe641bfd910b2395c26431c8e1dcc3063f1a036abeb96b2486812ebaea7c83a87416db019d8a0bd3ae00838789f8327aead98e04e9dc805ec8b73ba5fc5357)
+set(QT_HASH_qt5-gamepad             b93903392e1b00db05a74a42feeb803c41cb86aee22e903905de70d3eb11e0aa95820d74ecca13b102661c3ddd216f26d81e2cb234e324f3ee3c869dc36b97a7)
+set(QT_HASH_qt5-graphicaleffects    53e69d6f6ec532124daca5fb9469dd395c984eaf823d7e83f8a61a40b37c9e448711e758648028bcb4ed7c2abe6f8928248a4269afeb4beb3683c8e47de2f2c3)
+set(QT_HASH_qt5-imageformats        db5f810a77adce6e0aed481e044e8c4a245b44e2340fddb4d1a46e85eaff0da14b8ad5104c3ff4114cb9b02074b5d5ce6931637534fb36d7c57ce4798278be4b)
+set(QT_HASH_qt5-location            9521ae946039c1409ce4ba0a4ab5473f8773b7ccf59cd23ea5df7c3727929dcc6852d2b7b677d67832c096721a25428d7b2417608a13d8f1750662dd24d6c3be)
+set(QT_HASH_qt5-macextras           9da4f5fc478d3e820636429fbc93904a9f70901a3a418f6441318fb3df2d321727ddcb2cd6550f48b98593bea6a255f5f3127623d75ed2391723013141b40f4f)
+set(QT_HASH_qt5-mqtt                43d60bb1d98692850d2b196018784fe6975aedf1b7daea76c9b14f40fc9b907d59025d5f94d34a246daa24b6af7908d1d5a4d86b9cbf642577c03db7989241f2)
+set(QT_HASH_qt5-multimedia          49e0f1205be497dac29af64532e6463e55a43ca8a3487950b9cc228297f9d11336e8b5a742607a3bca1818ed0ff9a3d0914569baa710c241f0837b5d97ee4048)
+set(QT_HASH_qt5-networkauth         df154398732011c01cf4ed819834e0c2b4e0620d43c62b8032d0687675706eaa6bffa98411316011886434c1fa2950a161be82a3997ab60182eec9483b8b3c50)
+set(QT_HASH_qt5-purchasing          192d43f05ffd90347341b32e1720a7112a9a565823ce4cdddb192bd402fb498c50ae1188ee937166819d8d578e57686f580f717dad820b306696d8db89ac85bc)
+set(QT_HASH_qt5-quickcontrols       d3e71c56dd9b0c76643b464a59420ed66a7850ae3f5d1c1fd396807a92b54bbeda72380e6f53bf00db18c5fa83fb5de3c332d6c6a1bb9e57d24ec5aef377fc0d)
+set(QT_HASH_qt5-quickcontrols2      e0b464500303a3e8ca5e821bd2d46f4bc19e0df5402aa566d797530b7310a095057b4726272a001bf38da59259cdd96d3b27630a6861e82d5a70910ddcb1c985)
+set(QT_HASH_qt5-remoteobjects       92497b0eb2383e7d7552b1af4eba3b452d0d5130c00ce0cd44dc9a3f906335ddcaba0392f94d5f43de6b9a154c7d2b14f5d5899e2312df5e0bdd80f4d96b115b)
+set(QT_HASH_qt5-script              11914d89ebe11bb0fbd211ec0f897b31f689d20874c3ab2de055abc87d5bb3b2052c47f83a6ae8bd00df2ce5f086683022124ac7e011a160853a00cd1bd534e3)
+set(QT_HASH_qt5-scxml               376307ef8cae3bb88192f2137bc804609c76685ce574af48dc5d3f6acd65018d1bbfc7ad0e184aac5ac7cb0a2fa42b21c6e96e548f31cfdad90a478ca043866b)
+set(QT_HASH_qt5-sensors             b3b74e8927ca277417777a979330b2de1e96814febf673c7e6f1b18eb17d2b0a92051049840431e7bb19329059ce89f17b5fcb152c804d30b287b351376cb9c8)
+set(QT_HASH_qt5-serialport          35400ffec4bf1993e29c5d2465439e3c085db0f97ffdcf37226078df5aa64dd7ffa531c27ef59d5c53ada5f89453eea416f369099205a1fbbf8279bed6c69f36)
+set(QT_HASH_qt5-speech              814b2bbadeac77e80b6c4b1a2586a733710d6e7bc80fa8f177ef36f0df4f6c39098ef6223fd16cd3287eb24b871a5f1589eb4301babe099cf91d3d89069c85c0)
+set(QT_HASH_qt5-svg                 2788206a3bb0a0190bc984042ca8c471ed50325eb358ae8c7b50a147df0fb94ef96535606f5c96823b0d3380ddbc556187e3b1ec818fee7e597592b844352a7d)
+set(QT_HASH_qt5-tools               1251244d4991f6d4b8fe2aba1ebf3aa74c4b0977b3106233a982b9cbf736697c133717e959915343dae6acfe7978f767ceed52771f28f1278e44bcfea6e883cd)
+set(QT_HASH_qt5-virtualkeyboard     938bfcdbe63354ee956cff2d3e40884c4cd531eb522cf2258d1ceb7de14e2aa4fb9dc43e2007fe99fae008e0161461347acb362a616b230ed8f1d9b77f3169a3)
+set(QT_HASH_qt5-webchannel          142eb16ed4dc061425d0c1b8be6e64a04b7cd58b77abb891bd6bcb304d94e642fd65ba8c4fd8c1d51ef2558bfc22d40adb90f4485dbea2a15da8dff8df9849d4)
+set(QT_HASH_qt5-websockets          1a6baee5be5cbfadb23ce969784cf15724c10a188448bb0f3bec85f3fe9324389827e71ae719a85254b87a43523977b03d692da8f5ac273e0e7a598b1fdbdfb9)
+set(QT_HASH_qt5-webview             68ad18555025ab4479b18b5c2f7cffbcb78608819901f91876291c60b53a248051c9306560ef4be15d9da3cd58b24ea42548620c3dd8db9d785efa1ec6779599)
+set(QT_HASH_qt5-winextras           2692984f7106a104025648845bc08fbc7486d37e69128397294d47a4c6f5378d5f41a9762693bd6ec7498e8afa2b88e645f0c3ca82914d8de3becb7d4d46761d)
+set(QT_HASH_qt5-xmlpatterns         1abf04685e169a149423b6f1d2ea9eb8d57a8e79aed6a9362333f50d747e71bfd385cc910901f4db05b672e7eea61de02079af47b1b297cbb24552e759bad93d)
 ##TODO
-set(QT_HASH_qt5-doc                 0b3b2aa09429b7a20dd9704de5dc51392937e57949873088e33d54e41e05bebb17f95a57bb852bc510977eff0deba6453c115b7fb5e7021f4e182aa0c15474c0)
-set(QT_HASH_qt5-x11extras           1cf6b82fd884c88c941fc5d1a1bcc1e3da50fd1252c83c23c72411cbc7a9d81ff5b363175908b30927718706bc40a03b0cc9e64a96e91544e0a40af2c4144afd)
-set(QT_HASH_qt5-androidextras       d2bdef84b0749d921fa2f71aef15b91ccafe40f6edfe9d47b7999072b3b8c5e7a143c91a6e96c14933c13b91ebbc657c287716db0efcb1da2b7ccb2ed239384d)
-set(QT_HASH_qt5-canvas3d            7f8374a98b4cd9e463ccfa29697f3b77c9b505953730c668ee4cb1cfc45d26a7c5c7a102a2779f70174a13333a91f5a3f6df096bf55ceb17258548ec86048794)
-set(QT_HASH_qt5-translations        6a4af59d916f060d726acfaf12e23c09adc73243f1f38bd3cb76a7d688dcb78b69ced6606dce2615a1ebdec09d210547d51975d0678d092cb61153551b1f6fff)
-set(QT_HASH_qt5-serialbus           66230ca95cb86bd3408dfa79236e37c350f4df8be8886d8f6206f0822068a05a24bfd3e29e5a5cc3c3cdd9f437d4609e5ee2c3fc7c4813117a1bb349a873dfb0)
-set(QT_HASH_qt5-webengine           ff9e07abf5b708ef2320cccc53e032a3e0042926c71e5a76c880d4f97fb7f2c4ae4db2587c7998bae8690cd6f48a2dc4df1c2f5122121def99bef5ee7f7e70f2)
-set(QT_HASH_qt5-webglplugin         3a06e66734b2937ca84919fd93ec35c7768b11d8fa7916a48d9be19cec091f2acd6966bd495bde141b17582ae36c8a32718b13946977331b18e403eadfb02c53)
-set(QT_HASH_qt5-wayland             28d3d4b5df0c35bea5a9c9ffd032b01fe6c51a4c32d6ecc823d5103871f282ced9f7670901b6b74c0c042e7f816df5107d362d154ba109cfe8e3ba61b63778d5)
+set(QT_HASH_qt5-doc                 63505d7bec54b6bdd663fc0f3962c22470e61f55031c62b26656eb68dafa5c7f835f706a53c240922607106772c47f4bc7f3ca91aa71464bd29381a238b8465e)
+set(QT_HASH_qt5-x11extras           0b086747fc9be3bd83f83c0d95b5403e6cdf55f3d3727679f01caf3f211313c3da57e26706616275fc6c105d9ac12c8f2d87d0063b14c1de18ca1a70a928e68d)
+set(QT_HASH_qt5-androidextras       caed501bca871c8773d60fc4aa8c093918ffe0021f0bdded2c2e47b6ec49e9a1a100ab18add7d6c9702ace35bd94cd99b28e73778271b3fb28339b607f68861b)
+set(QT_HASH_qt5-canvas3d            5927ab205d6b15a6a8cef91610694d061ba5610afe5b83a44f9a118fbe30c56dea3e5048b37b4902b3675a094f48ad3d9c6294d3686ef4015dbcdcacdaf03555)
+set(QT_HASH_qt5-translations        bb46837f5069f622ba0c9b01d934abdea5ad82b5e2d96d268b7540e29d36f79261273b7e77da7979e18ca9e0b44556012e7f9827085cf1605fc629d877197b8a)
+set(QT_HASH_qt5-serialbus           5c9084852449813c47ca74448bb794c1f8fae1c012169e36175cc2a5c1f8dc956f43b8c112fcc147106b77db69d1c1b8be2f73d8072d49d5f7856a06323b0b24)
+set(QT_HASH_qt5-webengine           b0b5c979d0ce66effe15c152e11f6460226c61a030122d581aa10cc968484ff404b492146cabef313c3018b59a064324c373b886ffdd22efa9d2990b873b7d69)
+set(QT_HASH_qt5-webglplugin         c3741557c7298f30e88d26f22491520a825ec532778d2eb03f408fbed9bb19ad60702dce2bf5c9f347ea5f63a70dd3714a7cf54f204549c72b98817e275f97b3)
+set(QT_HASH_qt5-wayland             f973b24778227ae0d1e62f4b88703c0aafb6409a6150c5b38a6054e7f7e79cf4542f9c989e0c8d012758ae09b1389208fa2654166b5cf4d06011b1e9ad27205a)
 
 
 if(QT_UPDATE_VERSION)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
@@ -21,7 +21,6 @@ else()
         patches/Qt5BasicConfig.patch
         patches/Qt5PluginTarget.patch
         patches/prl_parser.patch # Modified backport of the prl parser from Qt5.14.1 without using QMAKE_PRL_LIBS_FOR_CMAKE
-        patches/qt_moc.patch # Already merged upstream https://codereview.qt-project.org/c/qt/qtbase/+/288359
     )
 endif()
 

diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-charts
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
 Build-Depends:  qt5-base, qt5-declarative, qt5-multimedia
diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-connectivity
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
 Build-Depends:  qt5-base
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-datavis3d
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
 Build-Depends:  qt5-base, qt5-declarative, qt5-multimedia
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-declarative
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
 Build-Depends:  qt5-base, qt5-imageformats, qt5-svg
diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 GraphicalEffects Module.
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-imageformats
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
 Build-Depends:  qt5-base, tiff, libwebp, jasper
diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-location
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application.
 Build-Depends: qt5-base, qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport
diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-macextras
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac.
 Build-Depends:  qt5-base
 Supports: osx
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-mqtt
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 MQTT module.
 Build-Depends:  qt5-base
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-multimedia
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
 Build-Depends: qt5-base, qt5-declarative
diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Network Authorization Module
 Build-Depends:  qt5-base
diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-purchasing
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 QuickControls Module.
 Build-Depends:  qt5-base, qt5-declarative, qt5-graphicaleffects
diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-quickcontrols2
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 QuickControls2 Module.
 Build-Depends:  qt5-base, qt5-declarative, qt5-imageformats
diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-remoteobjects
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-script
-Version: 5.12.7
+Version: 5.12.8
 Build-Depends: qt5-base, qt5-tools
 Description:Qt5 Script Module.
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-scxml
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-sensors
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
 Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
 Build-Depends:  qt5-base
diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-speech
-Version: 5.12.7
+Version: 5.12.8
 Description: Qt5 Speech Module
 Build-Depends:  qt5-base, atlmfc (windows), qt5-declarative, qt5-multimedia