From 7c691c4622931a28d499230f6e42df14e48875e9 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 19 Aug 2019 09:43:00 +0200 Subject: Adjust submodule branches --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..89b9df51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.5 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.5 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.5 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.5 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.5 status = addon -- cgit v1.2.3 From 54e8d38972d05ecc4f37d6989e5ed070f523858a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Aug 2019 07:45:26 +0200 Subject: Update submodules on '5.12.5' in qt5 Change-Id: If4b169a8c53ffb6857cc43d6e1dd5f7d639db45f Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 6388eb98..29541954 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 +Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 diff --git a/qtactiveqt b/qtactiveqt index 62a802cb..a6f9475d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 62a802cbccc18330b010d7197a739d35ba9ae3c7 +Subproject commit a6f9475d48e62a47cf20be47f20500e20a0f0c26 diff --git a/qtbase b/qtbase index 257bd49c..304587e3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f +Subproject commit 304587e3dbb46d23180075bf20cebf7bc342a313 diff --git a/qtcanvas3d b/qtcanvas3d index 73d5bba6..ae8749c1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 73d5bba61d4a57dfce92da8c8c4dbda311af977b +Subproject commit ae8749c175b64222190cdebc6d0b2eceddc0bfc8 diff --git a/qtcharts b/qtcharts index 8b79dba3..dd65e383 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8b79dba3fd204ca4161ec7e7293cb95d698ce9db +Subproject commit dd65e383b2f900b8e661b678c746cd71fdef697e diff --git a/qtdatavis3d b/qtdatavis3d index 54a0844f..3858190b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 +Subproject commit 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 diff --git a/qtdeclarative b/qtdeclarative index 1adbf16f..38bac80a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb +Subproject commit 38bac80aea1c2bd58acb10000e9a3daa65bba503 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f9664053..06116f29 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f9664053132affe48a069235eb6561a32d38b2a7 +Subproject commit 06116f294697e052edc31ac35dc58f46bf493913 diff --git a/qtimageformats b/qtimageformats index 9100cc7a..53f8fd57 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e +Subproject commit 53f8fd57b698b97aded363700306fe61c4b9ea17 diff --git a/qtlocation b/qtlocation index 63cd689a..1de7ca61 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 63cd689a400ee57f7e898e81290366c266537982 +Subproject commit 1de7ca6175bd3e4a542a038a089cfd73c9eaa27a diff --git a/qtmultimedia b/qtmultimedia index 9fba45e9..0b77a2d9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 +Subproject commit 0b77a2d9852d3aa8c8c21a68be8a1d6805197155 diff --git a/qtnetworkauth b/qtnetworkauth index ee681478..773a0dc6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ee681478c4b05ab6640c0318ed4fa25d62c6f356 +Subproject commit 773a0dc64c73c1584fd1ed8fe081a9d9b1b1e4d5 diff --git a/qtpurchasing b/qtpurchasing index 6df36beb..acdb9438 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6df36bebdcb0a12069b0cabfed797ebc719b587d +Subproject commit acdb9438f7ae94b29bab9c261ec20e18ec80390d diff --git a/qtscript b/qtscript index efbc554c..1701681e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit efbc554c260f15b5c6dc23759eff96c106997a55 +Subproject commit 1701681e4f8ee3b17ca39f563a24065ee43b3a52 diff --git a/qtscxml b/qtscxml index db44c53e..f416efc6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit db44c53e73479ee8ea98f911078b387735906f38 +Subproject commit f416efc6e2ea2fff4357cd87f4458e009ac5d595 diff --git a/qtserialport b/qtserialport index 9509b6d3..b1413c11 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 +Subproject commit b1413c11b999aadca302c1b12dd90a12b55a1f12 diff --git a/qtspeech b/qtspeech index 1c004cd1..2f96f61f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1c004cd1f5c746a00c818bb6621100e82c110de4 +Subproject commit 2f96f61fc0f3d7b7627a64a9fae839bcf9f2489e diff --git a/qtsvg b/qtsvg index 347de1dd..cd2d1245 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e +Subproject commit cd2d1245b8237aba4f64d8336b39e2635665564f diff --git a/qttools b/qttools index 40a7f2c6..a8aa0849 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 +Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 diff --git a/qtwayland b/qtwayland index 3e96fa1d..2c9396b0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 +Subproject commit 2c9396b063ca03b36e03fbdb85853a410787313d diff --git a/qtwebchannel b/qtwebchannel index 8a610433..8943eb70 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8a610433fa26c2601d669b45e903566287923bec +Subproject commit 8943eb70b12603f5136e83d285c01b7d50dbb2cf diff --git a/qtwebengine b/qtwebengine index a2c365cb..5c579b95 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 +Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 diff --git a/qtwebglplugin b/qtwebglplugin index ae907e4c..3581cde2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a +Subproject commit 3581cde283545b907671d0cc42eeda6cbdeccb66 diff --git a/qtwebsockets b/qtwebsockets index dcf08a4c..465c6c39 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dcf08a4c702f90cc092629078de48a0ad0d68562 +Subproject commit 465c6c3914455e8ed20f938e5d4a35e6decb446c diff --git a/qtwebview b/qtwebview index de7e4c93..57f656a9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 +Subproject commit 57f656a964aa9fdeb966d14eddc39f62a989b86b diff --git a/qtwinextras b/qtwinextras index 3fc1164e..1ff458e8 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3fc1164ee5464a317ac4daccc4edca09e4cae630 +Subproject commit 1ff458e8709d4e7b9a1489f2b246fc54efc8de72 diff --git a/qtx11extras b/qtx11extras index 10cc8dec..35ae66f8 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 +Subproject commit 35ae66f89959e1dd98648cc4033e153e1e5240b4 -- cgit v1.2.3 From 5752c0d4bc5927107d6aaadaf703f17f0a05406a Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 29 Aug 2019 16:20:44 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-icu' to remove dependency to icu libraries Task-number: QSR-499 Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f0d33f8a..6c71e719 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' -- cgit v1.2.3 From 4c65509d245a8fcdee5abec33b587d19312b3814 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Aug 2019 14:17:14 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 855295c3..151694c0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 855295c3748239ae65e874b579f5449e4ea6723f +Subproject commit 151694c095e05e1c735f96f60c799cc717e93dc1 diff --git a/qtbase b/qtbase index b3dc0c13..7b2dfb37 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b3dc0c13e88f3bd859c96144a9d4280c675665bc +Subproject commit 7b2dfb37ee5a4252d83e7b08970107a15561fe61 diff --git a/qtdeclarative b/qtdeclarative index 4b944cb6..35acc9fc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4b944cb61fb3ceee2f1b743823e4a83b686bafd6 +Subproject commit 35acc9fc3c41446bacbbfe754f7f494de7f62411 diff --git a/qtdoc b/qtdoc index 8c6b3135..05ad406b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8c6b31353174e5f95cbc43c0ab51c8b0085b2663 +Subproject commit 05ad406b9d1673d96f187c3474d6f4de3cdc7240 diff --git a/qtmultimedia b/qtmultimedia index a409efbc..94852a47 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a409efbc5530ad1e8becb018e1ad3319b931b2f3 +Subproject commit 94852a47c130c3dc265d900390bf0d7b53cbab3e diff --git a/qtqa b/qtqa index 68a9cf7c..8a79bcdf 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd diff --git a/qtwayland b/qtwayland index f5a28afe..2e9c90aa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 +Subproject commit 2e9c90aaefdfe5f1e9b90159c5e6981230627055 diff --git a/qtwebengine b/qtwebengine index 5c579b95..d5d0cd81 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 +Subproject commit d5d0cd81cc770d696b19305717cc827ec1a89bd4 -- cgit v1.2.3 From ae3f765798629dd3bd4183245c9d58231e118a5c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Sep 2019 15:55:54 +0200 Subject: Update submodules on '5.12.5' in qt5 Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0 Reviewed-by: Liang Qi --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtmacextras | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 9039930c..72e0dcd0 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 +Subproject commit 72e0dcd050ae9a38b9db80956dd1f0db15e93e59 diff --git a/qtbase b/qtbase index 304587e3..7b82d274 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 304587e3dbb46d23180075bf20cebf7bc342a313 +Subproject commit 7b82d27429cde931114776f1a26f4c3850c8bb72 diff --git a/qtconnectivity b/qtconnectivity index 406b18fd..0a5bf7a4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c +Subproject commit 0a5bf7a41e5c2c4a36efeace83444ceaee79c945 diff --git a/qtdeclarative b/qtdeclarative index 38bac80a..7b473507 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 38bac80aea1c2bd58acb10000e9a3daa65bba503 +Subproject commit 7b47350736f46c59d81238d3d6284358a652983b diff --git a/qtdoc b/qtdoc index 8c6b3135..66db05b5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8c6b31353174e5f95cbc43c0ab51c8b0085b2663 +Subproject commit 66db05b51f337ea3a8c553a57cdbaabdb2aff375 diff --git a/qtgamepad b/qtgamepad index 656f3c13..09de115d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 656f3c134c0cf00743deba3dfaaff7cb5bd17906 +Subproject commit 09de115d0d31fbc62d16aef821f96b487dbf5169 diff --git a/qtmacextras b/qtmacextras index 3247a8f3..bf2fe74a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 +Subproject commit bf2fe74afe29fb5bb1b39943f7c5c8a106ae47ee diff --git a/qtqa b/qtqa index 68a9cf7c..8a79bcdf 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd diff --git a/qtquickcontrols b/qtquickcontrols index 4e156bb2..b37db1f3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4e156bb26fb904663b0e13df1802dc2e0788b114 +Subproject commit b37db1f31b3248e9d32d0ccbb42e77035fa5b340 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da06da57..6a3356df 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da06da57002b64cf4bcde0ca708b3275a5f919ae +Subproject commit 6a3356dfd8a98131d2912d16c666419d5eeaa10e diff --git a/qtremoteobjects b/qtremoteobjects index 2bcda9d9..c76dfdc3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2bcda9d9f45858ac196d9972162c870ac0a6f217 +Subproject commit c76dfdc3eafe1d2129761951c3ca6970699badfb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 47d15b13..0ae9f37f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 +Subproject commit 0ae9f37f9771f0b6536b28202e46c21d5995f13e diff --git a/qtwebengine b/qtwebengine index 5c579b95..dbc0d09b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 +Subproject commit dbc0d09be2bbc3dce01ace956f534c4012402fba diff --git a/qtxmlpatterns b/qtxmlpatterns index 1fe82f96..cdf3aa96 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1fe82f967320b3c65f29ed704862f8c34a6c0c87 +Subproject commit cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28 -- cgit v1.2.3 From 5035d3852542ea5a1cd6bb2afc48d095582389eb Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 3 Sep 2019 08:57:58 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-qpa offscreen' to remove dependency to xcb libraries Task-number: QSR-510 Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 6c71e719..ac4d8c4a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' -- cgit v1.2.3 From c398a50e2d2d80febb0defa903b63c267b809b3d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 21:55:40 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtrepotools | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 151694c0..a802fd74 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 151694c095e05e1c735f96f60c799cc717e93dc1 +Subproject commit a802fd74e010a6d8ebfc2243232e0373d67f3df6 diff --git a/qtbase b/qtbase index 7b2dfb37..1b0c45f6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b2dfb37ee5a4252d83e7b08970107a15561fe61 +Subproject commit 1b0c45f683cef20aacc8f40273aa89200e9924e4 diff --git a/qtdeclarative b/qtdeclarative index 35acc9fc..db3dd029 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35acc9fc3c41446bacbbfe754f7f494de7f62411 +Subproject commit db3dd029d7cd911712102efd5ea71868494f9f6f diff --git a/qtdoc b/qtdoc index 05ad406b..20760875 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 05ad406b9d1673d96f187c3474d6f4de3cdc7240 +Subproject commit 20760875388251e462042dc9a03292dcaa019d29 diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qttools b/qttools index a8aa0849..121887b0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 +Subproject commit 121887b051150af7490f79402248e92c7d7d0f0a -- cgit v1.2.3 From 1c5e02896cd70b03e0f2d013cc98f1c6a8675338 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Sep 2019 10:06:10 +0000 Subject: Update submodules on '5.12.5' in qt5 Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 29541954..bbe0805b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 +Subproject commit bbe0805bfddcb61f7c07a6454793e76f142a32bc diff --git a/qtbase b/qtbase index 7b82d274..abfb1b86 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b82d27429cde931114776f1a26f4c3850c8bb72 +Subproject commit abfb1b8665923ce2824392f3a04e5e4ac3871017 diff --git a/qtdoc b/qtdoc index 66db05b5..88ef254d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 66db05b51f337ea3a8c553a57cdbaabdb2aff375 +Subproject commit 88ef254d246c3c3d3ec3dccc649253e4aa01630c diff --git a/qtqa b/qtqa index 8a79bcdf..3cbc0456 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd +Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qtsensors b/qtsensors index 70c2dd24..b92ff799 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 70c2dd24800527908e92fb0ce181b939dbd6141e +Subproject commit b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42 diff --git a/qtserialbus b/qtserialbus index 4fb3e302..c8645af3 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 +Subproject commit c8645af35accdfadfa2b29cd897f77b6e15704c8 diff --git a/qttools b/qttools index a8aa0849..911477d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 +Subproject commit 911477d8da320db645db2b6b6180f1193ba7d36f -- cgit v1.2.3 From 14c31bf8db92b6c09e669b7c3b0d62261e5bbd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Sep 2019 16:01:35 +0200 Subject: Remove un-needed configure arguments for Apple OSes Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83 Reviewed-by: Timur Pocheptsov --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index cc1f7083..eeeffda8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,16 +94,16 @@ Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-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' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-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' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.12-x86_64-9' Compiler: 'Clang' - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'IOS_ANY' -- cgit v1.2.3 From be97b9ad72c04f622aa0843970b94761360d419f Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 5 Sep 2019 12:04:35 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-xcb' to remove xcb from static build Task-number: QSR-517 Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ac4d8c4a..ce537865 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' -- cgit v1.2.3 From 0d273deeef0c2ea44cd862a1df756ab99cf2926d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 4 Sep 2019 09:54:10 +0300 Subject: Provisioning: Fix version of libiodbc on MacOs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libiodbc latest version (3.52.13) was automatically installed causing qt-config-gui to fail build, this installs version 3.52.12. Task-number: QTQAINFRA-3188 Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/libiodbc.rb | 23 +++++++++++++++++++++++ coin/provisioning/common/macos/libiodbc.sh | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/macos/libiodbc.rb diff --git a/coin/provisioning/common/macos/libiodbc.rb b/coin/provisioning/common/macos/libiodbc.rb new file mode 100644 index 00000000..ed669e69 --- /dev/null +++ b/coin/provisioning/common/macos/libiodbc.rb @@ -0,0 +1,23 @@ +class Libiodbc < Formula + desc "Database connectivity layer based on ODBC. (alternative to unixodbc)" + homepage "http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" + url "https://github.com/openlink/iODBC/archive/v3.52.12.tar.gz" + sha256 "b2cab4f8fbd5388344d7ee0deb1a32310795b1e631c3505a5b515d90186e2516" + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + + conflicts_with "unixodbc", :because => "both install 'odbcinst.h' header" + + def install + system "./autogen.sh" + system "./configure", "--prefix=#{prefix}" + system "make", "install" + end + + test do + system bin/"iodbc-config", "--version" + end +end + diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 79fa86c2..4ba0bbc3 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -41,7 +41,7 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" brew update -brew install libiodbc +brew install ${BASH_SOURCE%/*}/libiodbc.rb # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc -- cgit v1.2.3 From 1d956e93d081be19e3951d9e91bf2d3d6aedfaa5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Sep 2019 13:27:02 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 1b0c45f6..d1a22bd2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b0c45f683cef20aacc8f40273aa89200e9924e4 +Subproject commit d1a22bd29856807805fa56608d2953c072df0cf1 diff --git a/qtqa b/qtqa index 8a79bcdf..cd7003a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd +Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5189f2bc..382531ab 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5189f2bc470da7ff6ae83d0108dd4e6abf35e04e +Subproject commit 382531ab5e2270833d3805c57c00ebcf6b24d635 diff --git a/qttools b/qttools index 121887b0..3480921b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 121887b051150af7490f79402248e92c7d7d0f0a +Subproject commit 3480921b44f7a4dc8a38656a9722c1507a1b840a diff --git a/qtwayland b/qtwayland index 2e9c90aa..481cea71 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2e9c90aaefdfe5f1e9b90159c5e6981230627055 +Subproject commit 481cea71043dabf6d5ff33101a66693af86438e1 -- cgit v1.2.3 From 6402cb61b8e937ded27ace6875203f7305729592 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 8 Sep 2019 19:46:47 +0200 Subject: Update submodules on '5.12' in qt5 Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 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 +- qtquickcontrols | 2 +- qtquickcontrols2 | 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 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index a802fd74..18d84627 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a802fd74e010a6d8ebfc2243232e0373d67f3df6 +Subproject commit 18d84627842e0ccece92d5e8ed91db537aeeabdb diff --git a/qtactiveqt b/qtactiveqt index 62a802cb..53a70236 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 62a802cbccc18330b010d7197a739d35ba9ae3c7 +Subproject commit 53a70236417ddc9e8c6ca61c1922d42f9957d866 diff --git a/qtandroidextras b/qtandroidextras index 9039930c..43c9c18c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 +Subproject commit 43c9c18c7452fbae249d77f897dfad0bac7f984d diff --git a/qtbase b/qtbase index d1a22bd2..551f73bd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1a22bd29856807805fa56608d2953c072df0cf1 +Subproject commit 551f73bd8d745881e70a7808385f1a35c2d12b2a diff --git a/qtcanvas3d b/qtcanvas3d index 73d5bba6..73671479 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 73d5bba61d4a57dfce92da8c8c4dbda311af977b +Subproject commit 7367147993766f6386502b6ca007432518af3004 diff --git a/qtcharts b/qtcharts index 8b79dba3..1a20ea26 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8b79dba3fd204ca4161ec7e7293cb95d698ce9db +Subproject commit 1a20ea269d7a8b1779e8e172e5f640f16e9d7169 diff --git a/qtconnectivity b/qtconnectivity index 406b18fd..5d3f494e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c +Subproject commit 5d3f494e70db4aaba7356d27ad5e1e861b3a4341 diff --git a/qtdatavis3d b/qtdatavis3d index 54a0844f..5d95f3f3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 +Subproject commit 5d95f3f3716e300748c147e18ae3aecf971857ce diff --git a/qtdeclarative b/qtdeclarative index db3dd029..b0c9c5b8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit db3dd029d7cd911712102efd5ea71868494f9f6f +Subproject commit b0c9c5b8d9a78b8f9b6bbb32cf17733d4b582810 diff --git a/qtdoc b/qtdoc index 20760875..15135380 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 20760875388251e462042dc9a03292dcaa019d29 +Subproject commit 15135380ecaecb3812c2d07f4d8069f9404c5b92 diff --git a/qtgamepad b/qtgamepad index 656f3c13..c18416a4 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 656f3c134c0cf00743deba3dfaaff7cb5bd17906 +Subproject commit c18416a4c7e62e1febc6f7a3cf4733dd79e7d6ce diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 718d2ec5..16229f68 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 718d2ec554185f91db8e57e6ece14c7cf1b4caef +Subproject commit 16229f68be2c3ad67761c951348bbc5635b6a192 diff --git a/qtimageformats b/qtimageformats index 9100cc7a..2adadf25 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e +Subproject commit 2adadf2561e9b475a7f24f782200d5a703e8129a diff --git a/qtlocation b/qtlocation index aa8bb4d6..181f1de8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit aa8bb4d64864e0c3cfb9374a367e783602b75eba +Subproject commit 181f1de815d2f4b32430f798da255c98dd7859ae diff --git a/qtmacextras b/qtmacextras index 3247a8f3..2115e10d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 +Subproject commit 2115e10d3ab475ce49fe7c95b8293547be33caf8 diff --git a/qtmultimedia b/qtmultimedia index 94852a47..bbf21e0a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 94852a47c130c3dc265d900390bf0d7b53cbab3e +Subproject commit bbf21e0a222f4f9bb5acae7b02faddca3b354e4e diff --git a/qtnetworkauth b/qtnetworkauth index ee681478..c277c9b3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ee681478c4b05ab6640c0318ed4fa25d62c6f356 +Subproject commit c277c9b3a22db7007a863079dbf500e06824f238 diff --git a/qtpurchasing b/qtpurchasing index 6df36beb..fe396bc6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6df36bebdcb0a12069b0cabfed797ebc719b587d +Subproject commit fe396bc6f8e5b024bdc71a5fc252e1a35ac780e9 diff --git a/qtquickcontrols b/qtquickcontrols index 4e156bb2..baf7f594 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4e156bb26fb904663b0e13df1802dc2e0788b114 +Subproject commit baf7f594a254a56ae94bb01c808c8c72df735745 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 382531ab..188a2210 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 382531ab5e2270833d3805c57c00ebcf6b24d635 +Subproject commit 188a2210348461b3060eddd5c9368759d93d40c6 diff --git a/qtremoteobjects b/qtremoteobjects index 47c6aa50..03d62a73 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 +Subproject commit 03d62a73c252d7c23b619eb160568acc61d6b9ea diff --git a/qtscript b/qtscript index efbc554c..f07f14c4 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit efbc554c260f15b5c6dc23759eff96c106997a55 +Subproject commit f07f14c42524f63abf6598647815cea9607e37cf diff --git a/qtscxml b/qtscxml index 9bba89da..839a6b0f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 9bba89da77b73f016f22bc5d3f195d9c0212c7bc +Subproject commit 839a6b0f9799d2d93b5edae7fb761a4cba755a83 diff --git a/qtsensors b/qtsensors index 70c2dd24..52822ce6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 70c2dd24800527908e92fb0ce181b939dbd6141e +Subproject commit 52822ce6115e10d9161e01f838210c27835b3b1e diff --git a/qtserialbus b/qtserialbus index 4fb3e302..9b32e787 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 +Subproject commit 9b32e78758798ba2a2e97cafde79cc53cad0348f diff --git a/qtserialport b/qtserialport index 9509b6d3..e7d70e34 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 +Subproject commit e7d70e34509e948ec67a0d9182bdc9dd12f98ac1 diff --git a/qtspeech b/qtspeech index 1c004cd1..cbf37ef4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1c004cd1f5c746a00c818bb6621100e82c110de4 +Subproject commit cbf37ef4536fdea8d14aa3db33f4a062da8c9716 diff --git a/qtsvg b/qtsvg index 347de1dd..3394d292 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e +Subproject commit 3394d29226541d4b802dca4c8ef7b8817849743c diff --git a/qttools b/qttools index 3480921b..647a9f29 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3480921b44f7a4dc8a38656a9722c1507a1b840a +Subproject commit 647a9f29035add2b50ac510f0ddc06cb34122435 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 47d15b13..6074356c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 +Subproject commit 6074356c2c84044b65134bd6186171d513703306 diff --git a/qtwayland b/qtwayland index 481cea71..ac80dfb5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 481cea71043dabf6d5ff33101a66693af86438e1 +Subproject commit ac80dfb5b921437b699a992d1f211e8edf4d7844 diff --git a/qtwebchannel b/qtwebchannel index 8a610433..2b2a24e3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8a610433fa26c2601d669b45e903566287923bec +Subproject commit 2b2a24e3a62d1204b9c13c0ae5e1bb4453e02a61 diff --git a/qtwebengine b/qtwebengine index d5d0cd81..594e2b7d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d5d0cd81cc770d696b19305717cc827ec1a89bd4 +Subproject commit 594e2b7d381858ae2dc70743824b9bf14b594599 diff --git a/qtwebglplugin b/qtwebglplugin index ae907e4c..04d5b05b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a +Subproject commit 04d5b05b184fa7b1c8f89462bfc4b31cd43860dd diff --git a/qtwebsockets b/qtwebsockets index dcf08a4c..f35c72e7 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dcf08a4c702f90cc092629078de48a0ad0d68562 +Subproject commit f35c72e71124c7077b5192944cf9b57966a258bc diff --git a/qtwebview b/qtwebview index de7e4c93..f2123e65 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 +Subproject commit f2123e656868dd1f4869080afa02e4d865b4911e diff --git a/qtwinextras b/qtwinextras index 3fc1164e..553d8468 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3fc1164ee5464a317ac4daccc4edca09e4cae630 +Subproject commit 553d8468ebbf456355ad280fd3b2c742b38c1d57 diff --git a/qtx11extras b/qtx11extras index 10cc8dec..da2acfc8 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 +Subproject commit da2acfc8266fc771d409a728fa8450a01a042c9c diff --git a/qtxmlpatterns b/qtxmlpatterns index 1fe82f96..47aed17d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1fe82f967320b3c65f29ed704862f8c34a6c0c87 +Subproject commit 47aed17df4cde1a8bfb487ce6452b2b3634e2402 -- cgit v1.2.3 From d4e3d3cac32fca1c53576a3841174d6c38165143 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 6 Sep 2019 15:40:15 +0300 Subject: Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-opengl' to remove xcb from static build Add build flag '-no-vulkan' to disable vulkan Task-number: QSR-517 Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ce537865..14e0e953 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' -- cgit v1.2.3