From b692cf823a317abd6149be8fdb497f328fb01555 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 29 Apr 2019 11:48:19 +0300 Subject: [PATCH 1/4] Adjust submodule branches Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2f6addc7..23d10fee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.13 + branch = 5.13.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.13 + branch = 5.13.0 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.13 + branch = 5.13.0 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.13 + branch = 5.13.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.13 + branch = 5.13.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,86 +229,86 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.13 + branch = 5.13.0 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.13 + branch = 5.13.0 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 5.13 + branch = 5.13.0 status = preview From 4c4595b93bbd8e4dd575d7444b18c8f8538395e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 May 2019 15:19:27 +0200 Subject: [PATCH 2/4] Update submodules on '5.13.0' in qt5 Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 276be935..06f41f15 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 276be935bfeccde733bacd4267abeb978f6efda5 +Subproject commit 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 diff --git a/qtactiveqt b/qtactiveqt index 957cc79d..5c3a2a2d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 957cc79d4b5c36aa6b8dc99f73bd0b04b62d6898 +Subproject commit 5c3a2a2de9bc8c7d76afbc042f94b388b53ce896 diff --git a/qtandroidextras b/qtandroidextras index be8e722b..17985125 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit be8e722b492ec8c9c6480d68827b6ec0e83cc2d2 +Subproject commit 17985125ca974456900bca463b98a47af9ce4970 diff --git a/qtbase b/qtbase index 12b96dbb..22c1e10e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 12b96dbb81a1a7bc5ffc08c24942038b007985e9 +Subproject commit 22c1e10e1955c63e3b1761e05ce06164c0464073 diff --git a/qtcharts b/qtcharts index beda274e..ea00b4ad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit beda274e7d8b5a6864b254a9e63b654f3c494139 +Subproject commit ea00b4ad6a88ca582a290c0a8fd17b28ac21481e diff --git a/qtconnectivity b/qtconnectivity index d37dbf77..b4c225c7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54 +Subproject commit b4c225c747d91122f7c145b337ad611c025c1ab6 diff --git a/qtdatavis3d b/qtdatavis3d index 7dc2d930..fd902c04 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7dc2d9302347b87993f5cfed4be5d6b9c3e130bc +Subproject commit fd902c04b912deb81f41da0cd216d2cb1c86289b diff --git a/qtdeclarative b/qtdeclarative index 8bc3329e..bb882f43 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8bc3329e2cec4638fa9af274a40dda176bbb7352 +Subproject commit bb882f433b6cf6fca56049df6b654fb6a39a7cab diff --git a/qtdoc b/qtdoc index 4fe4d966..0a0c3eb7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4fe4d9664eff32568ff03868fc0cbe8b81ee3278 +Subproject commit 0a0c3eb7f4de0ef406e9fe4b3c4780dcdf0deb69 diff --git a/qtgamepad b/qtgamepad index df36f287..653900f1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit df36f287894dca61486b6769866718688cce12f3 +Subproject commit 653900f1d4801f184ddd9725f0806406a4021b8b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 085275b9..fc823235 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 085275b92a55a21cbcf8d307a6f52804875deedd +Subproject commit fc82323538ffde51ab03a38db4d6e61b372a091e diff --git a/qtimageformats b/qtimageformats index 5fba8488..dabcde31 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5fba848889ade8eb067b8a54011e20e9d59b4738 +Subproject commit dabcde3195e47683b31f0050c5de067863eb64e5 diff --git a/qtlocation b/qtlocation index b392921e..5d357f90 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b392921e33b4e8d425f1881afb95e6d34e53879c +Subproject commit 5d357f90951dde3cbae943dfa8ee44e0b952956d diff --git a/qtmacextras b/qtmacextras index 03dd40f8..1196b92a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 03dd40f8bf0bf7cf10830a9fe04de63c0fd95e63 +Subproject commit 1196b92a6428b22c56f1df3fc70337c02972d9d0 diff --git a/qtmultimedia b/qtmultimedia index d97d618a..95818e11 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d97d618a4884c2535ba787e774f0faa6bce82081 +Subproject commit 95818e11936e8c85172b2675132a535d5a45015c diff --git a/qtnetworkauth b/qtnetworkauth index cf5741a4..f52ff01d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit cf5741a44a6c337fa523080838d8e9220f4370c1 +Subproject commit f52ff01d38400d5343af9149414f3573580a2405 diff --git a/qtpurchasing b/qtpurchasing index 12c4da76..f9ab1500 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 12c4da762bd29399767538ca716189908e41cc5a +Subproject commit f9ab15009bdc249d4f19513fc9730d81f5b50fe5 diff --git a/qtqa b/qtqa index 8c9be4c8..604a768d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8c9be4c82ee723783b26cb2ca10cc3667864da35 +Subproject commit 604a768dc4f7ee2a0f39b146c151f9eb2397d6e9 diff --git a/qtquickcontrols b/qtquickcontrols index 3d444423..44fe49e5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 3d44442331ba6f1ba7a5d5ad9f3834993911e288 +Subproject commit 44fe49e573539e22709c2d5c996f1ca9ee8fd760 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ced7d5af..e1a6475a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7 +Subproject commit e1a6475a2a3ea46b2afbc2f154c18b255466dad7 diff --git a/qtremoteobjects b/qtremoteobjects index cb9a20c5..e69037fe 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cb9a20c50584eaf950c1fc9a7fd7961a92100046 +Subproject commit e69037fe3160964d45920ee33d606ec2a72a6e3c diff --git a/qtrepotools b/qtrepotools index df3090cb..50529226 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit df3090cb05817277b0dd3586e9e2e7a673955a24 +Subproject commit 50529226884176e3910f84a68fb260a3cb9fb3b2 diff --git a/qtscript b/qtscript index 8d2c11ac..73296231 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 8d2c11ac2352556167dc4a86172cd9bc3a979ed8 +Subproject commit 732962319eeae2881890bd146146e7e6f486c9fb diff --git a/qtscxml b/qtscxml index acddb067..68c9234b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit acddb0676cafdc83edd08aee87181bf5602d6387 +Subproject commit 68c9234b67ca0939fcf6607d87bda90b93170567 diff --git a/qtsensors b/qtsensors index d1a1b629..5755e89a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d1a1b62914d592bf0bb382accff29abc610d3fab +Subproject commit 5755e89a9de6c60ac574759bc820a7b915b9ee62 diff --git a/qtserialbus b/qtserialbus index fe80eef6..c4baab78 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fe80eef6b3377c8727c5190d275808c343ee7c75 +Subproject commit c4baab78983f803a6956d10fb5ae53731340ab41 diff --git a/qtserialport b/qtserialport index f47d1b9a..313ad3f5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f47d1b9a11eb8c56afbd929285724f795097da09 +Subproject commit 313ad3f5ae210db495854bcbd92c70e0732461fb diff --git a/qtspeech b/qtspeech index c79b11cb..bda364fe 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c79b11cbf4eb6e72d32eb98a262201341018b620 +Subproject commit bda364fe3df7dd6269e2d284fcc2c6d239a962b7 diff --git a/qtsvg b/qtsvg index 2043a358..7e7ed705 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7 +Subproject commit 7e7ed705efc51134b27820d76beceefc62ab0b3d diff --git a/qttools b/qttools index 1562cf0d..7203e6a9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1562cf0d6129886e16c57ac72fab00b309db6bc6 +Subproject commit 7203e6a94ced619eadbc14aedf73d40530671662 diff --git a/qttranslations b/qttranslations index 133f635a..a049a619 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 133f635a25ee58596fcb556b87e841257390758b +Subproject commit a049a619d2f0cbe6e57aaf50202b7ade244cf955 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 67e497ff..17b5efd7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 67e497ff407441515761b312599cb4ad6b61adad +Subproject commit 17b5efd7bfdcb6afedb2ba5fbe263a86efb570f9 diff --git a/qtwayland b/qtwayland index 458bc86f..475910a7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 458bc86f82f8fa6cfd659950549d1d2b36e5e40d +Subproject commit 475910a75a5cd3332fe2f0e5740c4c3c2c0b8987 diff --git a/qtwebchannel b/qtwebchannel index 24e0c897..11c8706b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 24e0c897fac375514396191db7b582505028c918 +Subproject commit 11c8706b6c0ca3f9c0d195641fd0eea816899acd diff --git a/qtwebengine b/qtwebengine index 5de67028..395e61ff 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5de670283e3093fcdd2a91dcca30ffbe0b03d230 +Subproject commit 395e61ff2e51dc7c34ee05debd450846f027ea56 diff --git a/qtwebsockets b/qtwebsockets index 74c8ebe9..142d9798 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 74c8ebe9696c981311f19bdd6544634ab1b7cc7f +Subproject commit 142d9798d262a41c09a9c43f3ae3a82c771fc800 diff --git a/qtwebview b/qtwebview index d8958299..159945f8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d895829904a1de3f8a63d5ab56e73106847fddcf +Subproject commit 159945f822e098d8d169ec1379675d8a664cea9e diff --git a/qtwinextras b/qtwinextras index 49d744be..1ec9cfb3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 49d744be877b2a4cba3e306c4ab0056687179318 +Subproject commit 1ec9cfb3379b40132f8d61a6b8b9145df4ac0a09 diff --git a/qtx11extras b/qtx11extras index 431bd11f..ce6b90e5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 431bd11f304179c77f55edd07d68b02d8408a45c +Subproject commit ce6b90e597e93252a56d37e616fbd473e1ae8c33 diff --git a/qtxmlpatterns b/qtxmlpatterns index c886d992..9cfa05ed 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c886d992029740da0185fd2bf8a040c84156e73d +Subproject commit 9cfa05ed8beb0a9f323070060115e56064be9f3a From 819362c5d6b56ebe707f8c6d0deb0d074f19822c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 May 2019 15:00:43 +0200 Subject: [PATCH 3/4] Update submodules on '5.13.0' in qt5 Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index 06f41f15..e9642824 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 +Subproject commit e9642824244fa9fe55dca2cef8e002192a4f1b17 diff --git a/qtactiveqt b/qtactiveqt index 5c3a2a2d..21a27816 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5c3a2a2de9bc8c7d76afbc042f94b388b53ce896 +Subproject commit 21a27816e66c8bea33b3ee28221df4b0c6ee9baf diff --git a/qtbase b/qtbase index 22c1e10e..4f5b2733 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22c1e10e1955c63e3b1761e05ce06164c0464073 +Subproject commit 4f5b2733b6e8be08177de628da55b8b22db9f707 diff --git a/qtcharts b/qtcharts index ea00b4ad..19fb5aa9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ea00b4ad6a88ca582a290c0a8fd17b28ac21481e +Subproject commit 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e9 diff --git a/qtconnectivity b/qtconnectivity index b4c225c7..8f2d6640 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b4c225c747d91122f7c145b337ad611c025c1ab6 +Subproject commit 8f2d6640f959e35a8fd033a50aa57cb13b673cbb diff --git a/qtdatavis3d b/qtdatavis3d index fd902c04..e4cd15e3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fd902c04b912deb81f41da0cd216d2cb1c86289b +Subproject commit e4cd15e388f675a80a9c257655a580b1b53c240a diff --git a/qtdoc b/qtdoc index 0a0c3eb7..c1c45f8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0a0c3eb7f4de0ef406e9fe4b3c4780dcdf0deb69 +Subproject commit c1c45f8d8cfe67b2605baad2ab72a4ec43aef3ec diff --git a/qtlocation b/qtlocation index 5d357f90..ca339bc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5d357f90951dde3cbae943dfa8ee44e0b952956d +Subproject commit ca339bc55d6fc617c63e723c43150445fc8ac050 diff --git a/qtmultimedia b/qtmultimedia index 95818e11..268d78ca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 95818e11936e8c85172b2675132a535d5a45015c +Subproject commit 268d78ca745bf7d54545e51a4f22e2fa24a8675c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e1a6475a..324ec97a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e1a6475a2a3ea46b2afbc2f154c18b255466dad7 +Subproject commit 324ec97aa256549c56d506fd96c1e06c35fed1ae diff --git a/qtremoteobjects b/qtremoteobjects index e69037fe..a8a3088f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e69037fe3160964d45920ee33d606ec2a72a6e3c +Subproject commit a8a3088f1fcd7ff00e7748040473c27c4bea8dad diff --git a/qtrepotools b/qtrepotools index 50529226..64abf60a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 50529226884176e3910f84a68fb260a3cb9fb3b2 +Subproject commit 64abf60ae196bd3ad59531f48d2e2c78efa5987c diff --git a/qtscript b/qtscript index 73296231..9401306e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 732962319eeae2881890bd146146e7e6f486c9fb +Subproject commit 9401306e2db3a1756aab958d0939d12c8d5f46e0 diff --git a/qtsensors b/qtsensors index 5755e89a..299bbcdb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5755e89a9de6c60ac574759bc820a7b915b9ee62 +Subproject commit 299bbcdb59198910188ebe1abbae1d9868d8ae6d diff --git a/qtserialbus b/qtserialbus index c4baab78..56211334 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c4baab78983f803a6956d10fb5ae53731340ab41 +Subproject commit 562113342f2b232d38a3ea05e84b8d2584799218 diff --git a/qtserialport b/qtserialport index 313ad3f5..c1766c64 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 313ad3f5ae210db495854bcbd92c70e0732461fb +Subproject commit c1766c64f9f76c075aa1f1723f193bcbfd5e79b2 diff --git a/qttools b/qttools index 7203e6a9..72eac2f5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7203e6a94ced619eadbc14aedf73d40530671662 +Subproject commit 72eac2f5f3d8ea839c915455e4eed66118d06505 diff --git a/qttranslations b/qttranslations index a049a619..88266670 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a049a619d2f0cbe6e57aaf50202b7ade244cf955 +Subproject commit 88266670663256f40019e7163092e17401557d5f diff --git a/qtwayland b/qtwayland index 475910a7..a658a10f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 475910a75a5cd3332fe2f0e5740c4c3c2c0b8987 +Subproject commit a658a10f6a42e67bd762f87851c23cc1c1e3b141 diff --git a/qtwebengine b/qtwebengine index 395e61ff..c453b750 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 395e61ff2e51dc7c34ee05debd450846f027ea56 +Subproject commit c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 diff --git a/qtx11extras b/qtx11extras index ce6b90e5..7e86e23e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ce6b90e597e93252a56d37e616fbd473e1ae8c33 +Subproject commit 7e86e23ee87f2450b3f7103632c3ad2ab082e5eb From 8cdf60fe6492490561cd6798901b201903ff6ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 1 Feb 2019 14:51:55 +0200 Subject: [PATCH 4/4] Split features list between Coin and qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start using configure args as configure string instead of flags. Task-number: QTQAINFRA-2744 Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 55 ++++++++++++------------ coin/platform_configs/qt3d-runtime.txt | 42 +++++++++--------- coin/platform_configs/qt5.txt | 42 +++++++++--------- coin/platform_configs/qtbase.txt | 12 +++--- coin/platform_configs/qtconnectivity.txt | 6 +-- coin/platform_configs/qtdeclarative.txt | 8 ++-- coin/platform_configs/qtsaferenderer.txt | 6 +-- coin/platform_configs/qtsdk.txt | 8 ++-- coin/platform_configs/qtwebkit.txt | 8 ++-- coin/platform_configs/tqtc-qt-rta.txt | 11 +++-- 10 files changed, 99 insertions(+), 99 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 177d9aa6..d7c82bbd 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,28 +1,29 @@ -Template Target OS Target arch Compiler Target Compiler Features ------------------------------------ ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle -qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests -qtci-linux-RHEL-7.6-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release -qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch -qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release -qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------ ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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% +qtci-windows-7-x86-3 Mingw73 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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++ +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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% +qtci-windows-10-x86_64-14 MSVC2015 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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% +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 +qtci-windows-10-x86_64-14 MSVC2017 Packaging -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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% +qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -no-widgets -force-debug-info -nomake examples -nomake tests -R . -openssl +qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -qtlibinfix TestInfix -qtnamespace TestNamespace -nomake tests -R . -openssl +qtci-linux-openSUSE-15.0-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -openssl -nomake examples -nomake tests -R . +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -system-sqlite -nomake examples -nomake tests -R . -platform linux-icc-64 -openssl +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-pch -nomake examples -nomake tests -xplatform wasm-emscripten -developer-build -release -static -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors +qtci-linux-RHEL-7.6-x86_64 GCC Packaging -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -no-use-gold-linker -force-debug-info -separate-debug-info -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -no-libudev -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl +qtci-macos-10.13-x86_64-2 Clang Packaging -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake examples -nomake tests -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include +qtci-macos-10.12-x86_64-9 Clang -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -no-framework -release -qtnamespace TestNamespace -no-pch -nomake examples -nomake tests -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -static -no-icu -nomake examples -nomake tests -xplatform macx-ios-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-tvos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake examples -nomake tests -xplatform macx-watchos-clang -no-sql-mysql -no-sql-psql -plugin-sql-sqlite +qtci-linux-RHEL-7.6-x86_64 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-linux-RHEL-7.6-x86_64 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck -qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.6-x86_64 INTEGRITY_11_04 armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -xplatform integrity-armv7-imx6 -nomake tests +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv7 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-armle-v7-qcc diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 314099ab..80319e1b 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 314099ab..80319e1b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +Template Target OS Target arch Compiler Target Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- -------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-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++ +qtci-windows-10-x86_64-14 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -opengl dynamic -nomake examples -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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++ +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 +qtci-linux-RHEL-7.6-x86_64 Android_ANY x86 GCC Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /home/qt/openssl-1.0.2/include -android-ndk-host linux-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch armeabi-v7a +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch x86 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch armeabi-v7a +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch arm64-v8a +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -nomake examples -nomake tests -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -no-dbus -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -android-ndk-host darwin-x86_64 -no-qpa-platform-guard -android-arch x86 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC DisableTests -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-qcc +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-armle-v7-qcc +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-aarch64le-qcc +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -opengl es2 -nomake examples -nomake tests -xplatform qnx-x86-64-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 armv8 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-aarch64le-qcc +qtci-linux-RHEL-7.6-x86_64 QNX_700 x86_64 GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -opengl es2 -no-use-gold-linker -nomake examples -nomake tests -qpa qnx -xplatform qnx-x86-64-qcc diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index e8e10354..7a4b85bf 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,6 +1,6 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -nomake examples -nomake tests -static -no-icu -release -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DisableTests -opensource -confirm-license -developer-build -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -nomake examples -nomake tests -prefix /home/qt/work/install -static -verbose -xplatform wasm-emscripten diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 15f11bd1..c5237cf8 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -static -no-icu -release -force-debug-info -nomake examples -nomake tests -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index e2b69559..8e9e48fb 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild +Template Target OS Target arch Compiler Features Configure arguments +--------------------------------- ------------------- ----------- ----------- -------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC -opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS=hard-float boot2qt -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose +qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt index ec14f610..3c000ec2 100644 --- a/coin/platform_configs/qtsaferenderer.txt +++ b/coin/platform_configs/qtsaferenderer.txt @@ -1,3 +1,3 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples +Template Target OS Target arch Compiler Features Configure arguments +----------------------------------- ------------------- ----------- ----------- ------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-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++ -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -developer-build -release -opengl dynamic diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt index 3011926d..ad320b09 100644 --- a/coin/platform_configs/qtsdk.txt +++ b/coin/platform_configs/qtsdk.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 27782f88..9e1c893f 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-14 x86 MSVC2017 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -force-debug-info -opengl dynamic +qtci-windows-7-x86-3 Mingw73 Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -nomake tests -debug-and-release -release -opengl dynamic diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8fbb5a00..82b086f9 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -1,6 +1,5 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic - +Template Target OS Target arch Compiler Features Configure arguments +--------------------------- ------------------- ----------- ----------- ------------- -------------------------------------------------------------------------------------------------------------------------------------------------------- +qtci-windows-7-x86_64-4 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-8.1-x86_64 MSVC2013 DisableTests -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests +qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests