mirror/qt/qt5.git
4 years agoAdd qtwebview as submodule
Frederik Gladhorn [Wed, 19 Aug 2015 07:02:18 +0000 (09:02 +0200)]
Add qtwebview as submodule

Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
4 years agoRemoved QtWebkit and QtWebkit-Examples from qt5.git
Jani Heikkinen [Fri, 21 Aug 2015 11:31:55 +0000 (14:31 +0300)]
Removed QtWebkit and QtWebkit-Examples from qt5.git

QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now
be removed from qt5.git in Qt5.6 release

Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
4 years agoFix QtEnginio branch
Simon Hausmann [Tue, 1 Sep 2015 16:01:46 +0000 (18:01 +0200)]
Fix QtEnginio branch

The 1.3 branch does not exist anymore, let's use 5.6

Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoUpdated submodules.
Simon Hausmann [Thu, 3 Sep 2015 12:48:42 +0000 (14:48 +0200)]
Updated submodules.

Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
4 years agoRemove quick1 from default checkout
Jani Heikkinen [Fri, 14 Aug 2015 04:41:41 +0000 (07:41 +0300)]
Remove quick1 from default checkout

QtQuick1 was deprecated in Qt 5.5 and will now be removed from
default modules in qt5.git

Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
4 years agoMerge remote-tracking branch 'origin/5.5' into 5.6
Liang Qi [Mon, 24 Aug 2015 14:18:23 +0000 (16:18 +0200)]
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50

4 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 21 Aug 2015 03:33:14 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 17 Aug 2015 19:34:13 +0000 (22:34 +0300)]
Updated submodules.

Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agoAdd the GPLv3 license text
Thiago Macieira [Wed, 8 Jul 2015 00:35:11 +0000 (17:35 -0700)]
Add the GPLv3 license text

LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
4 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Fri, 14 Aug 2015 11:38:53 +0000 (13:38 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68

4 years agoMerge remote-tracking branch 'origin/5.4.2' into 5.4 5.4
Oswald Buddenhagen [Fri, 14 Aug 2015 11:34:32 +0000 (13:34 +0200)]
Merge remote-tracking branch 'origin/5.4.2' into 5.4

Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19

4 years agoAdd qtgraphicaleffects as an optional dependency for qtquickcontrols.
Mitch Curtis [Thu, 13 Aug 2015 08:45:22 +0000 (10:45 +0200)]
Add qtgraphicaleffects as an optional dependency for qtquickcontrols.

This is a prerequisite to making qtgraphicaleffects a dependency in
qtquickcontrols' sync.profile.

Task-number: QTBUG-46393
Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
4 years agognuwin32: Remove old versions of bison/flex from the distribution
Andrew Knight [Sun, 2 Aug 2015 07:03:20 +0000 (10:03 +0300)]
gnuwin32: Remove old versions of bison/flex from the distribution

The win_flex/win_bison tools are already in the repository and working
with all projects, so the GnuWin32 versions can be removed and the
winflexbison versions can take their place.

Task-number: QTBUG-46852
Change-Id: I41bc541adab834ff83912d7a4f076a87fc174601
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
4 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 13 Aug 2015 03:33:38 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
4 years agofix qtcanvas3d submodule reference
Oswald Buddenhagen [Wed, 12 Aug 2015 14:31:03 +0000 (16:31 +0200)]
fix qtcanvas3d submodule reference

Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620

5 years agoAdjust submodule branches
Oswald Buddenhagen [Mon, 10 Aug 2015 14:53:39 +0000 (16:53 +0200)]
Adjust submodule branches

Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d

5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 7 Aug 2015 03:33:37 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 13 Jul 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 10 Jul 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 11 Jul 2015 02:33:44 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Tue, 30 Jun 2015 11:34:07 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoREADME: Replace qt-project.org with qt.io
Kai Koehne [Tue, 30 Jun 2015 12:59:11 +0000 (14:59 +0200)]
README: Replace qt-project.org with qt.io

Change-Id: Iacc4dc8f28ce2c0bb1d761834d0f90b444f47327
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 29 Jun 2015 19:33:57 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoAdd qtquickcontrols as an optional dependency to qtlocation module
Aaron McCarthy [Wed, 24 Jun 2015 12:07:15 +0000 (22:07 +1000)]
Add qtquickcontrols as an optional dependency to qtlocation module

With the correct modules checked out 'make module-qtlocation' will build
everything necessary to run the examples.

Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 26 Jun 2015 03:33:33 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 25 Jun 2015 10:33:48 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 25 Jun 2015 11:34:05 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5
Qt Submodule Update Bot [Wed, 24 Jun 2015 03:33:50 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev
Qt Submodule Update Bot [Tue, 23 Jun 2015 18:34:15 +0000 (21:34 +0300)]
Updated submodules.

Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434886384 43/114843/2
Qt Submodule Update Bot [Sun, 21 Jun 2015 02:33:31 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434820518 60/114760/7
Qt Submodule Update Bot [Sat, 20 Jun 2015 10:33:21 +0000 (13:33 +0300)]
Updated submodules.

Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1434784502 77/114577/5
Qt Submodule Update Bot [Sat, 20 Jun 2015 03:33:47 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1434740765 75/113375/12 5.4
Qt Submodule Update Bot [Fri, 19 Jun 2015 18:18:58 +0000 (21:18 +0300)]
Updated submodules.

Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1434604595 23/114023/19
Qt Submodule Update Bot [Thu, 18 Jun 2015 02:33:10 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1434543958 50/113850/23
Qt Submodule Update Bot [Wed, 17 Jun 2015 11:35:10 +0000 (14:35 +0300)]
Updated submodules.

Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. dev_1433826766 39/110939/89
Qt Submodule Update Bot [Tue, 9 Jun 2015 02:33:05 +0000 (05:33 +0300)]
Updated submodules.

Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433655697 14/113814/5
Qt Submodule Update Bot [Sun, 7 Jun 2015 03:33:19 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoqtdeclarative is an optional dependency for qtwebkit 5.5_1433533840 05/112205/4
Michael Olbrich [Tue, 12 May 2015 10:45:10 +0000 (12:45 +0200)]
qtdeclarative is an optional dependency for qtwebkit

This way qtwebkit can be built when qtdeclarative is disabled. This is
especially useful for targets without OpenGL.

Also add qtxmlpatterns to the optional dependencies. It was an indirect
dependency before via qtdeclarative.

Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433451874 28/113428/11
Qt Submodule Update Bot [Thu, 4 Jun 2015 19:33:10 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I4fc367abe95ee78166067047d0f229bba9991956
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1433058586 48/113348/4
Qt Submodule Update Bot [Sat, 30 May 2015 19:33:04 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1433056615 12/112412/19
Qt Submodule Update Bot [Sat, 30 May 2015 18:18:40 +0000 (21:18 +0300)]
Updated submodules.

Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1432927283 90/113190/6
Qt Submodule Update Bot [Fri, 29 May 2015 11:34:14 +0000 (14:34 +0300)]
Updated submodules.

Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge branch '5.4' into 5.4.2 5.4.2 5.4.2 v5.4.2
Oswald Buddenhagen [Fri, 29 May 2015 18:12:13 +0000 (20:12 +0200)]
Merge branch '5.4' into 5.4.2

Change-Id: I33d967b5f668c672a55ad93ac314340453850521

5 years agoMerge tag 'v5.4.1' into 5.4
Oswald Buddenhagen [Fri, 29 May 2015 13:53:05 +0000 (15:53 +0200)]
Merge tag 'v5.4.1' into 5.4

Qt 5.4.1 Release

5 years agoMerge tag 'v5.4.0' into 5.4
Oswald Buddenhagen [Fri, 29 May 2015 13:52:28 +0000 (15:52 +0200)]
Merge tag 'v5.4.0' into 5.4

Qt 5.4.0 Release

5 years agoUpdated submodules. 5.4.2_1432894183 56/113256/2
Qt Submodule Update Bot [Fri, 29 May 2015 04:26:03 +0000 (07:26 +0300)]
Updated submodules.

Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1432813057 69/112969/7
Qt Submodule Update Bot [Thu, 28 May 2015 11:04:52 +0000 (14:04 +0300)]
Updated submodules.

Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoSet win_bison/win_flex executable 5.5_1432745790 81/112981/2
Andrew Knight [Sun, 24 May 2015 19:57:18 +0000 (22:57 +0300)]
Set win_bison/win_flex executable

This fixes failed execution when the Qt sources are exported to
Windows over a network share or attempted to be executed on a Linux
system using binfmt.

Change-Id: I00b1073e516d2441498a39cc13e4295484e1ef9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
5 years agoUpdated submodules. 57/112657/20
Qt Submodule Update Bot [Wed, 27 May 2015 03:33:04 +0000 (06:33 +0300)]
Updated submodules.

Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1432365194 99/112699/6
Qt Submodule Update Bot [Fri, 22 May 2015 18:17:49 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1432030076 30/112430/10
Qt Submodule Update Bot [Tue, 19 May 2015 09:37:18 +0000 (12:37 +0300)]
Updated submodules.

Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431752402 32/112332/4
Qt Submodule Update Bot [Fri, 15 May 2015 18:17:21 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1431687718 23/112023/15
Qt Submodule Update Bot [Thu, 14 May 2015 19:33:30 +0000 (22:33 +0300)]
Updated submodules.

Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1431616780 71/110571/25
Qt Submodule Update Bot [Thu, 14 May 2015 02:19:30 +0000 (05:19 +0300)]
Updated submodules.

Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431532691 35/112235/4
Qt Submodule Update Bot [Wed, 13 May 2015 12:17:59 +0000 (15:17 +0300)]
Updated submodules.

Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1431187664 52/111952/6
Qt Submodule Update Bot [Sat, 9 May 2015 11:33:11 +0000 (14:33 +0300)]
Updated submodules.

Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1431174236 02/111702/5
Qt Submodule Update Bot [Fri, 8 May 2015 18:17:33 +0000 (21:17 +0300)]
Updated submodules.

Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430978412 41/111641/10
Qt Submodule Update Bot [Thu, 7 May 2015 03:32:56 +0000 (06:32 +0300)]
Updated submodules.

Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430640288 07/111507/8 v5.5.0-beta1
Qt Submodule Update Bot [Sat, 2 May 2015 19:32:49 +0000 (22:32 +0300)]
Updated submodules.

Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1430639986 05/111505/5
Qt Submodule Update Bot [Sat, 2 May 2015 02:18:06 +0000 (05:18 +0300)]
Updated submodules.

Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430330389 77/111377/5
Qt Submodule Update Bot [Wed, 29 Apr 2015 11:35:30 +0000 (14:35 +0300)]
Updated submodules.

Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.2_1430218799 49/110849/11
Qt Submodule Update Bot [Tue, 28 Apr 2015 09:51:37 +0000 (12:51 +0300)]
Updated submodules.

Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1430196724 80/110380/33
Qt Submodule Update Bot [Tue, 28 Apr 2015 03:34:10 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev dev_1429627894 12/110912/1 12/110912/2
Frederik Gladhorn [Tue, 21 Apr 2015 14:26:04 +0000 (16:26 +0200)]
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
qt3d
qtactiveqt
qtandroidextras
qtbase
qtcanvas3d
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebengine
qtwebkit
qtwebkit-examples
qtwebsockets
qtwinextras
qtxmlpatterns

Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c

5 years agoReplace old qt-project.org wiki with wiki.qt.io 5.4_1429177412 72/108572/2
Sergio Ahumada [Sat, 14 Mar 2015 14:36:29 +0000 (15:36 +0100)]
Replace old qt-project.org wiki with wiki.qt.io

Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4_1429089540 02/110102/10
Qt Submodule Update Bot [Wed, 15 Apr 2015 02:19:15 +0000 (05:19 +0300)]
Updated submodules.

Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428985529 67/110067/11
Qt Submodule Update Bot [Tue, 14 Apr 2015 03:34:21 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdjust submodule branches
Oswald Buddenhagen [Fri, 10 Apr 2015 10:10:34 +0000 (12:10 +0200)]
Adjust submodule branches

Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68

5 years agoUpdated submodules. 5.4_1428574025 65/106265/91
Qt Submodule Update Bot [Thu, 9 Apr 2015 02:19:33 +0000 (05:19 +0300)]
Updated submodules.

Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428557107 45/109945/6
Qt Submodule Update Bot [Thu, 9 Apr 2015 03:34:12 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1428402619 47/109747/13
Qt Submodule Update Bot [Tue, 7 Apr 2015 10:28:06 +0000 (13:28 +0300)]
Updated submodules.

Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoRemove specific rules for QtWayland 5.5_1427865157 15/109215/2
Caroline Chao [Mon, 23 Mar 2015 12:59:07 +0000 (13:59 +0100)]
Remove specific rules for QtWayland

Let the module handle the platforms by itself.
See QtWayland change: 0448026b4ee75

Change-Id: I622d17d6219e71fb0ad014442763b515e58079af
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpgrade win_flex/win_bison to 2.5.5 (bison 3.0) 68/109268/4
Andrew Knight [Thu, 26 Mar 2015 04:14:16 +0000 (06:14 +0200)]
Upgrade win_flex/win_bison to 2.5.5 (bison 3.0)

This version is required by upstream ANGLE. win_bison conveniently uses a
different executable name as the existing bison copy, avoiding conflicts.

Change-Id: I2897ce97aef6795933d3ab8b5570a8494a55523e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoUpdated submodules. 31/109431/16
Qt Submodule Update Bot [Wed, 1 Apr 2015 03:34:21 +0000 (06:34 +0300)]
Updated submodules.

Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoProspective fix for unnecessary submodule cloning dev_1427450742 40/109440/2
Simon Hausmann [Wed, 25 Mar 2015 11:17:47 +0000 (12:17 +0100)]
Prospective fix for unnecessary submodule cloning

When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites,
which is not intentional for users of Qt (and init-repository). The init-repository
script checks for the submodule "repo".update key and skips the sub module if the value
is "ignore". However according to the documentation no checkout is to be done if the value
is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript
test suite.

Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Jani Heikkinen [Fri, 27 Mar 2015 10:04:06 +0000 (10:04 +0000)]
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

5 years agoUpdated submodules. 92/106392/76
Qt Submodule Update Bot [Fri, 27 Mar 2015 10:02:51 +0000 (12:02 +0200)]
Updated submodules.

Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1427351088 40/109140/11
Qt Submodule Update Bot [Thu, 26 Mar 2015 04:34:16 +0000 (06:34 +0200)]
Updated submodules.

Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1426885101 41/108941/8
Qt Submodule Update Bot [Fri, 20 Mar 2015 20:34:16 +0000 (22:34 +0200)]
Updated submodules.

Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev 83/108983/3 83/108983/4
Oswald Buddenhagen [Fri, 20 Mar 2015 12:07:29 +0000 (13:07 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01

5 years agoUpdated submodules. 5.5_1426683179 70/108570/12
Qt Submodule Update Bot [Wed, 18 Mar 2015 12:34:05 +0000 (14:34 +0200)]
Updated submodules.

Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.5_1426271897 29/107229/35 v5.5.0-alpha1
Qt Submodule Update Bot [Thu, 12 Mar 2015 04:33:53 +0000 (06:33 +0200)]
Updated submodules.

Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdded Qt3D as a part of qt5.git default repositories 41/102241/9
Jani Heikkinen [Wed, 17 Dec 2014 12:46:05 +0000 (14:46 +0200)]
Added Qt3D as a part of qt5.git default repositories

Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
5 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Mon, 9 Mar 2015 11:28:37 +0000 (12:28 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

5 years agouse git clone --branch instead of --no-checkout 36/107736/1
Oswald Buddenhagen [Wed, 4 Mar 2015 11:03:54 +0000 (12:03 +0100)]
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

5 years agoMerge remote-tracking branch 'origin/dev' into 5.5
Oswald Buddenhagen [Tue, 3 Mar 2015 10:21:03 +0000 (11:21 +0100)]
Merge remote-tracking branch 'origin/dev' into 5.5

Conflicts:
.gitmodules

Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf

5 years agoUpdate copyright headers 5.5_1424836211 38/106438/3
Jani Heikkinen [Tue, 17 Feb 2015 10:41:59 +0000 (12:41 +0200)]
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 <tuukka.turunen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
5 years agoUpdated submodules. 46/107046/5
Qt Submodule Update Bot [Tue, 24 Feb 2015 19:24:11 +0000 (21:24 +0200)]
Updated submodules.

Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd qtdeclarative as optional dependency for qtlocation dev_1424155919 98/105698/2
Alex Blasche [Mon, 9 Feb 2015 10:40:06 +0000 (11:40 +0100)]
Add qtdeclarative as optional dependency for qtlocation

Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.1_1424120201 34/106334/3 5.4.1 5.4.1 v5.4.1
Qt Submodule Update Bot [Mon, 16 Feb 2015 19:48:27 +0000 (21:48 +0200)]
Updated submodules.

Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoMerge remote-tracking branch 'origin/5.5' into dev
Oswald Buddenhagen [Mon, 16 Feb 2015 15:24:22 +0000 (16:24 +0100)]
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147

5 years agoMerge remote-tracking branch 'origin/5.4' into 5.5
Oswald Buddenhagen [Mon, 16 Feb 2015 15:19:22 +0000 (16:19 +0100)]
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtmacextras
qtmultimedia
qtquick1
qtscript
qtsensors
qtserialport
qtsvg
qttools
qtwayland
qtwebchannel
qtwebengine
qtwebkit
qtwebsockets
qtwinextras
qtx11extras
qtxmlpatterns

Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0

5 years agoAdjust submodule branches
Oswald Buddenhagen [Mon, 16 Feb 2015 12:05:36 +0000 (13:05 +0100)]
Adjust submodule branches

Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93

5 years agoUpdated submodules. 5.4_1423914072 46/105646/18
Qt Submodule Update Bot [Sat, 14 Feb 2015 03:23:24 +0000 (05:23 +0200)]
Updated submodules.

Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.1_1423907767 07/106207/2
Qt Submodule Update Bot [Fri, 13 Feb 2015 15:23:41 +0000 (17:23 +0200)]
Updated submodules.

Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. dev_1423842851 16/104916/33
Qt Submodule Update Bot [Fri, 13 Feb 2015 15:06:12 +0000 (17:06 +0200)]
Updated submodules.

Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoAdd qtcanvas3d as submodule 77/105977/9
Pasi Keranen [Wed, 11 Feb 2015 08:04:37 +0000 (10:04 +0200)]
Add qtcanvas3d as submodule

[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick.

Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoUpdated submodules. 5.4.1_1423804531 72/105872/5
Qt Submodule Update Bot [Thu, 12 Feb 2015 00:19:17 +0000 (02:19 +0200)]
Updated submodules.

Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
5 years agoQtWebEngine: add dependency on QtWebChannel dev_1423693106 54/105854/3
Pierre Rossi [Tue, 10 Feb 2015 15:27:39 +0000 (16:27 +0100)]
QtWebEngine: add dependency on QtWebChannel

To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1

Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
5 years agoUpdated submodules. 5.4.1_1423561502 51/105651/4
Qt Submodule Update Bot [Tue, 10 Feb 2015 08:23:27 +0000 (10:23 +0200)]
Updated submodules.

Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>