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
363 Commits 118 Branches 270 Tags
08c07fbadb501b0d93452d81a47c0a0b4af64fa2
Commit Graph

363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rohan McGovern
a0ee6a1a87 Switch default builds from qtquick3d repo to qt3d repo 
Disable qtquick3d by default and enable qt3d by default.
Make qtlocation depend on qt3d instead of qtquick3d.

qtquick3d still exists for now, and can be explicitly compiled if
necessary.

Change-Id: If1013a9361b17421217beffd2dc1864c5e8502f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Laing <david.laing@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
 2012-01-18 06:21:44 +01:00
Oswald Buddenhagen
eea22574a1 don't treat qt3d specially any more 
it moved to gerrit properly

Task-number: QTBUG-23441
Change-Id: If15a8a9158637d82ca5b3f567d79b7376b43503c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-17 02:37:59 +01:00
Qt Submodule Update Bot
6f4f0fed90 Updated submodules. 
Change-Id: I38fcd2c1057efd666478f1975f7edcc203be4ab7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-17 00:48:36 +01:00
Qt Submodule Update Bot
38fcd2c105 Updated submodules. 
Change-Id: I013333216a7d3716a5825dbaf463f6e29a57ffb9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-16 08:02:39 +01:00
Rohan McGovern
fcfa9df1d2 init-repository: fixed warnings when no mirror is used 
Don't test for the existence of the mirror if the user didn't ask to
use a mirror.

Change-Id: Ib5565fa9a68ba6e22a4f7a179a0f00eb998da2aa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
 2012-01-16 02:26:25 +01:00
Qt Submodule Update Bot
013333216a Updated submodules. 
Change-Id: Ideeed25932e27ad838641780b9374f2fece2428a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-01-13 01:33:36 +01:00
Simon Hausmann
26d8846f68 Remove special casing of qtjsbackend for cloning 
Mirroring is set up for the repository now.

Change-Id: Iee21600f2222103e5777fa95e58a6c2ddaeea58f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-12 08:08:51 +01:00
Qt Submodule Update Bot
deeed25932 Updated submodules. 
Change-Id: I754fb71efdbf5350b32a5cd9126af73a604f6032
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-12 08:06:31 +01:00
Qt Submodule Update Bot
754fb71efd Updated submodules. 
Change-Id: Ibaabf8a5e27479e91dbdccff4e535cdc94572baf
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-12 03:37:38 +01:00
Simon Hausmann
03dfab378d Remove obsolete submodule handling. 
We do not use submodules for our copy of v8 anymore.

Change-Id: I9da0f79d23336ee7efc074d4481d6bcdb0550bfc
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-12 00:06:49 +01:00
Simon Hausmann
ecc6425433 Update WebKit 
This includes various build fixes with the latest Qt 5 and it also breaks
the circular dependency between qtwebkit and qttools.

Change-Id: Iab3d43caae748a74050cd73391aefef4057c3300
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-01-11 11:50:35 +01:00
Qt Submodule Update Bot
baabf8a5e2 Updated submodules. 
Change-Id: I5993bf9d0827759e9a0f8677ee2cec2c0b8d8678
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-11 08:18:35 +01:00
Qt Submodule Update Bot
5993bf9d08 Updated submodules. 
Change-Id: I343e9b51ec5cc556f420df4f940977e597e675de
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-10 23:36:03 +01:00
Simon Hausmann
8f04e3501a Remove obsolete fix-webkit script 
Change-Id: I56aae1a6f311f92bda69ab7ad105b708a74d6613
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-10 15:00:30 +01:00
Qt Submodule Update Bot
343e9b51ec Updated submodules. 
Change-Id: I990c994954142e9f3b16041a5b9ec08bc455be24
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-10 06:34:26 +01:00
Rohan McGovern
c5a02e33b0 Added missing SUBDIRS+=module_qtjsbackend 
Module cannot be compiled without this.

Change-Id: I1ea3bd6f21b389db0c758abebd6e851a77a1d682
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-01-10 06:34:21 +01:00