From ef2315af7321c46f2c3a540826237fe2d8c943b7 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Tue, 27 Feb 2018 11:58:04 +0200 Subject: Install libusbx-devel for QDB on RHEL 7.4 On previous RHEL version the package was libusb1-devel. That package doesn't seem to be there anymore, which presumably means why the package to install was changed to libusb-devel. Unfortunately libusb-devel provides a compatibility package for the old 0.1 API version and doesn't work with QDB. libusbx-devel seems to be the new name for the 1.0 API version of libusb on RHEL. (cherry picked from commit 140c6479b5916e21d6c03a94f844a0f8693af0f8) Change-Id: I978e9842b3f0ec3a355cd1724934c99a531903ef Reviewed-by: Samuli Piippo --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 60f5ad29..87bb14a2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -61,7 +61,7 @@ installPackages+=(gstreamer1-plugins-base-devel) # gtk3 style for QtGui/QStyle installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb -installPackages+=(libusb-devel) +installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) # Python -- cgit v1.2.3 From 07a4522087be7da2751b425343f627230eea74d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 7 Mar 2018 10:22:26 +0200 Subject: Move MSVC2017 x86 builds to 64bit host OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Liang Qi Reviewed-by: Simon Hausmann Reviewed-by: Simo Fält (cherry picked from commit b85b272c26810e54a4ceb0707cf4569f87517b67) Change-Id: I0bd874ac3c7f216f0fccd4141964c630cd8f6e10 --- coin/platform_configs/qt5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 558a756b..20569d1c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -3,7 +3,7 @@ Template Target OS Target arch Compiler Features qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From a63aa1647ceb93207a32cc832a70e56f34db7fd2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Mar 2018 14:25:24 +0100 Subject: Update submodules on '5.9' in qt5 Change-Id: I00a05444ff7e4b0eaaf8de653222e9cf3eff525a Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 1c1ec433..4c0a363a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1c1ec4337304c395c5798e6ac0ebaa74c41d1936 +Subproject commit 4c0a363a9a0b73c68fd252cba705396d4378b209 diff --git a/qtdeclarative b/qtdeclarative index ec4c897d..dfd5cc04 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ec4c897ddab774b6ce873370bdc202f0bc7e76a3 +Subproject commit dfd5cc04a6745cd90e6459ffd99d59ed14471f15 diff --git a/qtdoc b/qtdoc index de869e95..a0fb205b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit de869e95fa9dce9b0f12e7c383c65a72e01a0616 +Subproject commit a0fb205ba3d51a316941c189e5447e71e3ff1d02 diff --git a/qtqa b/qtqa index 0d050f36..e3754bc5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0d050f36dc74adc3a7e29b1d51ccf55027d9c522 +Subproject commit e3754bc547c44aac2713d6245543ee3df484af8f diff --git a/qtrepotools b/qtrepotools index c112252b..dfb5e109 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c112252bc2e0e35dbdc946171673fbc867a52996 +Subproject commit dfb5e10927531c56d69115df1a1a8ebb494065ec diff --git a/qtsvg b/qtsvg index a2156af9..afb52205 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a2156af9ed6bc3e57f715dfe6784a2249ee5fa35 +Subproject commit afb5220592d7d687f70c8f3f8b8198d8c2cdd810 diff --git a/qtwebengine b/qtwebengine index 2e06a051..e5866624 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2e06a051404c250b847421364c098bf541c43773 +Subproject commit e5866624a201b48c16a043fe876f7da08dae90ee -- cgit v1.2.3