From a0c08969b00e2531577a0d4fc9e4b07e560019cc Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Wed, 8 Jan 2020 17:57:47 +0200 Subject: [PATCH 1/5] Adjust submodule branches --- .gitmodules | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index f6948954..c2cb8948 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.14 + branch = 5.14.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.14 + branch = 5.14.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.14 + branch = 5.14.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.14 + branch = 5.14.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.14 + branch = 5.14.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.14 + branch = 5.14.1 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.14 + branch = 5.14.1 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.14 + branch = 5.14.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.14 + branch = 5.14.1 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,98 +229,98 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.14 + branch = 5.14.1 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.14 + branch = 5.14.1 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.14 + branch = 5.14.1 status = preview [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 5.14 + branch = 5.14.1 status = preview [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git - branch = 5.14 + branch = 5.14.1 status = preview From 1382e42ef9310cc4f1b9e1372467b2ee484f3120 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 16 Jan 2020 07:46:01 +0200 Subject: [PATCH 2/5] Update submodules on '5.14.1' in qt5 Change-Id: Ied51c426c5bf7b5ee85c346c1de471da11aa86fe Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index df5a63b0..5aedae5a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit df5a63b059956e8a717db9110327cc86612cc934 +Subproject commit 5aedae5aa9251e1216d7bc1652cb1f451dd047c1 diff --git a/qtactiveqt b/qtactiveqt index 03eea4d9..47f8f0e4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 03eea4d922a8e85b9cef1ed5a021638bca9dd849 +Subproject commit 47f8f0e4a1ac5e36b84002be46dc35249ecb668b diff --git a/qtandroidextras b/qtandroidextras index 2cfef9d0..f7a4a4fa 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 2cfef9d049640199559b20d05744db9f7abfde63 +Subproject commit f7a4a4fa28263a90dd90a37ffd6f1b5815d6511b diff --git a/qtbase b/qtbase index 7a59d6f1..4f55c418 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7a59d6f138ff8799170cc03d709525ab965d703a +Subproject commit 4f55c4181682538e6b1ac2609d907889ca14a02e diff --git a/qtcharts b/qtcharts index 9fa7594a..97e9be18 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9fa7594a6ec84f5780536b6c99feed9279655acf +Subproject commit 97e9be186913cf1a2857fd34f994fbb74a508c3b diff --git a/qtconnectivity b/qtconnectivity index 8159beee..a9b5b10c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8159beeeb3290dc1c1b44b5a9792e19f272ad785 +Subproject commit a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a diff --git a/qtdatavis3d b/qtdatavis3d index 86efcb0b..6b15c2be 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a +Subproject commit 6b15c2bee08a0477e718a407fdf81917a064c1ca diff --git a/qtdeclarative b/qtdeclarative index c061719d..51a15892 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c061719d2e63c45dc2e126c8e36e9fe906a0bdfe +Subproject commit 51a158929b55dffbdfb757da8bd6a2cd181906c6 diff --git a/qtgamepad b/qtgamepad index 8fe3f887..89e9949e 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8fe3f8873210bfe8ca584eb30d88ac19e355957d +Subproject commit 89e9949e720dba11e6f6f05b50c3523a2eca37d7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ee9d746e..4d271e84 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ee9d746eb967a8b561b58ea51da027328f1f3d8a +Subproject commit 4d271e84875a8dc9dd582139e7235497816f9f82 diff --git a/qtimageformats b/qtimageformats index 31338f22..caca9d8d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 31338f220f1ad1d0b8c050c48b04e733c4b62e1b +Subproject commit caca9d8d2bd89facaf9a694d9236d061b8c53b6c diff --git a/qtlocation b/qtlocation index 5ec322a7..bdd1967a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5ec322a7572fca8cfb3b9d4cb30bcff5fbe6eed1 +Subproject commit bdd1967a3901432eaa6c152eee547e3d322b4a98 diff --git a/qtmacextras b/qtmacextras index 96448f71..cfb13120 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 96448f719d32816f2af1461a08335cd3ed602db2 +Subproject commit cfb13120c9cb6198e99d816b7f3dccf1df5990e6 diff --git a/qtmultimedia b/qtmultimedia index ee50d9a3..2091eac6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ee50d9a38689c2d56d530ef41f94ee0f6844b571 +Subproject commit 2091eac697ff6f7be03203d3180633a417c8c58c diff --git a/qtnetworkauth b/qtnetworkauth index 923f889f..ada2b06b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 923f889ff7ba000efcd0c51eadcb452181899fcc +Subproject commit ada2b06b4523ab7c88e4a5e93f7987f1f0677d4e diff --git a/qtpurchasing b/qtpurchasing index 0c5493b7..ad9f777a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0c5493b7e31f96277851667a9c0c04f0d7c9d750 +Subproject commit ad9f777a6e40ee95a9d220dcfadfcd4e513fbf2e diff --git a/qtquick3d b/qtquick3d index acf8ae37..13f56e59 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit acf8ae3790a40270c9f4c297ed283c846e61d402 +Subproject commit 13f56e59c7d019e9787da583a640403f33c8fe9a diff --git a/qtquickcontrols b/qtquickcontrols index 035cbc87..c8a2a74b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 035cbc87fa7892f58e1e1908a8f98bd9c579c8a0 +Subproject commit c8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40 diff --git a/qtquicktimeline b/qtquicktimeline index 15abbfa1..7026fa7d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 15abbfa1135991afa41b2541f098f0941c97571b +Subproject commit 7026fa7d68cc08bcecffc468a29c7318916c959d diff --git a/qtremoteobjects b/qtremoteobjects index 48a059f8..0cb13844 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 48a059f89e5214195802f02913005def43dfb10d +Subproject commit 0cb1384479a2ebcbc72a3941462fb3e67aaa884d diff --git a/qtscript b/qtscript index 5841084b..77b77e35 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5841084b4fac22343bdea2b41f4ba493dcfad469 +Subproject commit 77b77e351f0faa3376da330d14236087cc7e6b46 diff --git a/qtscxml b/qtscxml index a36ee0bd..acc2d335 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a36ee0bd14f528238c8761265d934e29268e2dbe +Subproject commit acc2d33514d741cde8f67521b4d60e398171f6a8 diff --git a/qtsensors b/qtsensors index 32f2fe58..6beffc03 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 32f2fe582a672e498c496fd3b7a17e9a94b0bbce +Subproject commit 6beffc03d6a55adc06177a2e5d53811c5ab26bc8 diff --git a/qtserialbus b/qtserialbus index 8da7dfc8..948edd56 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8da7dfc8544db58645354419054680c69caa207a +Subproject commit 948edd56ece2f2b5fdcd9fc050efd72e27adcc13 diff --git a/qtserialport b/qtserialport index 8c4f95e4..85389370 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8c4f95e481f564d25f168bc7e6ebf7b0c5cec6fd +Subproject commit 85389370bf5f6c8b560e906c8027713b1858929e diff --git a/qtspeech b/qtspeech index 62867033..c187f00c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 62867033d440a7803c6c4648c0f560e9d950a7a3 +Subproject commit c187f00c9b58dd1123f3d4227465132e934d9274 diff --git a/qtsvg b/qtsvg index acb66cad..bbe8f65c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit acb66cad2280bda20d26d08d606a66b9660b17aa +Subproject commit bbe8f65cd070ab85a5e7cd31548e5fef3f7f53e3 diff --git a/qttools b/qttools index e3507ac2..a3430755 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e3507ac277fcb8da41ae21138b6c0f233d17ee38 +Subproject commit a3430755811a998fbd49baae4b3782aebe3583c9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7fa87e18..e73bd487 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7fa87e18e3a1b518ef6b53bd264b7d121a89bbe7 +Subproject commit e73bd4875d5a07d5357bbcb46d581dd32b3821de diff --git a/qtwayland b/qtwayland index 5ed697cd..c2f216ef 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5ed697cda35fe300d2cb828370aaee489a0f9317 +Subproject commit c2f216ef211ae8fbe0073c296742f584f5493e9f diff --git a/qtwebchannel b/qtwebchannel index 6d970e69..edaf9812 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6d970e69549645b886988aed8a026fdc0161f354 +Subproject commit edaf98129a60fda1d017db805b2e5d63902598ea diff --git a/qtwebengine b/qtwebengine index 7222c89c..7876f261 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7222c89c0a7816b82bae7933d2217088c87aa8bf +Subproject commit 7876f261b38361dddce2a7526f2504197f4f8b46 diff --git a/qtwebview b/qtwebview index 319cecf2..94c697c3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 319cecf259ef4fd62e1c4a46c035a7450763df5a +Subproject commit 94c697c37945dedb37a55c1a9669d868f8c97f41 diff --git a/qtwinextras b/qtwinextras index f2dde34d..90893554 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f2dde34d7d97616e027d7e37c7d6ef098723c2a1 +Subproject commit 908935542be3f47d250d8fee92fed7b7cd2b53d3 diff --git a/qtx11extras b/qtx11extras index a4062776..ea1ce116 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a40627760ad12dba8e7e0ecebcbffb6f23a024b3 +Subproject commit ea1ce1167fca96a1663ced0d7d6c2da9c20240b9 diff --git a/qtxmlpatterns b/qtxmlpatterns index b8c12ed8..0fa22b36 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b8c12ed8b1287462b897de76b7a9ad3ff5cc2194 +Subproject commit 0fa22b3674db3d48bbd0b091b7710158ae152daa From a0e5b4b4661649f1ff1affee1c62a8ef35d3b30c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 10 Jan 2020 16:58:02 +0100 Subject: [PATCH 3/5] MinGW: Do not ship host tools with debug information Follow the approach for Linux (see 269387), and do set the -s ln flag to make sure the linker does not include debug information in host tools. From ld documentation: -s: Omit all symbol information from the output file. Fixes: QTBUG-81301 Change-Id: I21f828adec4a93855331d8b833cfa708b73baafd Reviewed-by: Simon Hausmann --- coin/platform_configs/qt5.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 2e17abfd..18324876 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -15,12 +15,12 @@ Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-windows-10-x86_64-16' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-windows-10-x86_64-16' Target os: 'WinRT_10' From 1c924f425bf71af18dbaab65fb1bba2e2595c1dd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 19 Jan 2020 18:15:30 +0000 Subject: [PATCH 4/5] Update submodules on '5.14.1' in qt5 Change-Id: Ibd71afb2637aa413f5ff3dfd1769b04abe6793b8 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 4f55c418..bab1473b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f55c4181682538e6b1ac2609d907889ca14a02e +Subproject commit bab1473b7e20c91287e5ce9685725be21abb7226 diff --git a/qtdoc b/qtdoc index b09e11ad..3e366d51 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b09e11ad9bb9ccdd1a52de5b1cb1e61735d168f4 +Subproject commit 3e366d51d043369098b5a5869f64c6a8383eed9f diff --git a/qtsvg b/qtsvg index bbe8f65c..3e2823a1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bbe8f65cd070ab85a5e7cd31548e5fef3f7f53e3 +Subproject commit 3e2823a147b2dca492fece187facfe39f4d33bed diff --git a/qttools b/qttools index a3430755..33007147 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a3430755811a998fbd49baae4b3782aebe3583c9 +Subproject commit 3300714730761ac23f5c9753071a46685eb87d0e diff --git a/qtwebengine b/qtwebengine index 7876f261..7b1e74a4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7876f261b38361dddce2a7526f2504197f4f8b46 +Subproject commit 7b1e74a4c41b6ba3adca2caea8e45c1f314a70d7 diff --git a/qtwebglplugin b/qtwebglplugin index 8476f66f..11324948 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8476f66f413e89a4eb60f395a6e3840e0fe61a5f +Subproject commit 11324948c1a68233d08726c13571d394b85f4d13 From eac5e8f5c8b7f3c7de6bce0626c724cbeaa4a8a4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Jan 2020 16:03:53 +0000 Subject: [PATCH 5/5] Update submodules on '5.14.1' in qt5 Change-Id: Id83b5a1d21fc124b8c4b45780f8701ba0d2e8849 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bab1473b..0ab53fbd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bab1473b7e20c91287e5ce9685725be21abb7226 +Subproject commit 0ab53fbdda2fd7f24f45dcd52fbd195e282554da diff --git a/qtdoc b/qtdoc index 3e366d51..50187f7e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3e366d51d043369098b5a5869f64c6a8383eed9f +Subproject commit 50187f7e250f3e64ac08ae63e66ba5a016f285a9 diff --git a/qtquick3d b/qtquick3d index 13f56e59..700dd41e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 13f56e59c7d019e9787da583a640403f33c8fe9a +Subproject commit 700dd41e9b882b6da4ba01d68ef14ac38dc6615a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f4d5939a..7be5d463 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f4d5939ad613fda69aa750139ef929fac18b97ae +Subproject commit 7be5d463e25218a2987d6c1735fd81bc226b29b6 diff --git a/qtwebengine b/qtwebengine index 7b1e74a4..73d45748 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7b1e74a4c41b6ba3adca2caea8e45c1f314a70d7 +Subproject commit 73d457481caff493066d9cce50087b56ee506f6a diff --git a/qtwebsockets b/qtwebsockets index 737a86f3..ba3acb9d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 737a86f30a78add874b4bff310d4f84f49cc9b50 +Subproject commit ba3acb9d9c7b5234071143d7980576e7eceb6102