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,094 Commits 118 Branches 270 Tags
b02a6596cea197bdd3d4437ee784aab9200bf1d9
Commit Graph

1094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
b02a6596ce Updated submodules. 
Change-Id: Idd1aeea722ee72249c7e1c5a85c0932b61300b7b
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-09-25 05:40:45 +00:00
Qt Submodule Update Bot
dd1aeea722 Updated submodules. 
Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-04 04:24:15 +00:00
Andrew Knight
7bbe464617 gnuwin32: remove win_bison/win_flex 
These tools are copies of bison/flex and are no longer needed.

Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
 2015-09-01 05:56:07 +00:00
Qt Submodule Update Bot
0ba6e6ce43 Updated submodules. 
Change-Id: I1497a398e34e18abb18f705b2294464840629ca1
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-09-01 05:56:00 +00:00
Qt Submodule Update Bot
1497a398e3 Updated submodules. 
Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-25 04:33:00 +00:00
Qt Submodule Update Bot
56e7af096e Updated submodules. 
Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-08-21 09:43:42 +00:00
Qt Submodule Update Bot
cf1e00c471 Updated submodules. 
Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-18 04:24:52 +00:00
Thiago Macieira
d7b8b62cb3 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>
 2015-08-14 13:39:09 +02:00
Oswald Buddenhagen
bf5c38f136 Merge remote-tracking branch 'origin/5.4' into 5.5 
Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
 2015-08-14 13:38:53 +02:00
Oswald Buddenhagen
3f2ff8b460 Merge remote-tracking branch 'origin/5.4.2' into 5.4 
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
 2015-08-14 13:34:32 +02:00
Mitch Curtis
30e19df5bf 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>
 2015-08-13 11:52:55 +00:00
Andrew Knight
3d7fe3b822 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>
 2015-08-13 04:45:21 +00:00
Qt Submodule Update Bot
d60882b0bc Updated submodules. 
Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-13 04:45:15 +00:00
Qt Submodule Update Bot
dbdb4ce40f Updated submodules. 
Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-08-07 06:55:47 +00:00
Qt Submodule Update Bot
20beccb628 Updated submodules. 
Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-07-14 03:17:43 +00:00
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
0d60d720f8 Updated submodules. 
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-06-19 18:49:53 +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
00defc7101 Updated submodules. 
Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-31 06:58:29 +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
Oswald Buddenhagen
4a5968ce75 Merge branch '5.4' into 5.4.2 
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
v5.4.2 		2015-05-29 20:12:13 +02:00
Oswald Buddenhagen
843a3407f2 Merge tag 'v5.4.1' into 5.4 
Qt 5.4.1 Release
 2015-05-29 15:53:05 +02:00
Oswald Buddenhagen
5400507252 Merge tag 'v5.4.0' into 5.4 
Qt 5.4.0 Release
 2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot
210493d641 Updated submodules. 
Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot
670466b6a3 Updated submodules. 
Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-28 11:33:18 +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
07856d73e1 Updated submodules. 
Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-23 06:51:36 +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
dfffbfdc26 Updated submodules. 
Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-16 04:57:35 +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
b62714f88c Updated submodules. 
Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot
24f1b3219d Updated submodules. 
Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2015-05-13 15:55:59 +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
f7cb995d04 Updated submodules. 
Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-09 12:22:09 +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
11963ba9f0 Updated submodules. 
Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2015-05-03 07:57:31 +00:00