lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-03 23:16:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,986 Commits 118 Branches 270 Tags
e8a94de2ea4675fb30c48c448ad829532f69bf2f
Commit Graph

5986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rohan McGovern
6c50e8122b init-repository: fall back to origin when mirror is unavailable 
This allows init-repository to be used with servers mirroring only a
portion of the qt5 submodules.  Any missing modules will be cloned from
the canonical upstream URLs.

Change-Id: I4b266edd2ec7d49126578b54eace6de6de629b56
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
 2012-01-10 06:34:18 +01:00
Simon Hausmann
7e177c50ce Added qtjsbackend module 
Change-Id: I179a5714a12144e6815d931fef9fbfcedee6c93f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-10 06:34:16 +01:00
Aaron McCarthy
522634777b Push handling of --no-update to the 'git submodule update' call. 
This allows running 'init-repository --no-update -f' to initialise
and fetch new submodules without attempting to updating existing
submodules which may have new commits applied which may cause the
update to fail.

Change-Id: I48040bc42235231eec3bc85b643b688c8e8b4bd9
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-10 02:27:23 +01:00
Simon Hausmann
f917ea79ef Updated WebKit import 
The repository pointed at is now significantly smaller and contains
a snapshot of WebKit only, excluding content like layout tests or
their platform specific results.

In addition the phonon dependency in qt.pro has been removed from WebKit,
as it is not accurate.

Change-Id: Ic2721435a6ce2328d11c1a8f5d9ce1881fc8ebb3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-09 07:38:45 +01:00
Qt Submodule Update Bot
990c994954 Updated submodules. 
Change-Id: Ib06caee4fe71f216a84c5748eebe715c29e9301a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-06 22:44:11 +01:00
Jason McDonald
96f49e86ae Update copyright year in license headers. 
Change-Id: Ic9fffa8c317e73d8cbed665fe48c1b158e2fa420
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-06 07:50:15 +01:00
Qt Submodule Update Bot
b06caee4fe Updated submodules. 
Change-Id: I79a8c1eef1e8dcd8e365a1448f111b3d039637cb
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-05 22:44:20 +01:00
Qt Submodule Update Bot
79a8c1eef1 Updated submodules. 
Change-Id: Ide8732d04f041b166272a3ac30dea644c8bcba27
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-05 07:49:25 +01:00
Qt Submodule Update Bot
de8732d04f Updated submodules. 
Change-Id: I23ad78433062d0601baae68d67600f766f9588ac
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-04 22:53:58 +01:00
Qt Submodule Update Bot
23ad784330 Updated submodules. 
Change-Id: I2bc4db0efbce4ec6ede09e821c6bb6eae7b38768
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-01-04 07:48:11 +01:00
Qt Submodule Update Bot
2bc4db0efb Updated submodules. 
Change-Id: I7e6d0a34233841985fb31e11f112dc97cc47a53f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-03 22:41:55 +01:00
Kai Koehne
acb74866e9 README: Don't advocate -confirm-license 
Let the user at least see the license once (but explain
the use of -confirm-license in the Hints section).

Change-Id: I847486e73b3d78c0f4d18562446ec1172d746ff3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-01-03 17:19:45 +01:00
Kai Koehne
24faf4a3c6 README: Don't advocate configure option -nokia-developer 
Advocating -nokia-developer for any 'developer-build' sounds wrong.
Instead use -developer-build .

Change-Id: I8b93bc1222fd2754f8ed120d3bd856a4cd38f88c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-01-03 17:19:40 +01:00
Qt Submodule Update Bot
7e6d0a3423 Updated submodules. 
Change-Id: Ia454b9e750496b601aa2950a3bb95c755e6c007b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-03 14:30:39 +01:00
Kai Koehne
06b56d2c88 README: Remove -no-demos from suggested configure flags 
Change 1fab62b930edd in qtbase removes demos from default build
targets: demos and examples are merged into one in Qt 5.

Change-Id: Idc6577920cb8678efe493898d85553050c752787
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-01-03 12:42:03 +01:00
Qt Submodule Update Bot
a454b9e750 Updated submodules. 
Change-Id: Iaaa7b79ee8d8c9f7bc2a75e939313679a08e62a7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-02 23:01:35 +01:00
Qt Submodule Update Bot
aaa7b79ee8 Updated submodules. 
Change-Id: I2e1000caf7e70ba6ee902d9892116f60143b7a71
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-01-02 08:58:19 +01:00
Qt Submodule Update Bot
2e1000caf7 Updated submodules. 
Change-Id: I456f5d98047af035b61a2d38669613685a0cae1f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-01-01 22:59:30 +01:00
Qt Submodule Update Bot
456f5d9804 Updated submodules. 
Change-Id: I9d6d52b5944676fa1cb44f7eee414faedb8735b8
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2011-12-31 10:12:29 +01:00
Qt Submodule Update Bot
9d6d52b594 Updated submodules. 
Change-Id: I9260d5d50a8a500229120933c0dbdc512c95d9b3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2011-12-30 22:47:25 +01:00
Qt Submodule Update Bot
9260d5d50a Updated submodules. 
Change-Id: I494ca04d7c38e25753c4eda76a097adbdc7618fe
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2011-12-30 10:28:32 +01:00
Qt Submodule Update Bot
494ca04d7c Updated submodules. 
Change-Id: I90ba4e38a5094d06b47d81d928a4f4b4ab370714
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-12-29 23:36:16 +01:00
Qt Submodule Update Bot
90ba4e38a5 Updated submodules. 
Change-Id: I1d0fd7862c67f0f8e70c02218a949dbcc888d1f3
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-12-29 07:44:29 +01:00
Qt Submodule Update Bot
1d0fd7862c Updated submodules. 
Change-Id: Ic3c00159b893344671a96f237f4077a9c30c2144
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2011-12-28 22:53:05 +01:00
Qt Submodule Update Bot
c3c00159b8 Updated submodules. 
Change-Id: If24605cc360cc18cc931528a7280d19421f58315
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-12-28 07:46:15 +01:00
Qt Submodule Update Bot
f24605cc36 Updated submodules. 
Change-Id: Id8a1ba14cb0076c809a47b3b9865fce72bac4cef
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-12-27 23:40:04 +01:00
Qt Submodule Update Bot
d8a1ba14cb Updated submodules. 
Change-Id: Ic6410dc838c56b6cada132d7976b1dd6f2f60981
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2011-12-27 10:25:39 +01:00