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

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot
05561273d5 Updated submodules. 
Change-Id: I742353c43c52e58f4a7f21c721c43b62c46d6e5b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-08-02 00:32:15 +02:00
Qt Submodule Update Bot
742353c43c Updated submodules. 
Change-Id: If7f4b927e892a034697729dd0818211ef2487b3f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-08-01 03:53:40 +02:00
Qt Submodule Update Bot
f7f4b927e8 Updated submodules. 
Change-Id: Ie19caf122b2dd4d29119fb4d0367b1cf504c594c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-31 09:36:25 +02:00
Lars Knoll
5fb5e0dfc7 Remove phonon as discussed on the mailing list 
phonon's upstream is in KDE's repositories and the port
to Qt 5 on qt-project is not maintained. So it's only
logical to remove it. KDE frameworks 5 will hopefully
provide a phonon module for Qt 5 again in the future.

Change-Id: I30189d921913868f2253841648ba57b2aaf3650c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 2012-07-30 17:23:22 +02:00
Simon Hausmann
898848326a New WebKit snapshot with prospective Mac OS X Mountain Lion build fix 
Change-Id: I1b526d3113cc99123758259b0c632512199c2648
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-30 11:41:41 +02:00
Simon Hausmann
ec904560e7 New WebKit snapshot that follows latest Qt API changes 
Change-Id: I526701439f1768681b6b3424f07f3a5931aae1eb
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-24 17:08:04 +02:00
Simon Hausmann
65079e2706 New WebKit snapshot with better configure tests 
Change-Id: I6de43b46f6d62a2dc68ef196bee60f6a79e743fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-23 09:34:26 +02:00
Laszlo Papp
654fcc335c Follow the protocol requests for webkit (special treatment for internal) 
It is currently not possible to successfully run the init-repository script with
certain protocols, like "http", since those requests does not apply for
qtwebkit. Hence, the cloning of qtwebkit fails behind the corporate rules which
is against the original purpose of those command line options.

If the requested protocol is "internal", then the replacement of qtwebkit
should still be excluded since that would potentially cause breakages.

Change-Id: I738738f1c367cf1b4f18ffed05f37715a78e94ae
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-19 15:56:54 +02:00
Qt Submodule Update Bot
e19caf122b Updated submodules. 
Change-Id: I2b4b350459cfab4638b5fd5b276f0b0d206120c8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-19 15:55:50 +02:00
Qt Submodule Update Bot
2b4b350459 Updated submodules. 
Change-Id: Id5fe783fda5471f3244c8c871cb0eb7f603c2458
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-19 06:15:55 +02:00
Qt Submodule Update Bot
d5fe783fda Updated submodules. 
Change-Id: I1e7d6ecc9d7834f134a6050bc16f3245208b12a6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-18 19:11:45 +02:00
Simon Hausmann
c9fd867234 New snapshot that should fix the recently introduced rendering issues 
Change-Id: Ie41f043dbe1693a620b1b03a975056ee0802adb1
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-18 14:04:30 +02:00
Rohan McGovern
34f300fd4b init-repository: fixed incorrect example for --mirror option 
The full gerrit project name (including e.g. 'qt/' prefix) is appended
to the mirror. The previous example implied that only the last portion
was appended.

Change-Id: I6313427edc8e3dac0e9819ebec9de1d71763e07f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
 2012-07-18 07:38:00 +02:00
Qt Submodule Update Bot
1e7d6ecc9d Updated submodules. 
Change-Id: If3e608ac5908ec87daf9ec5fabbb53131215ca6e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-17 01:12:09 +02:00
Simon Hausmann
bb7e88b0fb New WebKit snapshot with more Windows build fixes 
Change-Id: I1945e611879ad24824db31d3fa208cf05cd5da00
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-16 16:19:47 +02:00
Qt Submodule Update Bot
f3e608ac59 Updated submodules. 
Change-Id: Ib8aa817f803d8cb96e76c9f5ada24a6c5c8439ae
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-16 07:34:27 +02:00
Qt Submodule Update Bot
b8aa817f80 Updated submodules. 
Change-Id: Ife4e459e44de1a90eb14498604e112d4ead4cb45
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-12 00:12:19 +02:00
Simon Hausmann
1d63be4b88 New WebKit snapshot that contains fixes needed after qtbase buildsystem changes 
Change-Id: Ie9fc20e45b649422065da870dcd644e0b7497093
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
 2012-07-11 14:31:08 +02:00
Aaron McCarthy
107515b047 Add soft dependency on Qt Multimedia to Qt Location. 
The Qt Location mapviewer example makes use of Qt Multimedia.

Task-number: QTBUG-26468
Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-11 08:59:38 +02:00
Qt Submodule Update Bot
fe4e459e44 Updated submodules. 
Change-Id: I15426edcf0b62b2ec8ed114c2d5296f3b9d9d6f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-11 05:19:15 +02:00
Qt Submodule Update Bot
15426edcf0 Updated submodules. 
Change-Id: I30214b8ee280d9845928ea867e0d7ab6f4adf70e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-11 00:20:29 +02:00
Qt Submodule Update Bot
30214b8ee2 Updated submodules. 
Change-Id: I9e7d0c7a0d3ce5f15c48d3884dab10fc3026c160
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-10 00:22:18 +02:00
Qt Submodule Update Bot
9e7d0c7a0d Updated submodules. 
Change-Id: Iaf77a620f74fa17a3b072356b2a5a1647bfad83b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-09 03:24:44 +02:00
Qt Submodule Update Bot
af77a620f7 Updated submodules. 
Change-Id: I7e062e5d1ac6d8cce52e66b566fcc64480f5b377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-06 07:56:18 +02:00
Qt Submodule Update Bot
7e062e5d1a Updated submodules. 
Change-Id: Iec8eecbaf8909e9d79921955cedd4417b2f0b4d4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-05 08:05:58 +02:00
Qt Submodule Update Bot
ec8eecbaf8 Updated submodules. 
Change-Id: Ic6db6da949fb476b6623de5f8d5a57f64dde8de3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-05 01:00:29 +02:00
Qt Submodule Update Bot
c6db6da949 Updated submodules. 
Change-Id: I16ac53f263ea10a71064a9c93979bb28299845b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-04 14:28:21 +02:00
Qt Submodule Update Bot
16ac53f263 Updated submodules. 
Change-Id: Ia6f6e65088e3d5180e317f3d5894165b4a4016b7
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-04 06:11:21 +02:00
Qt Submodule Update Bot
a6f6e65088 Updated submodules. 
Change-Id: Ic5ceab9842c1778504fe8b064a1b08424e00cfc4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-04 00:59:10 +02:00
Qt Submodule Update Bot
c5ceab9842 Updated submodules. 
Change-Id: Ia5eb50d59cb1465bb1c28c1e29212bf4f188d0cc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-03 14:37:30 +02:00
Qt Submodule Update Bot
a5eb50d59c Updated submodules. 
Change-Id: Ic6fba546d194cef5b538a33e444330c28d64684c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-03 05:25:43 +02:00
Qt Submodule Update Bot
c6fba546d1 Updated submodules. 
Change-Id: Ib18a0dcff0d2bcaf249fddf9aa73469d23f3c694
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-07-03 00:39:26 +02:00
Qt Submodule Update Bot
b18a0dcff0 Updated submodules. 
Change-Id: I758fc0b6db4d360ea5ea3d0e814b0212aa2fe8ac
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-02 14:40:04 +02:00
Qt Submodule Update Bot
758fc0b6db Updated submodules. 
Change-Id: Ic1e727e30db05eda41f7f7ecf7c248ad9b6390d9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-02 02:16:21 +02:00
Qt Submodule Update Bot
c1e727e30d Updated submodules. 
Change-Id: I5ac094341e0fb108507b9375f16c12814e52a00a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-01 13:48:06 +02:00
Qt Submodule Update Bot
5ac094341e Updated submodules. 
Change-Id: I6e0b3836f392b1c5fdb4f2c06113c1649e1404ec
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-07-01 03:37:17 +02:00
Qt Submodule Update Bot
6e0b3836f3 Updated submodules. 
Change-Id: I677c8c5b68bc779ffdf1d755fe764cd4394f5caf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-06-30 16:31:47 +02:00
Qt Submodule Update Bot
677c8c5b68 Updated submodules. 
Change-Id: I94e7f7bcb98cb8543505d2e8c43cd0021604b354
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-06-30 09:16:37 +02:00
Marko Niemelä
ce9400d52d Enabled installation of QtGraphicalEffects add-on module. 
Default installation has been disabled during alpha/beta
phase of qt5, but there should not be any reasons that
prevents it to be installed along other essential and
add-on modules.

Change-Id: I9cca7526a773f470fe697de918485328befc6100
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 2012-06-29 07:01:26 +02:00
Qt Submodule Update Bot
94e7f7bcb9 Updated submodules. 
Change-Id: I78b8403e415e7e8d9405daebc9619c4a7cb85910
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-06-29 03:42:02 +02:00
Oswald Buddenhagen
1317419aa2 create top-level .qmake.super instead of .qmake.cache 
at this point, the cache is needed only to aggregate the modules,
not to "export" qtbase internals. the modules now have private caches
for "real" config data.

Change-Id: I4c70d220bbc054023710680545a04c171e238aff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2012-06-29 03:41:41 +02:00
Oswald Buddenhagen
7c0959338e webkit-examples depends on qttools (uitools) 
Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-06-29 03:41:39 +02:00
Oswald Buddenhagen
cf26eb0812 remove stale workaround for circular dependency 
webkit does not depend on quick1 anymore

Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-06-29 03:41:37 +02:00
Oswald Buddenhagen
ac8b26c0b2 fix SUBDIRS sorting according to dependencies again 
quick1 depends on tools now

Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-06-29 03:41:35 +02:00
Simon Hausmann
222a346249 Update WebKit 
This removes the QtScript dependency and prepares for a future build flag
to ensure -Werror remains disabled.

Change-Id: I95cf773c1e21d08d3afe881458c352398e3c9e84
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-06-19 10:19:06 +02:00
Qt Submodule Update Bot
78b8403e41 Updated submodules. 
Change-Id: I40f8c17b0f1e85cad0794c348c2aca043fc2ece8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-06-19 05:39:07 +02:00
Rohan McGovern
5f8a034a48 Updated qtquick1, qttools. 
The dependencies between these modules have recently been reversed (from
qttools depending on qtquick1 to qtquick1 depending on qttools).

Having a different dependency order when building the qt5.git versions
of the modules, vs building the latest master of the modules, is
confusing and disruptive.  Therefore, explicitly update these two
modules separately from the usual submodule update procedure.

Change-Id: Ibdf4eb543c395c90317296d289199c91f8153970
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-06-13 01:07:39 +02:00
Lars Knoll
ed97a0d3b9 Fix dependencies between quick1 and tools 
Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-06-13 01:07:37 +02:00
Lars Knoll
93310ed069 qtquick1 now depends on qttools, not the other way round 
This depends on https://codereview.qt-project.org/#change,28044
and https://codereview.qt-project.org/#change,28047

Change-Id: I1587b0c4b8f3d3b25acf6106aedf0824270da98d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-06-08 15:06:56 +02:00
Lars Knoll
fd18c7da23 Remove doc gallery dependency onto QtScript 
Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-06-07 01:10:15 +02:00