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
379 Commits 118 Branches 270 Tags
610bb3545d64a53b5a3fd2e45d207716eede673c
Commit Graph

379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius Storm-Olsen
610bb3545d Don't try to compile wayland on Windows or Mac, even if checked out 
Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-03-08 22:18:14 +01:00
Qt Submodule Update Bot
0f86b327e4 Updated submodules. 
Change-Id: Ifae64ac90b68532d159e692fddd42afbc36132a2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-08 08:34:07 +01:00
Qt Submodule Update Bot
fae64ac90b Updated submodules. 
Change-Id: I5efc1e72fe916bbab53ed07c472dc82546856cde
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-03-08 03:36:55 +01:00
Qt Submodule Update Bot
5efc1e72fe Updated submodules. 
Change-Id: I56f438fe18408c99f6a3e46b75e96b5004f1e087
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-05 02:43:01 +01:00
Qt Submodule Update Bot
56f438fe18 Updated submodules. 
Change-Id: I6868b56e525ca71c281011c1faf0cd7dc4393c91
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-04 09:04:57 +01:00
Qt Submodule Update Bot
6868b56e52 Updated submodules. 
Change-Id: Ibc8806c07b28499d11677fa36710a3eee5791763
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-03-03 09:24:16 +01:00
Sergio Ahumada
d3a8758a8c Added new module, qtgraphicaleffects. 
Not yet enabled by default.

Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-03 00:53:12 +01:00
Qt Submodule Update Bot
bc8806c07b Updated submodules. 
Change-Id: I92c6ddea46d94f3f7106da6fa436fb41f7cb4197
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-01 09:44:31 +01:00
Toby Tomkins
d3be383a0c QtLocation: Add hard dependency on qtjsondb to qtlocation. 
Currently there is a soft dependency on qtjsondb. This change makes it
a hard dependency.

Change-Id: Iba29c91093c3c6c67c4121f6f220e62686708040
Reviewed-by: abcd <amos.choy@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
 2012-03-01 05:48:07 +01:00
Qt Submodule Update Bot
92c6ddea46 Updated submodules. 
Change-Id: Iace98c78bd5080dc4108c908063e6b890aeebb38
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-02-29 09:20:55 +01:00
Qt Submodule Update Bot
ace98c78bd Updated submodules. 
Change-Id: I110218ff59ff5e0099865dc1f33a0cc7e78fdbf1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-29 00:59:11 +01:00
Qt Submodule Update Bot
110218ff59 Updated submodules. 
Change-Id: I799b0f5184f42d18c8b683c5bd355e52ff1a4b9c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-28 08:50:05 +01:00
Qt Submodule Update Bot
799b0f5184 Updated submodules. 
Change-Id: I5fd4066161c909463c14a2f59ba2d726c1a1d78a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-28 03:48:51 +01:00
Qt Submodule Update Bot
5fd4066161 Updated submodules. 
Change-Id: I08116e00e55d3d65864f4bc00a60defec1543cb6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-02-27 23:28:55 +01:00
Qt Submodule Update Bot
08116e00e5 Updated submodules. 
Change-Id: I04da6363036806d35f4b049c6931f7d8634cb61d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-27 08:09:52 +01:00
Qt Submodule Update Bot
04da636303 Updated submodules. 
Change-Id: I08c07fbadb501b0d93452d81a47c0a0b4af64fa2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-27 00:14:06 +01:00
Qt Submodule Update Bot
08c07fbadb Updated submodules. 
Change-Id: I2c614ce9b8bd078660e5b6955a2af1faa79a043c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-26 00:52:44 +01:00
Qt Submodule Update Bot
2c614ce9b8 Updated submodules. 
Change-Id: Ie5acb7022476ecaef8f7899632092de739df897b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-25 09:46:02 +01:00
Qt Submodule Update Bot
e5acb70224 Updated submodules. 
Change-Id: I7f8c9b7eaf9efcda699d4f170cb72f5c2cb71a1d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-25 01:21:51 +01:00
Simon Hausmann
5de3da997e Update WebKit 
This brings WebKit in sync with the latest Qt 5 API and behavioural changes.

Change-Id: Ia0b2b3ad8f4db82ad39675912f6a168ad3ed6ae6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-02-24 16:40:07 +01:00
Qt Submodule Update Bot
7f8c9b7eaf Updated submodules. 
Change-Id: I59eebee2600505b2d207d651fb5aa0da979f0f6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-24 04:07:02 +01:00
Qt Submodule Update Bot
59eebee260 Updated submodules. 
Change-Id: I1baa51c3d06dfaf08afe16e3e7dd77a63052a419
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-21 12:36:27 +01:00
Qt Submodule Update Bot
1baa51c3d0 Updated submodules. 
Change-Id: I2e44cb1b7b83de14f5502bedf1669110b6d78a6d
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-02-15 09:49:53 +01:00
Rohan McGovern
fea89c704d Fixed incorrect dependencies for qttools 
qttools uses both qtquick1 and qtdeclarative.

Change-Id: I3ec8ef3d770b029bec865a67aaaad3eb9db464d5
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-15 07:07:17 +01:00
Qt Submodule Update Bot
2e44cb1b7b Updated submodules. 
Change-Id: Ic4ebe393de42d16314b27ae024087fa942436474
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-15 04:20:02 +01:00
Jason McDonald
a9d7b1e452 Add license header to configure script. 
Change-Id: I231ee1c8ad214c3b09de35578009da4b47bcd00b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-14 06:03:53 +01:00
Rohan McGovern
a3289e7eb0 Updated qtbase. 
Includes one important autotest fix (tst_qicon).

Change-Id: Ia93fe84a050f7bb1cea6155ee10c101c6c36252b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-10 08:12:50 +01:00
Rohan McGovern
27dfe4fccb Updated submodules. 
This commit is equivalent to one of the normal automated updates except
qtjsondb was deliberately held back a few commits, as it has some
source-incompatible changes which require updates in most modules.

Change-Id: I339ae36d10a747d0aa705d8839f68e4ca6758c5b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-10 02:58:48 +01:00
Simon Hausmann
258f74601a Update WebKit 
Fixes build issues with latest qtbase.

Change-Id: If45968d6b75a0d46f55b0064764c95f726172232
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
 2012-02-09 14:43:02 +01:00
Andrew den Exter
63d681ee57 Add the QtQuick1 module. 
Change-Id: I3afda68e1fa1dad4e264cea6e5afbd73d858c547
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-02-09 07:54:59 +01:00
Qt Submodule Update Bot
c4ebe393de Updated submodules. 
Change-Id: I48a84504374730c6eb14c265f2fe96a4cfe02294
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-08 08:41:17 +01:00
Simon Hausmann
698fee4870 Updated WebKit to new snapshot. 
Change-Id: I30da2162f0e5de95c49bb8d4004b0dfd0824712c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-02-03 17:29:17 +01:00
Qt Submodule Update Bot
48a8450437 Updated submodules. 
Change-Id: Iebf10988f49c31f3bcf595a1e043cdac47c3e138
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-02-02 08:31:38 +01:00
Qt Submodule Update Bot
ebf10988f4 Updated submodules. 
Change-Id: Icab9e353192b34a411122e718c8810e7cc342d29
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-02-02 00:59:07 +01:00
Qt Submodule Update Bot
cab9e35319 Updated submodules. 
Change-Id: Ia065c70489e96aa254089a666c0a6fcc89c50825
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-02-01 13:35:12 +01:00
Qt Submodule Update Bot
a065c70489 Updated submodules. 
Change-Id: Ie42f2ef362f4a4c3caef754bfab578f78c5ee01c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2012-01-31 10:33:58 +01:00
Toby Tomkins
136762ee09 Add qtimageformats module to Qt5. 
Change-Id: Ie168a1a450b8090d4aa934a21e991c67683ef5de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-31 06:15:57 +01:00
Jason McDonald
93458fe856 Remove "All rights reserved" line from license headers. 
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: I5a62f56e4a36874b51c3258d02ae563e5810a422
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-30 09:41:13 +01:00
Jason McDonald
7e083e46d2 Update contact address in license headers. 
Change-Id: I2b7793cf4fbb605f58257e71614dcd6e2855a82d
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-30 04:08:15 +01:00
Qt Submodule Update Bot
e42f2ef362 Updated submodules. 
Change-Id: I9e62f9e496f92a75d162cbebbc7c00d3b37e6231
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-29 04:57:09 +01:00
Qt Submodule Update Bot
9e62f9e496 Updated submodules. 
Change-Id: Icb9558f041132ea2c6c0acb360214c5bab4376bf
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-01-27 09:48:58 +01:00
Qt Submodule Update Bot
cb9558f041 Updated submodules. 
Change-Id: I823340af637a2302c17e64f54f4aa3f076b3d9f4
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-25 08:03:24 +01:00
Toby Tomkins
9a924c6921 Remove QtQuick3D repository references from Qt5. 
Qt3D had temporarily resided in the Qt5 repository under qtquick3d.
There is now a qt3d submodule which is compiling and testing correctly.
Qt5 had previously removed support for building the qtquick3d submodule
by default. This commit is the final step in cleaning up the previous
version.

Task-number: QTBUG-22098

Change-Id: I39fdbd7c58a0076c288d8c0570e892b5d0df4ff9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
 2012-01-25 02:57:49 +01:00
Qt Submodule Update Bot
823340af63 Updated submodules. 
Change-Id: Ia7aadc710102a499d87848fd9c90dfc57c7433e7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-24 05:28:45 +01:00
Qt Submodule Update Bot
a7aadc7101 Updated submodules. 
Change-Id: Ib59d3abcfa9005ea938d5c233d02cd9dd656f63f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-23 08:41:20 +01:00
Qt Submodule Update Bot
b59d3abcfa Updated submodules. 
Change-Id: I351cdb1d58e2ffca9c3ebd9987f5743a06fb148c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-23 03:38:05 +01:00
Jyri Tahtela
ea8879a542 Qt5: Enable compilation of qtjsondb by default. 
Dependency to other modules (qtpim, qtdocgallery, qtsystems)
is defined if qtjsondb is checked out.

Change-Id: I0e0abc8d30733b9d7c1fdc666cd064fe6809442a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-20 01:25:35 +01:00
Qt Submodule Update Bot
351cdb1d58 Updated submodules. 
Change-Id: I13804ab06991c5e841d6869589ed53223066b824
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-19 08:19:53 +01:00
Qt Submodule Update Bot
13804ab069 Updated submodules. 
Change-Id: I8982f81129b893a4279c1390b90e834938e9e7f9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-18 23:07:03 +01:00
Qt Submodule Update Bot
8982f81129 Updated submodules. 
Change-Id: I6f4f0fed90c30f09d6116ffda668aa1b0e45d3ec
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-18 06:21:51 +01:00