From 8894622064b876fe244e4d374ff8c64cd4bc70c1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 17 Nov 2016 18:50:57 +0100 Subject: [PATCH 01/10] Update submodules on '5.6' in qt5 Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index f2205c48..ac384524 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f2205c48c21a6b135f2f59d0cf46e72f90f9f0f4 +Subproject commit ac384524c8fa6b19153811e2eaf6dac6b911f930 diff --git a/qtdeclarative b/qtdeclarative index 4ef8b7e7..a3fe91ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ef8b7e7a8a93b2921560db8cf021f89409154e5 +Subproject commit a3fe91ba463fcd27d6e0a69b66bc389bd6470c46 diff --git a/qtlocation b/qtlocation index 81f626f0..78c73ebf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 81f626f062d95abe49fcb7d8f098e54646c04034 +Subproject commit 78c73ebf88fbb97ebb796fc71e76232af5c8f1d3 diff --git a/qtquickcontrols b/qtquickcontrols index fccb5baf..eb2df59f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fccb5baf490b9a8c561a01f30b4992236e3a2060 +Subproject commit eb2df59fb203668734d652808c74b0504864cc1e diff --git a/qttools b/qttools index c84dcdd5..0e735daf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c84dcdd59af82b972b0dee115e95e8aa91b28c50 +Subproject commit 0e735daf4530f6f7972f2368535dd3cff2eeb3e3 From b87529c258d09f7fe72ef1ad315550ab4aee1d1f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 20 Nov 2016 20:00:41 +0100 Subject: [PATCH 02/10] Update submodules on '5.6' in qt5 Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtwebkit | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index ac384524..3691f7ca 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ac384524c8fa6b19153811e2eaf6dac6b911f930 +Subproject commit 3691f7ca0c7117f18ea38ca3950ee9a8a91a53c8 diff --git a/qtdeclarative b/qtdeclarative index a3fe91ba..5ffd0d8b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a3fe91ba463fcd27d6e0a69b66bc389bd6470c46 +Subproject commit 5ffd0d8be35cea57acbf1e8d7a740d3fab5cbe43 diff --git a/qtdoc b/qtdoc index 771e871a..120479a3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 771e871aef5aac605819d1ee5242aa0b751872bf +Subproject commit 120479a3275b4c7844613777525bd3b1b48eefed diff --git a/qtmultimedia b/qtmultimedia index 3d9ef4d4..4430f5eb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3d9ef4d41718adc9a9099964eb4f964d1d3b63df +Subproject commit 4430f5ebd6f593e080a6ac859e76eed5354b704f diff --git a/qtwebkit b/qtwebkit index 7c3f338f..d5423414 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7c3f338f042acebe7cf56de319bfb26a16d1aca3 +Subproject commit d542341492a0c18058b3f03008ea8916d84ccef3 From e0912a9ceabad043f78f867675afd9baa37f200f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 21 Nov 2016 13:10:52 +0200 Subject: [PATCH 03/10] Provision OPENSSL env variable for openSUSE 13.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix building on OpenSuse after openssl update. Every linux distro seems to patch openssl in a different way to deal with broken/outdated SSL issues. We seem unable to detect what suse did when running configure, so this is a stop-gap measure. Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b Reviewed-by: Tony Sarajärvi Reviewed-by: Aapo Keskimolo Reviewed-by: Simon Hausmann --- .../openssl_allow_ssl2.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh diff --git a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh b/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh new file mode 100755 index 00000000..e958ea87 --- /dev/null +++ b/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# hack: it seems that opensuse patched their openssl in a way that +# disables ssl 2 without allowing configure's compile detection to work +echo "export OPENSSL_ALLOW_SSL2=1" >>~/.bashrc From c32c2d42388f021a53c6ed9d3f7d7e11fcff20af Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 22 Nov 2016 20:00:46 +0100 Subject: [PATCH 04/10] Update submodules on '5.6' in qt5 Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtsensors | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 3691f7ca..cff48c78 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3691f7ca0c7117f18ea38ca3950ee9a8a91a53c8 +Subproject commit cff48c7845ccf51ac53a550a43dec78428124f70 diff --git a/qtdeclarative b/qtdeclarative index 5ffd0d8b..c4ebe96c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5ffd0d8be35cea57acbf1e8d7a740d3fab5cbe43 +Subproject commit c4ebe96c34c2179d0ebdc555afdce179e3de52e8 diff --git a/qtrepotools b/qtrepotools index 973462d6..d4c099dd 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 973462d65beec6e6208f867bcc6f44ffd34dfa0c +Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c diff --git a/qtsensors b/qtsensors index 5d1b3831..12c11ffb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5d1b3831b42163f5a46edc7d6f4865ce73281f28 +Subproject commit 12c11ffb6eb1f68c9c83a6eee3f9d4011746b122 From a2762b0f57bf691fb039186592a9a896f926680a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 24 Nov 2016 20:00:44 +0100 Subject: [PATCH 05/10] Update submodules on '5.6' in qt5 Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index cff48c78..4f896ba3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cff48c7845ccf51ac53a550a43dec78428124f70 +Subproject commit 4f896ba34e0f56e492da19c6d1353ac4ba4c7b2e diff --git a/qtdeclarative b/qtdeclarative index c4ebe96c..c712f638 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c4ebe96c34c2179d0ebdc555afdce179e3de52e8 +Subproject commit c712f638a0a3ad2a71a9a18601fd320dabd50f16 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 0b68e91d..2bb1661a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5 +Subproject commit 2bb1661a4e900e5b2b7050f6722bd1db955d203f diff --git a/qtimageformats b/qtimageformats index e6deda52..16362da5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e6deda527721f94133d5715f5c34a170c043f3d1 +Subproject commit 16362da5762b2375ac986d19266cef0bcdc5047c diff --git a/qtmultimedia b/qtmultimedia index 4430f5eb..4df65d37 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4430f5ebd6f593e080a6ac859e76eed5354b704f +Subproject commit 4df65d379733b35d9d3d5d16ed43bfefeea75763 diff --git a/qtquickcontrols b/qtquickcontrols index eb2df59f..32831880 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit eb2df59fb203668734d652808c74b0504864cc1e +Subproject commit 32831880512272968e26ed6a85a5cd98ecbda3b6 diff --git a/qttranslations b/qttranslations index 225e1740..498591be 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 225e1740fec4559bf8d66d915ddd06b9d4f48119 +Subproject commit 498591be33eea0daeb9c57fa82f7dc629689e3f9 diff --git a/qtwebengine b/qtwebengine index 5fc3be56..95a22234 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5fc3be56ea6c1d7b1b7567ce429774e92859dd14 +Subproject commit 95a22234a4671e6e79ce1cecbd720551a185d278 diff --git a/qtwebkit b/qtwebkit index d5423414..ed84b8b4 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit d542341492a0c18058b3f03008ea8916d84ccef3 +Subproject commit ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 diff --git a/qtwebkit-examples b/qtwebkit-examples index 2a143bf8..1dead935 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383 +Subproject commit 1dead935cd5a8082738d54157819f768f6ed42e3 From a7c6550fffaeeca0b9de8bafe7d8aba8a7ab1488 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 17 Nov 2016 14:41:33 +0100 Subject: [PATCH 06/10] Add basic Ubuntu 16.04 provisioning Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef Reviewed-by: Simon Hausmann --- .../001-apt-update.sh | 2 + .../006-qt-build-dependencies.sh | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh new file mode 100644 index 00000000..2f7e2e47 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-apt-update.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +sudo apt-get update diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh new file mode 100644 index 00000000..30a6caad --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/006-qt-build-dependencies.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +sudo apt-get -y build-dep qt5-default + +# qtbase +sudo apt-get -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev +sudo apt-get -y install libxcb-xinerama0-dev libdbus-1-dev libatspi2.0-dev + +# qtmultimedia +sudo apt-get -y install libasound2-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev + +# qtwebengine +sudo apt-get -y install libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libcap-dev libxtst-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libxss-dev libegl1-mesa-dev gperf bison From b74a26b98041fe04921c0fe24dbcb7b637601794 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 25 Nov 2016 20:00:45 +0100 Subject: [PATCH 07/10] Update submodules on '5.6' in qt5 Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 4f896ba3..847a1524 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f896ba34e0f56e492da19c6d1353ac4ba4c7b2e +Subproject commit 847a152474550e0952d31f15069fb346565938df diff --git a/qtdeclarative b/qtdeclarative index c712f638..4fae8ff1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c712f638a0a3ad2a71a9a18601fd320dabd50f16 +Subproject commit 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 From 75f605743cedbf897b8eb967f931458c4131d7b9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 29 Nov 2016 12:39:00 +0100 Subject: [PATCH 08/10] Update submodules on '5.6' in qt5 Change-Id: I88a559589ffd21c7436df6c644c92db21244860d Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index 6c248da9..fc781fa4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6c248da9fc6715ed5bf26cb4105792e0b0964da0 +Subproject commit fc781fa42287a4f5db62a346ad6eb8bcbb9f49c0 diff --git a/qtactiveqt b/qtactiveqt index ad9f1fe7..22330f9f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ad9f1fe77d5f607d617f8402d3475dbc6ddcb998 +Subproject commit 22330f9fb7eb79c6fd273abe469e93e5cb9432e7 diff --git a/qtandroidextras b/qtandroidextras index 389bfef9..dfb9f2cf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 389bfef95d5002c08769e63bff33d7cce8597c4d +Subproject commit dfb9f2cfd658860f69dd55363122a7c2c56b88fb diff --git a/qtbase b/qtbase index 847a1524..2cfcd8a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 847a152474550e0952d31f15069fb346565938df +Subproject commit 2cfcd8a63e03783b76a36a9f96ff9c754cf06294 diff --git a/qtcanvas3d b/qtcanvas3d index 05b1d1e5..61804e56 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 05b1d1e5cfbdefd4ad3ad34c224b50fbd8575ca1 +Subproject commit 61804e56b82330fac0f29beec0e56262233467bb diff --git a/qtconnectivity b/qtconnectivity index d146e48b..825c0c8d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d146e48b72cd8d27dd32eda09650c2c645967e4e +Subproject commit 825c0c8d54a7009c6af5cb73736138150cc5cc63 diff --git a/qtdeclarative b/qtdeclarative index 4fae8ff1..2c6bd456 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 +Subproject commit 2c6bd4569878e9248311a7557661304e60a62878 diff --git a/qtdoc b/qtdoc index 120479a3..276dcf86 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 120479a3275b4c7844613777525bd3b1b48eefed +Subproject commit 276dcf86836507b39c747067de151fb1a31fa527 diff --git a/qtenginio b/qtenginio index e4478184..a833da9c 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit e447818458c9211e95ee5e75e294f76b6abf32d4 +Subproject commit a833da9c3d0b0e8f4158e5c30885979c79bc6c45 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2bb1661a..4dc734d8 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2bb1661a4e900e5b2b7050f6722bd1db955d203f +Subproject commit 4dc734d85f59e3a16a50a9d7ffebc7aa304f5243 diff --git a/qtimageformats b/qtimageformats index 16362da5..cc0e9432 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 16362da5762b2375ac986d19266cef0bcdc5047c +Subproject commit cc0e9432848750689e8a9e48e318b5ef9c6874ff diff --git a/qtlocation b/qtlocation index 78c73ebf..d2b7d77b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 78c73ebf88fbb97ebb796fc71e76232af5c8f1d3 +Subproject commit d2b7d77b7d882e00a2c1bb938a04493e4b1b6d44 diff --git a/qtmacextras b/qtmacextras index 8bfec987..9e98d9a6 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8bfec9876a81ea7db7cd225464cae6d5576103bd +Subproject commit 9e98d9a6f56d1076ec9438b2b22f46ed0798273a diff --git a/qtmultimedia b/qtmultimedia index 4df65d37..e0636deb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4df65d379733b35d9d3d5d16ed43bfefeea75763 +Subproject commit e0636deb5807a68b018feb7733677557acccd6eb diff --git a/qtqa b/qtqa index cd6bd183..ecdfbf2e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd6bd183192764546bd7f0909a5bad3848b9d18a +Subproject commit ecdfbf2e7b3c01b06b0c1547516b85aa7c30e5c5 diff --git a/qtquick1 b/qtquick1 index 2c47447f..b934c545 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 2c47447f0bea43539f764c0e9c518775d7f73074 +Subproject commit b934c54583adc4f9021de2753f99836f60a96688 diff --git a/qtquickcontrols b/qtquickcontrols index 32831880..5db735b1 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 32831880512272968e26ed6a85a5cd98ecbda3b6 +Subproject commit 5db735b193f0520189a2b23a074a9fd62ca8f1f4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6fd334e5..7f0db77f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6fd334e59cab4ae0cd0c587fe2f64cf302ba1f21 +Subproject commit 7f0db77f030dfa6d20987445df258a665223f641 diff --git a/qtscript b/qtscript index 2f7093a2..8196140b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2f7093a2497a9efb38035521c082ed590968c508 +Subproject commit 8196140bedcaca11dbe0e06342e942e52e9d69eb diff --git a/qtsensors b/qtsensors index 12c11ffb..12b98b6f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 12c11ffb6eb1f68c9c83a6eee3f9d4011746b122 +Subproject commit 12b98b6ff70a18c27f543dda029e75c197d8cbc5 diff --git a/qtserialbus b/qtserialbus index 20adfdf1..d8ae11c7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 20adfdf12e29149c589310a065b0259130ac51f0 +Subproject commit d8ae11c7c4bf2cf51653e7f0a34ced8b8c7a7bd7 diff --git a/qtserialport b/qtserialport index 3bd02564..45c51309 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3bd025649c0641e11ae557544d9949d5dcc6cf51 +Subproject commit 45c513093c9e7c40327e2c440a0321d99de36211 diff --git a/qtsvg b/qtsvg index 4704ecbf..6d255448 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4704ecbf79053f2e1cde3c869b03c769be6ef207 +Subproject commit 6d255448e5d12379cc5411dade9b03a4bbf0fb70 diff --git a/qttools b/qttools index 0e735daf..e2ef038c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0e735daf4530f6f7972f2368535dd3cff2eeb3e3 +Subproject commit e2ef038ceec6129ae282a9d26523d97126b9a4cb diff --git a/qttranslations b/qttranslations index 498591be..8f0b19ce 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 498591be33eea0daeb9c57fa82f7dc629689e3f9 +Subproject commit 8f0b19ce4c7127bb957e6dd2152b90445376bacc diff --git a/qtwayland b/qtwayland index f7a386ee..d6f7bb39 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba +Subproject commit d6f7bb39e71777ce5568d462841caccc17f3a205 diff --git a/qtwebchannel b/qtwebchannel index 9cd01a4e..18a53cef 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9cd01a4efb45e244d7b541e870be01c8d045a8ae +Subproject commit 18a53cef73eed59cddd7962d4e4aa8fbf7d3170a diff --git a/qtwebengine b/qtwebengine index 95a22234..b61bb656 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 95a22234a4671e6e79ce1cecbd720551a185d278 +Subproject commit b61bb656ac1d332da300177b41c1331d1f672c47 diff --git a/qtwebkit b/qtwebkit index ed84b8b4..a52dd53a 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit ed84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 +Subproject commit a52dd53ae4e1c33ee8400c65db3af868edd988b3 diff --git a/qtwebkit-examples b/qtwebkit-examples index 1dead935..0c623fab 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 1dead935cd5a8082738d54157819f768f6ed42e3 +Subproject commit 0c623fab420102c54fa533da3b8ca774290d6d13 diff --git a/qtwebsockets b/qtwebsockets index a70af02e..d24e9bec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a70af02e46239edd6807ef8bf908b25116235a75 +Subproject commit d24e9bec079a5f8c66a372643148fb87bb9fb9f3 diff --git a/qtwebview b/qtwebview index c98c779c..d3994169 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c98c779c6474af2f7c347957c6eac4f5e217b988 +Subproject commit d39941695dbc10b06188580b675f2b7c337ca505 diff --git a/qtwinextras b/qtwinextras index 0ea8b505..5f76a8ea 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0ea8b50500c27aabce83de55d02935ea6faaaeec +Subproject commit 5f76a8ea102392838b05c41fa5a474aa1168ff11 diff --git a/qtx11extras b/qtx11extras index 94153d86..7bc18713 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 94153d86a8c882b44f2523cca1cacdf3537e1283 +Subproject commit 7bc187133a72911f0257cb4aca63dbeef9408959 diff --git a/qtxmlpatterns b/qtxmlpatterns index 4dc384b7..9882c2d2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 4dc384b7ae2b944d7d7c28c566abe52bce825502 +Subproject commit 9882c2d27dd71e074d1c8a52a95e6f616014092e From 977f0841e46f9a4249526f93cbfbf540210c76e6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Nov 2016 20:03:24 +0100 Subject: [PATCH 09/10] refuse to operate with dirty submodules the operation would later error out anyway, after spending a lot of time fetching the remotes, and leaving a partially updated state behind. Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388 Reviewed-by: Edward Welbourne --- init-repository | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/init-repository b/init-repository index 52efb201..5c76a31c 100755 --- a/init-repository +++ b/init-repository @@ -395,6 +395,14 @@ sub git_clone_all_submodules } } + my $any_bad = 0; + foreach my $module (@modules) { + $any_bad = 1 + if ($self->git_stat_one_submodule($subdirs{$module})); + } + die("Dirty submodule(s) present; cannot proceed.\n") + if ($any_bad); + foreach my $module (@modules) { $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $co_branch && $subbranches{$module}); @@ -452,6 +460,26 @@ sub git_add_remotes $self->exe('git', 'config', 'remote.gerrit.fetch', '+refs/heads/*:refs/remotes/gerrit/*', '/heads/'); } +sub git_stat_one_submodule +{ + my ($self, $submodule) = @_; + + return 0 if (! -e "$submodule/.git"); + + my $orig_cwd = getcwd(); + chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; + + my @sts = qx(git status --porcelain --untracked=no); + + chdir($orig_cwd) or confess "cd $orig_cwd: $OS_ERROR"; + + return 0 if (!@sts); + + print STDERR "$submodule is dirty.\n"; + + return -1; +} + sub git_clone_one_submodule { my ($self, $submodule, $repo_basename, $branch) = @_; From 150071b395e7c81a9af08469f4cb2f69c2838480 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 25 Nov 2016 20:07:05 +0100 Subject: [PATCH 10/10] don't fail to check out some modules in pinned mode when used without the --branch option, we clone with --no-checkout, to avoid unnecessarily checking out files twice when the recorded sha1 doesn't happen to be the tip of the default branch. however, that would leave the index in a dirty state which would make the subsequent submodule update abort at some point, silently. to deal with the problem, we ignore this type of index dirtyness and use submodule update with --force. Task-number: QTBUG-57289 Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9 Reviewed-by: Edward Welbourne --- init-repository | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 5c76a31c..7a97c199 100755 --- a/init-repository +++ b/init-repository @@ -424,7 +424,7 @@ sub git_clone_all_submodules } } if ($self->{update}) { - my @cmd = ('git', 'submodule', 'update', '--no-fetch'); + my @cmd = ('git', 'submodule', 'update', '--force', '--no-fetch'); push @cmd, '--remote', '--rebase' if ($co_branch); $self->exe(@cmd); @@ -471,6 +471,13 @@ sub git_stat_one_submodule my @sts = qx(git status --porcelain --untracked=no); + # After a git clone --no-checkout, git status reports all files as + # staged for deletion, but we still want to update the submodule. + # It's unlikely that a genuinely dirty index would have _only_ this + # type of modifications, and it doesn't seem like a horribly big deal + # to lose them anyway, so ignore them. + @sts = grep(!/^D /, @sts); + chdir($orig_cwd) or confess "cd $orig_cwd: $OS_ERROR"; return 0 if (!@sts);