lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,050 Commits 118 Branches 270 Tags
e77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Commit Graph

1050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
e77fe47fce Updated submodules. 
Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-07-11 09:46:26 +00:00
Qt Submodule Update Bot
22c7d89fd9 Updated submodules. 
Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-30 18:19:55 +00:00
Kai Koehne
345e4356b7 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>
 2015-06-30 18:19:33 +00:00
Qt Submodule Update Bot
deafacc193 Updated submodules. 
Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-29 19:59:42 +00:00
Aaron McCarthy
fb5e3cc2d3 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>
 2015-06-26 06:46:09 +00:00
Qt Submodule Update Bot
bc862a8b12 Updated submodules. 
Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-26 05:37:28 +00:00
Qt Submodule Update Bot
e231e8be72 Updated submodules. 
Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-25 19:31:02 +00:00
Qt Submodule Update Bot
cc425a6784 Updated submodules. 
Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-24 07:00:47 +00:00
Qt Submodule Update Bot
88f32b10ee Updated submodules. 
Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-20 06:59:07 +00:00
Qt Submodule Update Bot
bc644efc00 Updated submodules. 
Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-17 12:04:07 +00:00
Qt Submodule Update Bot
a820c1611a Updated submodules. 
Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-07 05:40:06 +00:00
Michael Olbrich
935ffc2e5f 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>
 2015-06-05 19:05:46 +00:00
Qt Submodule Update Bot
5384ff79ef Updated submodules. 
Change-Id: I4fc367abe95ee78166067047d0f229bba9991956
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-04 20:03:11 +00:00
Qt Submodule Update Bot
4fc367abe9 Updated submodules. 
Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-31 06:59:17 +00:00
Qt Submodule Update Bot
88af8ac707 Updated submodules. 
Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-29 19:19:51 +00:00
Andrew Knight
ea14bacdc8 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>
 2015-05-27 16:13:29 +00:00
Qt Submodule Update Bot
57641bf25f Updated submodules. 
Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-27 16:13:26 +00:00
Qt Submodule Update Bot
31ee12ede4 Updated submodules. 
Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-19 09:48:15 +00:00
Qt Submodule Update Bot
833cf03a1e Updated submodules. 
Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-15 10:34:29 +00:00
Qt Submodule Update Bot
619984c9c8 Updated submodules. 
Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-09 16:06:13 +00:00
Qt Submodule Update Bot
56a80384b1 Updated submodules. 
Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-07 05:58:41 +00:00
Qt Submodule Update Bot
359f9925da Updated submodules. 
Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.5.0-beta1 		2015-05-03 07:57:46 +00:00
Qt Submodule Update Bot
c38d3b26e9 Updated submodules. 
Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-29 17:37:59 +00:00
Qt Submodule Update Bot
0d362ee556 Updated submodules. 
Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-28 04:35:07 +00:00
Qt Submodule Update Bot
976ffd988e Updated submodules. 
Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-14 04:20:21 +00:00
Qt Submodule Update Bot
1d66817cbc Updated submodules. 
Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-09 04:45:52 +00:00
Qt Submodule Update Bot
95930e9875 Updated submodules. 
Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-07 10:28:48 +00:00
Caroline Chao
697291ef10 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>
 2015-04-01 04:27:17 +00:00
Andrew Knight
98c4f1bbeb 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>
 2015-04-01 04:27:00 +00:00
Qt Submodule Update Bot
8ad3df2f5d Updated submodules. 
Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-04-01 04:26:47 +00:00
Qt Submodule Update Bot
e0b703ccb7 Updated submodules. 
Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-03-26 05:26:21 +00:00
Qt Submodule Update Bot
cdc3bf5bd9 Updated submodules. 
Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-03-20 20:52:06 +00:00
Qt Submodule Update Bot
43a2c55cde Updated submodules. 
Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-03-18 12:41:19 +00:00
Qt Submodule Update Bot
1b9965bf16 Updated submodules. 
Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.5.0-alpha1 		2015-03-13 18:29:44 +00:00
Jani Heikkinen
cb28f324e5 Added Qt3D as a part of qt5.git default repositories 
Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
 2015-03-13 18:29:34 +00:00
Oswald Buddenhagen
a5edc40176 Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-09 12:28:37 +01:00
Oswald Buddenhagen
ac6168c0cb 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
 2015-03-04 12:23:13 +01:00
Oswald Buddenhagen
4b962aee82 Merge remote-tracking branch 'origin/dev' into 5.5 
Conflicts:
	.gitmodules

Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf
 2015-03-03 11:21:03 +01:00
Jani Heikkinen
c2d151522b 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>
 2015-02-25 03:23:07 +00:00
Qt Submodule Update Bot
9a9865ce28 Updated submodules. 
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-25 03:22:48 +00:00
Alex Blasche
811a77a53c Add qtdeclarative as optional dependency for qtlocation 
Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-02-17 06:42:55 +00:00
Oswald Buddenhagen
f46b8dc760 Merge remote-tracking branch 'origin/5.5' into dev 
Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147
 2015-02-16 16:24:40 +01:00
Oswald Buddenhagen
f900f38f71 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
 2015-02-16 16:19:22 +01:00
Oswald Buddenhagen
122d4551b5 Adjust submodule branches 
Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93
 2015-02-16 15:50:02 +01:00
Qt Submodule Update Bot
be35b9f9af Updated submodules. 
Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-14 11:18:41 +00:00
Qt Submodule Update Bot
2c39898934 Updated submodules. 
Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-02-13 15:11:39 +00:00
Pasi Keranen
682766b9fa 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>
 2015-02-13 15:11:19 +00:00
Pierre Rossi
3e40bbd114 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>
 2015-02-11 21:59:19 +00:00
Qt Submodule Update Bot
dc93c0d4d7 Updated submodules. 
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-02-06 06:24:23 +00:00
Oswald Buddenhagen
34c7caab3f don't fetch again when updating submodules 
we already did it a moment ago.

this should affect only the --remote case, but there is no harm in
always specifying it.

Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-02-06 06:24:10 +00:00