mirror/qt/qt5.git
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 12 Oct 2016 22:01:04 +0000 (01:01 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 10 Oct 2016 22:00:58 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 8 Oct 2016 22:00:39 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 7 Oct 2016 17:10:22 +0000 (20:10 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoMerge remote-tracking branch 'origin/5.6.2' into 5.6
Liang Qi [Fri, 30 Sep 2016 12:36:23 +0000 (14:36 +0200)]
Merge remote-tracking branch 'origin/5.6.2' into 5.6

Conflicts:
.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d

4 years agoPython to provisioning for Windows
Heikki Halmet [Fri, 9 Sep 2016 10:12:51 +0000 (13:12 +0300)]
Python to provisioning for Windows

Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.

Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 26 Sep 2016 22:00:49 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6.2' in qt5 5.6.2 v5.6.2
Qt Submodule Update Bot [Sun, 25 Sep 2016 09:17:01 +0000 (12:17 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 24 Sep 2016 22:00:49 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 23 Sep 2016 20:33:36 +0000 (23:33 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6.2' in qt5
Qt Submodule Update Bot [Fri, 23 Sep 2016 05:10:38 +0000 (08:10 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 17 Sep 2016 20:51:23 +0000 (23:51 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6.2' in qt5
Qt Submodule Update Bot [Fri, 16 Sep 2016 06:53:09 +0000 (09:53 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 12 Sep 2016 22:00:57 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoAdd Qt Android Extras as dependency for Qt Purchasing
Eskil Abrahamsen Blomfeldt [Tue, 13 Sep 2016 10:19:30 +0000 (12:19 +0200)]
Add Qt Android Extras as dependency for Qt Purchasing

Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
4 years agoAndroid sdk and ndk to provisioning for qt5.6
Heikki Halmet [Fri, 2 Sep 2016 12:44:52 +0000 (15:44 +0300)]
Android sdk and ndk to provisioning for qt5.6

Install latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.
Build-tools version 23.0.3 is the latest usable version
for Red Hat 6. Newer version of build-tools, version 24.x.x,
requires GLIBC_2.14, which is not available in Red Hat 6.

Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 5 Sep 2016 22:00:58 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6.2' in qt5
Qt Submodule Update Bot [Mon, 5 Sep 2016 10:08:22 +0000 (13:08 +0300)]
Update submodules on '5.6.2' in qt5

Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sat, 3 Sep 2016 22:00:45 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 1 Sep 2016 03:59:28 +0000 (06:59 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Sun, 28 Aug 2016 22:01:02 +0000 (01:01 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoAdjust submodule branches
Oswald Buddenhagen [Wed, 24 Aug 2016 09:52:19 +0000 (11:52 +0200)]
Adjust submodule branches

Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f

4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 22 Aug 2016 10:40:02 +0000 (12:40 +0200)]
Update submodules on '5.6' in qt5

Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Mon, 15 Aug 2016 22:01:01 +0000 (01:01 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 12 Aug 2016 22:00:58 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I4821c386e318139e13ad228983c43c1b1d978494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Wed, 10 Aug 2016 06:07:34 +0000 (09:07 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Thu, 4 Aug 2016 22:00:54 +0000 (01:00 +0300)]
Update submodules on '5.6' in qt5

Change-Id: I32152358542e406f773d106abba25ee5609c6469
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoFix Coin provisioning in RHEL 6 regarding sslclientkey values
Tony Sarajärvi [Tue, 2 Aug 2016 20:17:10 +0000 (23:17 +0300)]
Fix Coin provisioning in RHEL 6 regarding sslclientkey values

There was a bug in RHELs subscription manager that caused yum
not to work by fetching incorrect data into the sslclientkey repository
parameter value.
This provisioning script fetches new data for the repository and thus
fixes yum. Naturally by not having a template where a bad repository
exists, this script would be obsolete. Also, as this needs to be run
before any other scripts using yum, prefixes were added to the scripts.

Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
4 years agoUpdate submodules on '5.6' in qt5
Qt Submodule Update Bot [Fri, 29 Jul 2016 14:32:07 +0000 (17:32 +0300)]
Update submodules on '5.6' in qt5

Change-Id: Ie6bd9ea82d5e67fee7645dccd9b07ceac5755582
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoUpdated submodules
Qt Submodule Update Bot [Mon, 4 Jul 2016 22:00:48 +0000 (01:00 +0300)]
Updated submodules

Change-Id: Ia80e4d39f9772e32952685008380cc348f481c6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules
Qt Submodule Update Bot [Sun, 3 Jul 2016 22:00:45 +0000 (01:00 +0300)]
Updated submodules

Change-Id: I5443b0f4d97cfc076e3a642ae78770b38661e983
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules
Qt Submodule Update Bot [Thu, 30 Jun 2016 22:00:42 +0000 (01:00 +0300)]
Updated submodules

Change-Id: I48fca93fd045323752c79abd2710e9307ea85b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules
Qt Submodule Update Bot [Wed, 29 Jun 2016 22:00:48 +0000 (01:00 +0300)]
Updated submodules

Change-Id: I23f310f80837c73fee1fff2618e1253c6b80b74b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 28 Jun 2016 22:00:47 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I5a2524a408eaf6f808c0e1242583e83bf01b42b0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 24 Jun 2016 22:01:01 +0000 (01:01 +0300)]
Updated submodules.

Change-Id: I5a780a47ccfcea17e64eda0ed922ca57079ea0ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 23 Jun 2016 12:02:15 +0000 (15:02 +0300)]
Updated submodules.

Change-Id: I67cbc0f3327aeaf3c84e2eb52432a362f0e7c64a
Reviewed-by: Liang Qi <liang.qi@qt.io>
4 years agoExpand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
Sze Howe Koh [Wed, 15 Jun 2016 00:16:40 +0000 (08:16 +0800)]
Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"

See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771

Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 19 Jun 2016 22:00:54 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 17 Jun 2016 22:00:48 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I3d25d26bebe88a542f794c29bcda413302432874
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 16 Jun 2016 22:00:50 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoClean up Windows provisioning scripts
Frederik Gladhorn [Wed, 15 Jun 2016 16:24:18 +0000 (18:24 +0200)]
Clean up Windows provisioning scripts

The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.

Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 15 Jun 2016 22:01:49 +0000 (01:01 +0300)]
Updated submodules.

Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoREADME: Do not take deprecated modules as an example
Kai Koehne [Tue, 14 Jun 2016 07:55:03 +0000 (09:55 +0200)]
README: Do not take deprecated modules as an example

Task-number: QTBUG-54084
Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
4 years agoREADME: Remove platform specific build requirements
Kai Koehne [Tue, 14 Jun 2016 07:47:10 +0000 (09:47 +0200)]
README: Remove platform specific build requirements

The list is not up to date (e.g. ICU is not required on Windows anymore),
and woefully incomplete. Better just link to the wiki/documentation.

Task-number: QTBUG-54084
Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 13 Jun 2016 22:00:41 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 11 Jun 2016 22:00:40 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 4 Jun 2016 22:00:46 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoOSX: Switch crash reporting to server mode.
Erik Verbruggen [Tue, 31 May 2016 12:14:59 +0000 (14:14 +0200)]
OSX: Switch crash reporting to server mode.

Meaning: to unattended use, so no crash dialogs will pop up. In a later
change we can suppress QTest from generating stack traces when this
setting is *not* in server mode (meaning: the OS will take care of the
stack traces).

Change-Id: Idee9311f866228cd35ecb07889f1c19424981221
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
4 years agoExport CI_JOM_PATH variable on all templates with jom
Jędrzej Nowacki [Thu, 26 May 2016 12:29:30 +0000 (14:29 +0200)]
Export CI_JOM_PATH variable on all templates with jom

That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
4 years agoExport CI_ICU_PATH variables on all windows templates
Jędrzej Nowacki [Thu, 26 May 2016 12:40:35 +0000 (14:40 +0200)]
Export CI_ICU_PATH variables on all windows templates

That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
4 years agoCoin provisioning: overwrite files while unzipping
Jędrzej Nowacki [Fri, 27 May 2016 13:07:53 +0000 (15:07 +0200)]
Coin provisioning: overwrite files while unzipping

Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 27 May 2016 22:00:42 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoFix git_install_hooks for relative gitdir
Ilia Kirianovskii [Thu, 12 May 2016 07:04:57 +0000 (10:04 +0300)]
Fix git_install_hooks for relative gitdir

Previously we expected gitdir to be always absolute. This patch fixes
git_install_hooks in case of relative gitdir.

Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 20 May 2016 22:00:40 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 10 May 2016 22:00:42 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 7 May 2016 22:00:42 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agomake it actually possible to specify 'ignore' as a class
Oswald Buddenhagen [Wed, 20 Apr 2016 12:21:25 +0000 (14:21 +0200)]
make it actually possible to specify 'ignore' as a class

another thing the doc claims to be possible - also quite reasonably.

Change-Id: I2220245b10f02a778345b6549e345b2486630ffd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agomake it actually possible to exclude classes
Oswald Buddenhagen [Wed, 20 Apr 2016 12:19:40 +0000 (14:19 +0200)]
make it actually possible to exclude classes

the doc - quite reasonably - claims that it is possible.

Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 4 May 2016 22:00:43 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoAdd script that install icu on RHEL 6.6
Jędrzej Nowacki [Wed, 27 Apr 2016 13:21:34 +0000 (15:21 +0200)]
Add script that install icu on RHEL 6.6

That is translation from coin-setup golang code to sh script

Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
4 years agoAdd script to install jom through powershell
Frederik Gladhorn [Wed, 27 Apr 2016 12:52:15 +0000 (14:52 +0200)]
Add script to install jom through powershell

Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
4 years agoAdd coin provisioning directory
Frederik Gladhorn [Mon, 25 Apr 2016 13:00:02 +0000 (15:00 +0200)]
Add coin provisioning directory

Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Sun, 24 Apr 2016 22:00:45 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 20 Apr 2016 22:00:42 +0000 (01:00 +0300)]
Updated submodules.

Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 4 Apr 2016 06:52:45 +0000 (09:52 +0300)]
Updated submodules.

Change-Id: I983429d487f7667c36553d24037639abee660b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoMerge remote-tracking branch 'origin/5.6.0' into 5.6
Liang Qi [Thu, 31 Mar 2016 07:53:10 +0000 (09:53 +0200)]
Merge remote-tracking branch 'origin/5.6.0' into 5.6

Conflicts:
.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580

4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 25 Mar 2016 06:54:55 +0000 (07:54 +0100)]
Updated submodules.

Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdate .gitmodules for automated release src package creation 5.6.0 v5.6.0
Iikka Eklund [Fri, 4 Mar 2016 08:11:25 +0000 (10:11 +0200)]
Update .gitmodules for automated release src package creation

Introduce new "deprecated" value for status attribute.

We have two flavors of big source packages we need to produce:

qt-everywhere-* which needs to include:

 - essential
 - addon
 - preview
 - deprecated (e.g. qtscript and qtenginio for Qt5.6 release)

Installer only specific source package:

 - essential
 - addon

 The rest (deprecated, preview, ...) need to be shown as split src
 packages in the installer.

The above leads to the following changes:

qtscript: addon -> deprecated

 Needs to be part of big src packages but excluded from installer
 specific big source package.

qtenginio: obsolete -> deprecated

 We can't exclude this module from qt-everywhere src packages.

qtwayland: preview -> addon

 Needs to be part of installer specific big src package and the
 module status is not preview anymore.

Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 3 Mar 2016 21:37:35 +0000 (23:37 +0200)]
Updated submodules.

Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 2 Mar 2016 13:30:34 +0000 (14:30 +0100)]
Updated submodules.

Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 26 Feb 2016 12:55:04 +0000 (14:55 +0200)]
Updated submodules.

Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoUpdated submodules. v5.6.0-rc1
Qt Submodule Update Bot [Thu, 18 Feb 2016 15:02:57 +0000 (17:02 +0200)]
Updated submodules.

Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agorework hook installation
Oswald Buddenhagen [Mon, 8 Feb 2016 16:54:06 +0000 (17:54 +0100)]
rework hook installation

the primary purpose of this change is making it work with new-style
submodules (1.7+) and git-worktree (2.5+). this means resolving '.git'
and 'commondir' files.

we avoid calling git commands, because a) it's slow on windows, b) some
of them are unavailable in older git versions and it's tedious to deal
with that and c) their output is not necessarily optimal (not always
absolute paths).

we also don't use relative paths for the hook locations any more, as
that's too tedious to deal with.

Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 17 Feb 2016 11:57:12 +0000 (12:57 +0100)]
Updated submodules.

Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 16 Feb 2016 09:15:41 +0000 (11:15 +0200)]
Updated submodules.

Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 12 Feb 2016 23:42:41 +0000 (01:42 +0200)]
Updated submodules.

Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
4 years agoMerge remote-tracking branch 'origin/5.6.0' into 5.6
Oswald Buddenhagen [Fri, 12 Feb 2016 10:18:27 +0000 (11:18 +0100)]
Merge remote-tracking branch 'origin/5.6.0' into 5.6

Conflicts:
.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03

4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 10 Feb 2016 19:24:55 +0000 (21:24 +0200)]
Updated submodules.

Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
4 years agofix branches of some modules
Oswald Buddenhagen [Wed, 27 Jan 2016 15:03:59 +0000 (16:03 +0100)]
fix branches of some modules

all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.

Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 3 Feb 2016 16:16:42 +0000 (17:16 +0100)]
Updated submodules.

Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoproperly complain about invalid entries in --module-subset
Oswald Buddenhagen [Wed, 27 Jan 2016 14:42:46 +0000 (15:42 +0100)]
properly complain about invalid entries in --module-subset

Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoreplace 'initrepo' with more fine-grained 'status'
Oswald Buddenhagen [Wed, 27 Jan 2016 13:45:35 +0000 (14:45 +0100)]
replace 'initrepo' with more fine-grained 'status'

instead of a simple bool, we now have five states: preview, active,
addon, obsolete, and ignore (the default). the default includes the
first three.

the CI system is expected to use --module-subset=all,-ignore to include
everything that is expected to build (in some configurations).

Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoAdjust submodule branches
Oswald Buddenhagen [Mon, 25 Jan 2016 10:38:54 +0000 (11:38 +0100)]
Adjust submodule branches

Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048

4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 22 Jan 2016 09:25:06 +0000 (10:25 +0100)]
Updated submodules.

Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 21 Jan 2016 13:34:26 +0000 (14:34 +0100)]
Updated submodules.

Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agomove module dependencies from qt.pro to .gitmodules
Oswald Buddenhagen [Fri, 18 Dec 2015 17:50:54 +0000 (18:50 +0100)]
move module dependencies from qt.pro to .gitmodules

this removes the last redundant module list.

the module build order which is not determined by dependencies is pretty
random now. this is avoided for a few heavy and "less relevant" modules
by setting a priority to built them as late as possible.

Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 19 Jan 2016 04:36:00 +0000 (05:36 +0100)]
Updated submodules.

Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 18 Jan 2016 14:00:41 +0000 (15:00 +0100)]
Updated submodules.

Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 13 Jan 2016 20:03:22 +0000 (21:03 +0100)]
Updated submodules.

Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 11 Jan 2016 19:44:09 +0000 (20:44 +0100)]
Updated submodules.

Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 4 Jan 2016 13:06:46 +0000 (15:06 +0200)]
Updated submodules.

Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agodon't use POD, to restore msysgit perl compatibility
Oswald Buddenhagen [Mon, 17 Aug 2015 15:12:30 +0000 (17:12 +0200)]
don't use POD, to restore msysgit perl compatibility

Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agodon't use GetOptionsFromArray, to restore msysgit perl compatibility
Oswald Buddenhagen [Mon, 17 Aug 2015 15:03:39 +0000 (17:03 +0200)]
don't use GetOptionsFromArray, to restore msysgit perl compatibility

Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agomake qtandroidextras a regular optional dependency of qtconnectivity
Oswald Buddenhagen [Fri, 18 Dec 2015 16:01:12 +0000 (17:01 +0100)]
make qtandroidextras a regular optional dependency of qtconnectivity

we want to move to a purely declarative way to declare submodules, so
the conditional has to go.

instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.

Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Wed, 23 Dec 2015 19:58:15 +0000 (20:58 +0100)]
Updated submodules.

Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Simon Hausmann [Thu, 17 Dec 2015 06:09:46 +0000 (07:09 +0100)]
Updated submodules.

Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Simon Hausmann [Wed, 16 Dec 2015 08:37:15 +0000 (09:37 +0100)]
Updated submodules.

Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules. v5.6.0-beta1
Simon Hausmann [Tue, 15 Dec 2015 05:04:04 +0000 (06:04 +0100)]
Updated submodules.

Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Simon Hausmann [Wed, 9 Dec 2015 15:06:10 +0000 (16:06 +0100)]
Updated submodules.

Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoUpdated submodules.
Antti Kokko [Mon, 7 Dec 2015 13:46:21 +0000 (15:46 +0200)]
Updated submodules.

Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>