From 9a9865ce282d870f755e08438ba187061a41ed9d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Feb 2015 21:24:11 +0200 Subject: [PATCH 1/6] Updated submodules. Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b Reviewed-by: Jani Heikkinen --- 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 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index fc8bd008..35c178c3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fc8bd008b15f148171614be2a7730b40ff032316 +Subproject commit 35c178c310ebb85a8959d116acd913e7c050c8df diff --git a/qtandroidextras b/qtandroidextras index cf82978a..ecd7db7f 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cf82978ac02114a9e0ea164443c0bb396fc7db0f +Subproject commit ecd7db7ff28c3dae943ea364464ee8941e36c4c7 diff --git a/qtbase b/qtbase index e9f30968..d34353a0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e9f30968ad777bc2d7fcd85adc4e9d38d70398d8 +Subproject commit d34353a065c443aac20376cbd88323480d769183 diff --git a/qtcanvas3d b/qtcanvas3d index 916c59c0..c5f09205 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 916c59c00c7df7c8f0652098462e042daac3048c +Subproject commit c5f092053b3e22ab06bb7a1d7418e4a31dcd3c05 diff --git a/qtconnectivity b/qtconnectivity index 3264db95..e4f0b056 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3264db95f965a47f31ffe1ab768467ce827e41e9 +Subproject commit e4f0b0568c334695cbc3c90f5a040edc61a8dcef diff --git a/qtdeclarative b/qtdeclarative index 6a50e6f6..83a16630 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6a50e6f63d46dfed4b1edc6a2a8d49f27ef9695f +Subproject commit 83a16630c13969e68cd3a5aaab73335ccb0d4414 diff --git a/qtdoc b/qtdoc index e2e70692..79cadf24 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e2e70692911f32cfea38269bd18603079277e2c9 +Subproject commit 79cadf244e8a8a6b596fb33d83a3371028a72b05 diff --git a/qtenginio b/qtenginio index 16afca15..6fb83a45 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 16afca15afe8e8c0f69d5e2c42a62bd92477b2e5 +Subproject commit 6fb83a4538ce5cd336b9ef462cf0856fc5379fec diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a1897106..4ee79d3e 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a1897106ce1306c1083bff05493a760e11bd19c7 +Subproject commit 4ee79d3eb4baef9e5b2a3d263f002a24184d0e6e diff --git a/qtimageformats b/qtimageformats index 6aeeadf8..097e6bee 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6aeeadf865d711a67185d06e563d9f63e67c31e2 +Subproject commit 097e6beeff3fb77dac86f8f38e467b2d704c2a25 diff --git a/qtlocation b/qtlocation index c23a10cd..4ae1f2b9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c23a10cd2c54799da62078f032e021c2ec0f9766 +Subproject commit 4ae1f2b90ac318f2683d9474e35b50a37a2e3335 diff --git a/qtmacextras b/qtmacextras index 2353df99..df9fea2a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 2353df997fee7ec6b99765762f21c925c33a53ab +Subproject commit df9fea2ac092b21e96ddf0db235be165cb973bad diff --git a/qtmultimedia b/qtmultimedia index bbfccc71..f86a3b7b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bbfccc713546f9e7341fbe1af7482cafbdc4ea25 +Subproject commit f86a3b7bb3a601da9705ef178fda9658cdbfebb0 diff --git a/qtqa b/qtqa index f1caec8c..4169823e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f1caec8cebc7113d838d78ec1ce5e34173381c09 +Subproject commit 4169823ed7f18b99aec5058c17552b1e41242278 diff --git a/qtquick1 b/qtquick1 index 4b4c6a98..ad3874ec 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 4b4c6a984b2bcdfcb5a77a024e48072a7aa854ec +Subproject commit ad3874ec96c50ec23eeeddda6b5758beda5c9c3d diff --git a/qtquickcontrols b/qtquickcontrols index 6f15c206..cdd0c1d5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6f15c206b069ed0fcf48a285bfcc4ad636927df0 +Subproject commit cdd0c1d5ac5daf8010e8088ca80e059dbea66efc diff --git a/qtrepotools b/qtrepotools index cbddd3a5..0507167a 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit cbddd3a5a6c9022b456c0df0ae8cf30eddb8cde6 +Subproject commit 0507167af6cad7db86f891918862a2bdd966f1f5 diff --git a/qtscript b/qtscript index 6c387974..ca041dab 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 6c387974ab827e53d96d9106a44df29584c1e2be +Subproject commit ca041dab3feb95e3b4a36dd2bec5c706166bb158 diff --git a/qtsensors b/qtsensors index 007772e6..19e41c59 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 007772e642fc337a97e50f65babb62c520257476 +Subproject commit 19e41c59771bda6e64432a6e007afe76361ae3ef diff --git a/qtsvg b/qtsvg index 684283ae..704ee03e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 684283ae80a6d844e80ac5f9ce4a816a3766a4f7 +Subproject commit 704ee03ee308086a33c29197af50f06c719ab6eb diff --git a/qttools b/qttools index ef50aeaf..16d13001 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ef50aeaff84130e9bbab344027cdb78af8a92ca9 +Subproject commit 16d130014a481749941129b1dfe45120ea5130ba diff --git a/qtwayland b/qtwayland index e6805407..d5500d96 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e6805407b62c9c57bac488813f77ee5cca71868e +Subproject commit d5500d96005c2d617e14a43b41462b48e59fdd65 diff --git a/qtwebchannel b/qtwebchannel index 9d705911..ccb40b72 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9d705911391c456813ce54a52f70aa2ccbc5b553 +Subproject commit ccb40b720a675242b5b93333e5a56d5938086e0c diff --git a/qtwebengine b/qtwebengine index eee48292..cc48526d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit eee482929a81ae9d685a0ee140733227ceac6543 +Subproject commit cc48526dfb85701629ad19bd1dadf88af5482800 diff --git a/qtwebkit b/qtwebkit index 3a368115..aced58b7 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 3a3681158677f319bce88eee75d2696b8231eb1f +Subproject commit aced58b77e9c91c98ac2ed60a2219d87fdc6c074 diff --git a/qtwebkit-examples b/qtwebkit-examples index 10edcf82..e96fa2b3 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 10edcf82d3e85fee00b8397d7a21c56a9dfa95ed +Subproject commit e96fa2b3bad65ebe3415920cd7820966d89f2d6c diff --git a/qtwebsockets b/qtwebsockets index bb9c2228..b01068a4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bb9c22280afea1687b4c8ac012139f23b29adf5a +Subproject commit b01068a406f6ebf51e103dd541f36fd6ef144805 diff --git a/qtwinextras b/qtwinextras index 8657988d..f7b3d9c5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8657988dd4074377a2131dee300ca35004869e3e +Subproject commit f7b3d9c5877c39a0d54b7497c1d5dd7d3e7f37f3 diff --git a/qtx11extras b/qtx11extras index a9a4e641..fbbd39ea 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a9a4e64127a06ca9d1ad7032e521a1181e0412f6 +Subproject commit fbbd39ea7b005e70e32c6ed284c0779ce9958247 diff --git a/qtxmlpatterns b/qtxmlpatterns index b6d1d402..5e53b39e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b6d1d402b5b6b9f62f2359578cf1fc9677aea0dd +Subproject commit 5e53b39e6a2dda3387dda9a810c4bfed8752ad6d From c2d151522bf8ae761937b51d1a630d3c5eb7a449 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 17 Feb 2015 12:41:59 +0200 Subject: [PATCH 2/6] Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb3be34b0d4061fb8dc886991528951f59dbd67e Reviewed-by: Tuukka Turunen Reviewed-by: Iikka Eklund --- LGPL_EXCEPTION.txt | 2 +- LICENSE.GPLv2 | 4 ++-- LICENSE.LGPLv21 | 4 ++-- LICENSE.LGPLv3 | 4 ++-- configure | 36 ++++++++++++++---------------------- configure.bat | 36 ++++++++++++++---------------------- init-repository | 36 ++++++++++++++---------------------- 7 files changed, 49 insertions(+), 73 deletions(-) diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt index 7e2e30ff..5cdacb9a 100644 --- a/LGPL_EXCEPTION.txt +++ b/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company Qt LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 194c39cb..6dbb032f 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU General Public License version 2, which is displayed below. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 341aa9ee..6e184611 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index aed671a0..8fbb7439 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. diff --git a/configure b/configure index 535bc9d8..a7b4c9cb 100755 --- a/configure +++ b/configure @@ -1,41 +1,33 @@ #! /bin/sh ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the build tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## 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 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## 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. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/configure.bat b/configure.bat index d3bb977f..a9f81cb7 100644 --- a/configure.bat +++ b/configure.bat @@ -1,41 +1,33 @@ @echo off ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal +:: Copyright (C) 2015 The Qt Company Ltd. +:: Contact: http://www.qt.io/licensing/ :: :: This file is part of the tools applications of the Qt Toolkit. :: -:: $QT_BEGIN_LICENSE:LGPL$ +:: $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 Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. +:: 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 as published by the Free Software -:: Foundation and appearing in the file LICENSE.LGPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU Lesser General Public License version 2.1 requirements -:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +:: 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. :: -:: In addition, as a special exception, Digia gives you certain additional -:: rights. These rights are described in the Digia Qt LGPL Exception +:: 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. :: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU -:: General Public License version 3.0 as published by the Free Software -:: Foundation and appearing in the file LICENSE.GPL included in the -:: packaging of this file. Please review the following information to -:: ensure the GNU General Public License version 3.0 requirements will be -:: met: http://www.gnu.org/copyleft/gpl.html. -:: -:: :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/init-repository b/init-repository index 9a08406e..0061de4d 100755 --- a/init-repository +++ b/init-repository @@ -1,41 +1,33 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal +## Copyright (C) 2015 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ ## ## This file is part of the utilities of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $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 Digia. For licensing terms and -## conditions see http://qt.digia.com/licensing. For further information -## use the contact form at http://qt.digia.com/contact-us. +## 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 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## 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. ## -## In addition, as a special exception, Digia gives you certain additional -## rights. These rights are described in the Digia Qt LGPL Exception +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# From ac6168c0cb00b32a644509645cb77e33470c4e2c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Mar 2015 12:03:54 +0100 Subject: [PATCH 3/6] use git clone --branch instead of --no-checkout git submodule update does not cause an actual checkout if HEAD matches the recorded submodule sha1 even if it was not actually checked out. it would be possible to work around this by calling git checkout HEAD in each submodule if no files are checked out, but that seems hacky. instead, just make the module cloning already check out the desired branch. this produces checkouts that are within a few commits of the final sha1, so isn't too bad. Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7 --- init-repository | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init-repository b/init-repository index 9a08406e..581d108e 100755 --- a/init-repository +++ b/init-repository @@ -383,7 +383,7 @@ sub git_clone_all_submodules } foreach my $module (@modules) { - $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}); + $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module}); } if ($co_branch) { @@ -440,7 +440,7 @@ sub git_add_remotes sub git_clone_one_submodule { - my ($self, $submodule, $repo_basename) = @_; + my ($self, $submodule, $repo_basename, $branch) = @_; my $alternates = $self->{ 'alternates' }; my $mirror_url = $self->{ 'mirror-url' }; @@ -476,7 +476,8 @@ sub git_clone_one_submodule my $do_clone = (! -e "$submodule/.git"); if ($do_clone) { - $self->exe('git', 'clone', '--no-checkout', @reference_args, + push @reference_args, '--branch', $branch if ($branch); + $self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule); } From cb28f324e5c716a52c2caf5fe422ff153beaa305 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 17 Dec 2014 14:46:05 +0200 Subject: [PATCH 4/6] Added Qt3D as a part of qt5.git default repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8 Reviewed-by: Johanna Äijälä --- .gitmodules | 1 + qt3d | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c55010ca..ef08ab13 100644 --- a/.gitmodules +++ b/.gitmodules @@ -108,6 +108,7 @@ path = qt3d url = ../qt3d.git branch = 5.5 + initrepo = true [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git diff --git a/qt3d b/qt3d index 664b73dd..ce0ab1fd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 664b73dd36de6205cc84a219f936dd744a2dc184 +Subproject commit ce0ab1fd2dc9a6b9cec63a3aed6b4b599fcd77b4 From 1b9965bf167e4a510bb8662ea11e6ee71a566772 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Mar 2015 06:33:53 +0200 Subject: [PATCH 5/6] Updated submodules. Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d Reviewed-by: Jani Heikkinen --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 35c178c3..8ee393f9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 35c178c310ebb85a8959d116acd913e7c050c8df +Subproject commit 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd diff --git a/qtandroidextras b/qtandroidextras index ecd7db7f..63f7d234 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ecd7db7ff28c3dae943ea364464ee8941e36c4c7 +Subproject commit 63f7d2343409be60aa8d3106d7626f19f637c27b diff --git a/qtbase b/qtbase index d34353a0..c286afee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d34353a065c443aac20376cbd88323480d769183 +Subproject commit c286afee3a817ffcfe0aba5fbe7c36cd791beda9 diff --git a/qtcanvas3d b/qtcanvas3d index c5f09205..8de3691d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c5f092053b3e22ab06bb7a1d7418e4a31dcd3c05 +Subproject commit 8de3691d1f5059b3a711a51eab8a249b4f0c3582 diff --git a/qtconnectivity b/qtconnectivity index e4f0b056..6b2fd04b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e4f0b0568c334695cbc3c90f5a040edc61a8dcef +Subproject commit 6b2fd04b7be4494767b6092a030607010d91310c diff --git a/qtdeclarative b/qtdeclarative index 83a16630..a99707bc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 83a16630c13969e68cd3a5aaab73335ccb0d4414 +Subproject commit a99707bcbed3eaace95c21836ce1b4d58452e9d5 diff --git a/qtdoc b/qtdoc index 79cadf24..a2c79613 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 79cadf244e8a8a6b596fb33d83a3371028a72b05 +Subproject commit a2c7961370f04e900ff9fff0e6692acfd1b72f9f diff --git a/qtenginio b/qtenginio index 6fb83a45..fad14425 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 6fb83a4538ce5cd336b9ef462cf0856fc5379fec +Subproject commit fad14425b5b2d3f6263384119c7f0682b1c40aa3 diff --git a/qtimageformats b/qtimageformats index 097e6bee..5b873772 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 097e6beeff3fb77dac86f8f38e467b2d704c2a25 +Subproject commit 5b8737723a39f7529422bb3832d5b6ac62762bec diff --git a/qtlocation b/qtlocation index 4ae1f2b9..6915abd4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4ae1f2b90ac318f2683d9474e35b50a37a2e3335 +Subproject commit 6915abd48a911a51b0625688ba70009b919f7882 diff --git a/qtmultimedia b/qtmultimedia index f86a3b7b..2099a8c3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f86a3b7bb3a601da9705ef178fda9658cdbfebb0 +Subproject commit 2099a8c3c77eea56b95a60e12f265b4eb1d8913d diff --git a/qtqa b/qtqa index 4169823e..28f95fde 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4169823ed7f18b99aec5058c17552b1e41242278 +Subproject commit 28f95fde38e71e79872719822ff9f35e6d9dbc04 diff --git a/qtquick1 b/qtquick1 index ad3874ec..30405c50 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit ad3874ec96c50ec23eeeddda6b5758beda5c9c3d +Subproject commit 30405c50a521146f2dda49916f160ab722316a82 diff --git a/qtquickcontrols b/qtquickcontrols index cdd0c1d5..d04eb329 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cdd0c1d5ac5daf8010e8088ca80e059dbea66efc +Subproject commit d04eb32908cfa7c6692bacfc292494b85ce3cd8a diff --git a/qtrepotools b/qtrepotools index 0507167a..ee349f4b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0507167af6cad7db86f891918862a2bdd966f1f5 +Subproject commit ee349f4be8da8ca0fc03f9470b50bd5a6e57f005 diff --git a/qtscript b/qtscript index ca041dab..12f3a1f3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ca041dab3feb95e3b4a36dd2bec5c706166bb158 +Subproject commit 12f3a1f3172f24bfbcfd8c8d47e7e0fc9b451f45 diff --git a/qtserialport b/qtserialport index d42d5838..53afe731 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d42d5838b9a4c3cbd6b0e67dabce658ba737eba8 +Subproject commit 53afe73154c7c00b54cd280fa3d6c9127a2bc84b diff --git a/qtsvg b/qtsvg index 704ee03e..b725b5fd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 704ee03ee308086a33c29197af50f06c719ab6eb +Subproject commit b725b5fd9158d95f3693a06425924271ee4b4239 diff --git a/qttools b/qttools index 16d13001..0b356c32 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 16d130014a481749941129b1dfe45120ea5130ba +Subproject commit 0b356c32ab517bad0e7801ceab1ea9d99a9d259e diff --git a/qttranslations b/qttranslations index c2c7437f..408146a4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c2c7437f35df9d65e70aaa0314c6f88a851855da +Subproject commit 408146a45cf9026e95666af626a90f33d890db34 diff --git a/qtwayland b/qtwayland index d5500d96..dc0bde95 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d5500d96005c2d617e14a43b41462b48e59fdd65 +Subproject commit dc0bde95ff9ec133ff3943b739e43f89d4f08e1c diff --git a/qtwebengine b/qtwebengine index cc48526d..d3905d85 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cc48526dfb85701629ad19bd1dadf88af5482800 +Subproject commit d3905d85925a950ca32aa78eead6db7228be1330 diff --git a/qtwebkit b/qtwebkit index aced58b7..1ee47220 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit aced58b77e9c91c98ac2ed60a2219d87fdc6c074 +Subproject commit 1ee472207c63905ab4455e676ee3ffd3263ab2cb diff --git a/qtwebsockets b/qtwebsockets index b01068a4..bf0a3b6c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b01068a406f6ebf51e103dd541f36fd6ef144805 +Subproject commit bf0a3b6c6b0dc35420655e6325dc3529da7d40b1 From 43a2c55cdea1098a23221915571445c1d5f23c2b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Mar 2015 14:34:05 +0200 Subject: [PATCH 6/6] Updated submodules. Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qt3d b/qt3d index ce0ab1fd..a97f06ad 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ce0ab1fd2dc9a6b9cec63a3aed6b4b599fcd77b4 +Subproject commit a97f06addbfcc5018a7c42ff99de9eaef25d5cc4 diff --git a/qtactiveqt b/qtactiveqt index 8ee393f9..c577327d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd +Subproject commit c577327dda0ed253829d52b39f317fbfe9a6a3db diff --git a/qtbase b/qtbase index c286afee..0411240f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c286afee3a817ffcfe0aba5fbe7c36cd791beda9 +Subproject commit 0411240fdaada112d150f28f82973beb15478b1d diff --git a/qtcanvas3d b/qtcanvas3d index 8de3691d..460ab62c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 8de3691d1f5059b3a711a51eab8a249b4f0c3582 +Subproject commit 460ab62cd69941caabbb87895fbef26219210f9c diff --git a/qtconnectivity b/qtconnectivity index 6b2fd04b..341223e2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6b2fd04b7be4494767b6092a030607010d91310c +Subproject commit 341223e26d611b41c4b533c1b3b0a5d428c83331 diff --git a/qtdeclarative b/qtdeclarative index a99707bc..b735ba49 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a99707bcbed3eaace95c21836ce1b4d58452e9d5 +Subproject commit b735ba490fa9f43e1d14e356609a85f39e843259 diff --git a/qtdoc b/qtdoc index a2c79613..d0d65c14 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a2c7961370f04e900ff9fff0e6692acfd1b72f9f +Subproject commit d0d65c146d79b49473a1270130dd090c80bb1bca diff --git a/qtlocation b/qtlocation index 6915abd4..f915542b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6915abd48a911a51b0625688ba70009b919f7882 +Subproject commit f915542ba38d830e3ffdf409bea55f46832421f3 diff --git a/qtmultimedia b/qtmultimedia index 2099a8c3..10354f41 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2099a8c3c77eea56b95a60e12f265b4eb1d8913d +Subproject commit 10354f4127cc569535f28e7f758b58c5bd18bcd6 diff --git a/qtqa b/qtqa index 28f95fde..6cf76641 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 28f95fde38e71e79872719822ff9f35e6d9dbc04 +Subproject commit 6cf766415b2714c896379a4c61b8bebe01d651b0 diff --git a/qtquick1 b/qtquick1 index 30405c50..c4b7fbcc 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 30405c50a521146f2dda49916f160ab722316a82 +Subproject commit c4b7fbccc110f271746cca58aed55dc2c0dfb7db diff --git a/qtquickcontrols b/qtquickcontrols index d04eb329..da508d99 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d04eb32908cfa7c6692bacfc292494b85ce3cd8a +Subproject commit da508d99d50d27bd234c85dae5f069a1eb26103d diff --git a/qtsensors b/qtsensors index 19e41c59..3ad67158 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 19e41c59771bda6e64432a6e007afe76361ae3ef +Subproject commit 3ad671581149d22eaa2f1562f32cea754bfb1087 diff --git a/qtserialport b/qtserialport index 53afe731..687dfa93 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 53afe73154c7c00b54cd280fa3d6c9127a2bc84b +Subproject commit 687dfa9312c1ef4894c32a1966b8ac968110b71e diff --git a/qtsvg b/qtsvg index b725b5fd..7c250d86 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b725b5fd9158d95f3693a06425924271ee4b4239 +Subproject commit 7c250d86ae50109aeb029ee484c24dfcc5cdfc4b diff --git a/qttools b/qttools index 0b356c32..15e2d80c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0b356c32ab517bad0e7801ceab1ea9d99a9d259e +Subproject commit 15e2d80cebcc2f9c53ad762d594f195bd09d493d diff --git a/qtwebengine b/qtwebengine index d3905d85..d4ab9273 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d3905d85925a950ca32aa78eead6db7228be1330 +Subproject commit d4ab9273dd1c61e1638f5b0376e65f7c5375ad93 diff --git a/qtwebkit-examples b/qtwebkit-examples index e96fa2b3..92fde6d3 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit e96fa2b3bad65ebe3415920cd7820966d89f2d6c +Subproject commit 92fde6d30180b261bfbd6c83429e88dbae4752f5 diff --git a/qtwebsockets b/qtwebsockets index bf0a3b6c..2348cac4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bf0a3b6c6b0dc35420655e6325dc3529da7d40b1 +Subproject commit 2348cac4fa6baab447a21286ac8680ad6829008f diff --git a/qtwinextras b/qtwinextras index f7b3d9c5..08857826 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f7b3d9c5877c39a0d54b7497c1d5dd7d3e7f37f3 +Subproject commit 0885782658a52d85e704a655f9039e643f25b6e4 diff --git a/qtx11extras b/qtx11extras index fbbd39ea..e6a813c7 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit fbbd39ea7b005e70e32c6ed284c0779ce9958247 +Subproject commit e6a813c7869fb3677b15b3907bd6647b5f80bd5e diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e53b39e..224b22e8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e53b39e6a2dda3387dda9a810c4bfed8752ad6d +Subproject commit 224b22e8c923e14420fd176bdc09e2d17d65f7c7