mirror/qt/qt5.git
8 years agoRemove phonon as discussed on the mailing list master_201207310127
Lars Knoll [Sat, 2 Jun 2012 12:46:27 +0000 (14:46 +0200)]
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>
8 years agoNew WebKit snapshot with prospective Mac OS X Mountain Lion build fix master_201207302021
Simon Hausmann [Mon, 30 Jul 2012 09:41:44 +0000 (11:41 +0200)]
New WebKit snapshot with prospective Mac OS X Mountain Lion build fix

Change-Id: I1b526d3113cc99123758259b0c632512199c2648
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoNew WebKit snapshot that follows latest Qt API changes master_201207250251
Simon Hausmann [Tue, 24 Jul 2012 15:05:14 +0000 (17:05 +0200)]
New WebKit snapshot that follows latest Qt API changes

Change-Id: I526701439f1768681b6b3424f07f3a5931aae1eb
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoNew WebKit snapshot with better configure tests master_201207231738
Simon Hausmann [Mon, 23 Jul 2012 07:34:24 +0000 (09:34 +0200)]
New WebKit snapshot with better configure tests

Change-Id: I6de43b46f6d62a2dc68ef196bee60f6a79e743fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoFollow the protocol requests for webkit (special treatment for internal) master_201207200002
Laszlo Papp [Tue, 17 Jul 2012 14:21:45 +0000 (15:21 +0100)]
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>
8 years agoUpdated submodules.
Qt Submodule Update Bot [Thu, 19 Jul 2012 11:32:39 +0000 (21:32 +1000)]
Updated submodules.

Change-Id: I2b4b350459cfab4638b5fd5b276f0b0d206120c8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207191438
Qt Submodule Update Bot [Thu, 19 Jul 2012 04:11:17 +0000 (14:11 +1000)]
Updated submodules.

Change-Id: Id5fe783fda5471f3244c8c871cb0eb7f603c2458
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207190334
Qt Submodule Update Bot [Wed, 18 Jul 2012 11:18:07 +0000 (21:18 +1000)]
Updated submodules.

Change-Id: I1e7d6ecc9d7834f134a6050bc16f3245208b12a6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoNew snapshot that should fix the recently introduced rendering issues master_201207182227
Simon Hausmann [Wed, 18 Jul 2012 12:04:06 +0000 (14:04 +0200)]
New snapshot that should fix the recently introduced rendering issues

Change-Id: Ie41f043dbe1693a620b1b03a975056ee0802adb1
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoinit-repository: fixed incorrect example for --mirror option master_201207181609
Rohan McGovern [Wed, 18 Jul 2012 03:00:54 +0000 (13:00 +1000)]
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>
8 years agoUpdated submodules. master_201207170934
Qt Submodule Update Bot [Mon, 16 Jul 2012 19:06:49 +0000 (05:06 +1000)]
Updated submodules.

Change-Id: If3e608ac5908ec87daf9ec5fabbb53131215ca6e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoNew WebKit snapshot with more Windows build fixes master_201207170042
Simon Hausmann [Mon, 16 Jul 2012 14:19:21 +0000 (16:19 +0200)]
New WebKit snapshot with more Windows build fixes

Change-Id: I1945e611879ad24824db31d3fa208cf05cd5da00
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoUpdated submodules. master_201207161556
Qt Submodule Update Bot [Mon, 16 Jul 2012 05:33:20 +0000 (15:33 +1000)]
Updated submodules.

Change-Id: Ib8aa817f803d8cb96e76c9f5ada24a6c5c8439ae
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207120834
Qt Submodule Update Bot [Wed, 11 Jul 2012 19:22:45 +0000 (05:22 +1000)]
Updated submodules.

Change-Id: Ife4e459e44de1a90eb14498604e112d4ead4cb45
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoNew WebKit snapshot that contains fixes needed after qtbase buildsystem changes master_201207112340
Simon Hausmann [Wed, 11 Jul 2012 12:30:10 +0000 (14:30 +0200)]
New WebKit snapshot that contains fixes needed after qtbase buildsystem changes

Change-Id: Ie9fc20e45b649422065da870dcd644e0b7497093
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoAdd soft dependency on Qt Multimedia to Qt Location. master_201207111721
Aaron McCarthy [Tue, 10 Jul 2012 03:15:01 +0000 (13:15 +1000)]
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>
8 years agoUpdated submodules. master_201207111341
Qt Submodule Update Bot [Wed, 11 Jul 2012 03:18:04 +0000 (13:18 +1000)]
Updated submodules.

Change-Id: I15426edcf0b62b2ec8ed114c2d5296f3b9d9d6f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201207110842
Qt Submodule Update Bot [Tue, 10 Jul 2012 19:15:58 +0000 (05:15 +1000)]
Updated submodules.

Change-Id: I30214b8ee280d9845928ea867e0d7ab6f4adf70e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207100844
Qt Submodule Update Bot [Mon, 9 Jul 2012 19:22:27 +0000 (05:22 +1000)]
Updated submodules.

Change-Id: I9e7d0c7a0d3ce5f15c48d3884dab10fc3026c160
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207091146
Qt Submodule Update Bot [Mon, 9 Jul 2012 01:17:59 +0000 (11:17 +1000)]
Updated submodules.

Change-Id: Iaf77a620f74fa17a3b072356b2a5a1647bfad83b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201207061618
Qt Submodule Update Bot [Fri, 6 Jul 2012 05:45:15 +0000 (15:45 +1000)]
Updated submodules.

Change-Id: I7e062e5d1ac6d8cce52e66b566fcc64480f5b377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201207051627
Qt Submodule Update Bot [Thu, 5 Jul 2012 03:17:37 +0000 (13:17 +1000)]
Updated submodules.

Change-Id: Iec8eecbaf8909e9d79921955cedd4417b2f0b4d4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207050922
Qt Submodule Update Bot [Wed, 4 Jul 2012 19:36:16 +0000 (05:36 +1000)]
Updated submodules.

Change-Id: Ic6db6da949fb476b6623de5f8d5a57f64dde8de3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207042250
Qt Submodule Update Bot [Wed, 4 Jul 2012 11:26:31 +0000 (21:26 +1000)]
Updated submodules.

Change-Id: I16ac53f263ea10a71064a9c93979bb28299845b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207041433
Qt Submodule Update Bot [Wed, 4 Jul 2012 03:11:27 +0000 (13:11 +1000)]
Updated submodules.

Change-Id: Ia6f6e65088e3d5180e317f3d5894165b4a4016b7
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207040920
Qt Submodule Update Bot [Tue, 3 Jul 2012 19:19:29 +0000 (05:19 +1000)]
Updated submodules.

Change-Id: Ic5ceab9842c1778504fe8b064a1b08424e00cfc4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207032259
Qt Submodule Update Bot [Tue, 3 Jul 2012 11:23:55 +0000 (21:23 +1000)]
Updated submodules.

Change-Id: Ia5eb50d59cb1465bb1c28c1e29212bf4f188d0cc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207031347
Qt Submodule Update Bot [Tue, 3 Jul 2012 03:20:24 +0000 (13:20 +1000)]
Updated submodules.

Change-Id: Ic6fba546d194cef5b538a33e444330c28d64684c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201207030902
Qt Submodule Update Bot [Mon, 2 Jul 2012 21:32:08 +0000 (07:32 +1000)]
Updated submodules.

Change-Id: Ib18a0dcff0d2bcaf249fddf9aa73469d23f3c694
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201207022301
Qt Submodule Update Bot [Mon, 2 Jul 2012 11:12:43 +0000 (21:12 +1000)]
Updated submodules.

Change-Id: I758fc0b6db4d360ea5ea3d0e814b0212aa2fe8ac
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207021038
Qt Submodule Update Bot [Sun, 1 Jul 2012 19:19:05 +0000 (05:19 +1000)]
Updated submodules.

Change-Id: Ic1e727e30db05eda41f7f7ecf7c248ad9b6390d9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207012210
Qt Submodule Update Bot [Sun, 1 Jul 2012 11:08:20 +0000 (21:08 +1000)]
Updated submodules.

Change-Id: I5ac094341e0fb108507b9375f16c12814e52a00a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207011158
Qt Submodule Update Bot [Sat, 30 Jun 2012 19:11:47 +0000 (05:11 +1000)]
Updated submodules.

Change-Id: I6e0b3836f392b1c5fdb4f2c06113c1649e1404ec
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201207010053
Qt Submodule Update Bot [Sat, 30 Jun 2012 11:11:14 +0000 (21:11 +1000)]
Updated submodules.

Change-Id: I677c8c5b68bc779ffdf1d755fe764cd4394f5caf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201206301738
Qt Submodule Update Bot [Sat, 30 Jun 2012 03:17:05 +0000 (13:17 +1000)]
Updated submodules.

Change-Id: I94e7f7bcb98cb8543505d2e8c43cd0021604b354
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoEnabled installation of QtGraphicalEffects add-on module. master_201206291523
Marko Niemelä [Mon, 25 Jun 2012 10:13:20 +0000 (13:13 +0300)]
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>
8 years agoUpdated submodules. master_201206291213
Qt Submodule Update Bot [Fri, 29 Jun 2012 01:40:26 +0000 (11:40 +1000)]
Updated submodules.

Change-Id: I78b8403e415e7e8d9405daebc9619c4a7cb85910
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agocreate top-level .qmake.super instead of .qmake.cache
Oswald Buddenhagen [Fri, 18 May 2012 08:50:10 +0000 (10:50 +0200)]
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>
8 years agowebkit-examples depends on qttools (uitools)
Oswald Buddenhagen [Tue, 19 Jun 2012 16:34:38 +0000 (18:34 +0200)]
webkit-examples depends on qttools (uitools)

Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoremove stale workaround for circular dependency
Oswald Buddenhagen [Tue, 19 Jun 2012 16:25:24 +0000 (18:25 +0200)]
remove stale workaround for circular dependency

webkit does not depend on quick1 anymore

Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agofix SUBDIRS sorting according to dependencies again
Oswald Buddenhagen [Tue, 19 Jun 2012 16:24:37 +0000 (18:24 +0200)]
fix SUBDIRS sorting according to dependencies again

quick1 depends on tools now

Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdate WebKit master_201206191840
Simon Hausmann [Wed, 13 Jun 2012 14:39:19 +0000 (16:39 +0200)]
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>
8 years agoUpdated submodules. master_201206191400
Qt Submodule Update Bot [Tue, 19 Jun 2012 03:09:55 +0000 (13:09 +1000)]
Updated submodules.

Change-Id: I40f8c17b0f1e85cad0794c348c2aca043fc2ece8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated qtquick1, qttools. master_201206130928
Rohan McGovern [Tue, 12 Jun 2012 23:02:03 +0000 (09:02 +1000)]
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>
8 years agoFix dependencies between quick1 and tools
Lars Knoll [Mon, 11 Jun 2012 12:53:13 +0000 (14:53 +0200)]
Fix dependencies between quick1 and tools

Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
8 years agoqtquick1 now depends on qttools, not the other way round master_201206082327
Lars Knoll [Sat, 2 Jun 2012 12:11:08 +0000 (14:11 +0200)]
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>
8 years agoRemove doc gallery dependency onto QtScript master_201206070942
Lars Knoll [Sat, 2 Jun 2012 16:02:31 +0000 (18:02 +0200)]
Remove doc gallery dependency onto QtScript

Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
8 years agoCleanup build dependencies
Lars Knoll [Sat, 2 Jun 2012 12:26:00 +0000 (14:26 +0200)]
Cleanup build dependencies

Change-Id: Ibee6b46db3c10d80790af170470dd3439e1b6f88
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
8 years agoQt5: change wiki address in README
Jyri Tahtela [Wed, 6 Jun 2012 14:03:11 +0000 (17:03 +0300)]
Qt5: change wiki address in README

Fix old wiki address to point to new wiki.

Change-Id: Ia5361288cb0afd9ef172b669e894d6a61ca831da
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201206052133
Qt Submodule Update Bot [Tue, 5 Jun 2012 11:13:20 +0000 (21:13 +1000)]
Updated submodules.

Change-Id: I2bd9baf5193b93c048c7fe3ee0a4c27f15a20642
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201206050550
Qt Submodule Update Bot [Mon, 4 Jun 2012 19:06:55 +0000 (05:06 +1000)]
Updated submodules.

Change-Id: I3f0b6f886b36befe64fee98af3fa4d4617b41170
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201206042143
Qt Submodule Update Bot [Mon, 4 Jun 2012 11:10:43 +0000 (21:10 +1000)]
Updated submodules.

Change-Id: Ifa716b77c11c4bbc59e92540d166f65887ed7d74
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoqt.pro: update modules dependency on qtxmlpatterns master_201206021709
Tasuku Suzuki [Thu, 24 May 2012 11:06:48 +0000 (20:06 +0900)]
qt.pro: update modules dependency on qtxmlpatterns

remove the dependency from qtjsondb and qtgraphicaleffects
change qtdeclarative and qtquick1 dependency on it to optional

Change-Id: I6d1b60417d54c378c018d20d48fa6ce45776fbda
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules.
Qt Submodule Update Bot [Sat, 2 Jun 2012 03:07:09 +0000 (13:07 +1000)]
Updated submodules.

Change-Id: I03000b0a8af2c5947fb0b7a36f5c4aaaae85cab6
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdate WebKit master_201206020654
Simon Hausmann [Fri, 1 Jun 2012 20:33:31 +0000 (22:33 +0200)]
Update WebKit

This snapshot should include the fix to do -Werror only in developer builds

Change-Id: I5de3494cdf9396d7a734e69d3a44c0195101166f
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoUpdated submodules. master_201206020044
Qt Submodule Update Bot [Fri, 1 Jun 2012 11:05:03 +0000 (21:05 +1000)]
Updated submodules.

Change-Id: Ic52bc09b9afa99140b8f6858bf63347e1adf1576
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoWebKit update master_201206012002
Simon Hausmann [Fri, 1 Jun 2012 08:38:54 +0000 (10:38 +0200)]
WebKit update

Change-Id: I925f1d2cf4322b3db6848534d0fe2f18bd8183a2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoUpdated submodules. master_201206011508
Qt Submodule Update Bot [Fri, 1 Jun 2012 04:40:04 +0000 (14:40 +1000)]
Updated submodules.

Change-Id: I28a3353168fd7ed94df89acbcc76893ddfa2a867
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201206010855
Qt Submodule Update Bot [Thu, 31 May 2012 19:06:48 +0000 (05:06 +1000)]
Updated submodules.

Change-Id: I5df103be25453280cdcf5807336546cbf833f133
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201205310034
Qt Submodule Update Bot [Wed, 30 May 2012 11:58:30 +0000 (21:58 +1000)]
Updated submodules.

Change-Id: I316b2b51e3fc6c47106e467fb0d88a10bcdaf245
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201205290631
Qt Submodule Update Bot [Mon, 28 May 2012 19:07:40 +0000 (05:07 +1000)]
Updated submodules.

Change-Id: I3578d99ff1b522b84bb7b1e5a146dea8c4680e9e
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201205281652
Qt Submodule Update Bot [Mon, 28 May 2012 06:09:46 +0000 (16:09 +1000)]
Updated submodules.

Change-Id: I2ac6eb7166756b0fde9a890e7344d7a574ca6d0b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoWebKit update that includes build fix master_201205280617
Simon Hausmann [Sun, 27 May 2012 19:55:28 +0000 (21:55 +0200)]
WebKit update that includes build fix

Change-Id: Ia9e2bd9ec5f3efe804b1cb6e3d5705692752f119
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoUpdated submodules. master_201205271532
Qt Submodule Update Bot [Sun, 27 May 2012 03:04:16 +0000 (13:04 +1000)]
Updated submodules.

Change-Id: I6a99d4b30d4086ea6800f28baf739a4c4993316a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
8 years agoUpdated submodules. master_201205270040
Qt Submodule Update Bot [Sat, 26 May 2012 11:06:32 +0000 (21:06 +1000)]
Updated submodules.

Change-Id: I67a552a66fef59f25b08493593c353aadefbda05
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
8 years agoUpdated submodules. master_201205260406
Qt Submodule Update Bot [Fri, 25 May 2012 11:07:25 +0000 (21:07 +1000)]
Updated submodules.

Change-Id: I3c804ae3da2737bec6f37ef523a3b95bb3be47ad
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated WebKit to a newer snapshot that builds
Simon Hausmann [Fri, 25 May 2012 14:13:44 +0000 (16:13 +0200)]
Updated WebKit to a newer snapshot that builds

Also removed the --no-netscape-plugin part, because the WebKit build system
now detects whether it supports plugins or not (on X11 it sort of does).

Change-Id: I4aa4517d175de24efdf67593d9c6212ccb893086
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoqt.pro: change qtfeedback dependency on qtmultimedia to optional. master_201205230834
Toby Tomkins [Thu, 17 May 2012 05:10:49 +0000 (15:10 +1000)]
qt.pro: change qtfeedback dependency on qtmultimedia to optional.

qtfeeback currently has a hard dependency on qtmultimedia. qtfeedback
only uses multimedia in the mmk plugin. This change modifies the build
system only as all the required infrastructure changes in qtfeedback
are already present.

Change-Id: Ie9884dfd51fb040cde3e29247f1f51ea7f0bd637
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
8 years agoqt.pro: Fix dependencies for qtgraphicaleffects.
Toby Tomkins [Thu, 17 May 2012 04:18:38 +0000 (14:18 +1000)]
qt.pro: Fix dependencies for qtgraphicaleffects.

Change-Id: If96ee9b43cafbe3139234fa4ce822d282e7cff43
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
8 years agoUpdated submodules. master_201205230147
Qt Submodule Update Bot [Tue, 22 May 2012 11:00:12 +0000 (21:00 +1000)]
Updated submodules.

Change-Id: Ic6b525dafe4436f17a870b69bd07caf3625ef363
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205221405
Qt Submodule Update Bot [Tue, 22 May 2012 03:12:09 +0000 (13:12 +1000)]
Updated submodules.

Change-Id: I30d3e4549515ce82cf63006cbeff06e6ea4b7a00
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205161851
Qt Submodule Update Bot [Wed, 16 May 2012 07:21:43 +0000 (17:21 +1000)]
Updated submodules.

Change-Id: I7a10dca9ee8bc2158e9d211feb4005a29fb7b419
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoFix Qt Location dependencies. master_201205151729
Aaron McCarthy [Tue, 8 May 2012 04:43:41 +0000 (14:43 +1000)]
Fix Qt Location dependencies.

Qt Location has a soft dependency on qtjsondb.

Declare a new soft dependency on qtsystems.  This dependency is
dependent on whether location shifting support for China is
enabled.  By default it is not.

Change-Id: Id41451adb14e3c6cee0728ff343be85399fc4ac5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201205151237
Rohan McGovern [Tue, 15 May 2012 01:50:38 +0000 (11:50 +1000)]
Updated submodules.

qtdeclarative was held back to omit
35dd4cbd3 "Remove QtDeclarative compatibility module", which causes some
regressions still pending fixes.

Change-Id: I47e8da3a178579ac4c05feb66db9cfafc0fe64d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205141020
Qt Submodule Update Bot [Sun, 13 May 2012 19:07:36 +0000 (05:07 +1000)]
Updated submodules.

Change-Id: Iae16a14cf831b35bfc58a4b14f2bc109b27b6813
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205131348
Qt Submodule Update Bot [Sun, 13 May 2012 03:02:29 +0000 (13:02 +1000)]
Updated submodules.

Change-Id: Idf4acd4b44261fed883c456b77e442a4234aa746
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205120859
Qt Submodule Update Bot [Fri, 11 May 2012 19:05:53 +0000 (05:05 +1000)]
Updated submodules.

Change-Id: I432843fa50648b25b3bc6f172068dfb5a23af937
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdate WebKit to include QDeclarative* -> QQml* build fixes from Kent master_201205120209
Simon Hausmann [Fri, 11 May 2012 07:44:31 +0000 (09:44 +0200)]
Update WebKit to include QDeclarative* -> QQml* build fixes from Kent

Change-Id: Ie7a4018bed545a1e531b16fd163ff76fd73e3b3b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
8 years agoRemove dependency of qttools on qtscript from qt.pro.
Friedemann Kleint [Fri, 11 May 2012 07:23:38 +0000 (09:23 +0200)]
Remove dependency of qttools on qtscript from qt.pro.

The experimental scripting feature of QtUiLoader was removed.

Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201205110526
Qt Submodule Update Bot [Thu, 10 May 2012 19:06:33 +0000 (05:06 +1000)]
Updated submodules.

Change-Id: Ia4e416b1f43988378fe8d5e90c3fc6e724517176
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated WebKit to a new (building) snapshot master_201205080213
Simon Hausmann [Mon, 7 May 2012 09:25:28 +0000 (11:25 +0200)]
Updated WebKit to a new (building) snapshot

Change-Id: I741623aa5eb79f27f2be8a49e8e427e21eb6d546
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
8 years agoUpdated submodules. master_201205071329
Qt Submodule Update Bot [Mon, 7 May 2012 03:03:07 +0000 (13:03 +1000)]
Updated submodules.

Change-Id: I0ab8650f7b5f700f5362eae4e652476d9b6801d1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205061012
Qt Submodule Update Bot [Sat, 5 May 2012 19:03:46 +0000 (05:03 +1000)]
Updated submodules.

Change-Id: Ib77d8a94b6f66d212ce98f5b8847a8baa095371e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205060045
Qt Submodule Update Bot [Sat, 5 May 2012 11:04:58 +0000 (21:04 +1000)]
Updated submodules.

Change-Id: I10cd81046c17148437dccd87f3861c171cda6a6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoremove pointless $$IN_PWD/ prefixes on subdirs master_201205051923
Oswald Buddenhagen [Thu, 3 May 2012 19:02:59 +0000 (21:02 +0200)]
remove pointless $$IN_PWD/ prefixes on subdirs

Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201205050550
Qt Submodule Update Bot [Fri, 4 May 2012 19:10:06 +0000 (05:10 +1000)]
Updated submodules.

Change-Id: I88442f81edb4464cc88ac7c970333e7e59f1d200
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201205041401
Qt Submodule Update Bot [Fri, 4 May 2012 03:16:52 +0000 (13:16 +1000)]
Updated submodules.

Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
8 years agoUpdated submodules. master_201205031759
Qt Submodule Update Bot [Thu, 3 May 2012 07:37:37 +0000 (17:37 +1000)]
Updated submodules.

Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoRemove unnecessary rules for .gitignore master_201204242336
Yuchen Deng [Sun, 8 Apr 2012 09:58:31 +0000 (17:58 +0800)]
Remove unnecessary rules for .gitignore

Change-Id: I07293521a4088593750f08a298160e9b476a9d73
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
8 years agoSupport the --continue option, ignoring build failures master_201204210310
Marius Storm-Olsen [Mon, 9 Apr 2012 19:10:20 +0000 (14:10 -0500)]
Support the --continue option, ignoring build failures

Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoFollow -j [n] documentation, where no [n] means unlimited
Marius Storm-Olsen [Mon, 9 Apr 2012 16:02:53 +0000 (11:02 -0500)]
Follow -j [n] documentation, where no [n] means unlimited

Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoClean up exit/die/return mess for exe*()
Marius Storm-Olsen [Mon, 9 Apr 2012 03:25:26 +0000 (22:25 -0500)]
Clean up exit/die/return mess for exe*()

The exe*() functions were inconsistent of where they exited. So, make
sure that all exe*() confesses upon errors, and let the calling
functions use eval{} to avoid the exception when needed.

Change-Id: Ia6e4edb22a83ac32d924b792e8a2eea657a6a149
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoFix copy'n'paste and code move bugs
Marius Storm-Olsen [Mon, 9 Apr 2012 02:30:17 +0000 (21:30 -0500)]
Fix copy'n'paste and code move bugs

Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
8 years agoAdd documentation for the build script
Marius Storm-Olsen [Sat, 7 Apr 2012 03:44:30 +0000 (22:44 -0500)]
Add documentation for the build script

Change-Id: I59fdf997971b0fbb2e4b41a18735fe72215e21c1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
8 years agoAdd --dry-run option to build script
Marius Storm-Olsen [Sat, 7 Apr 2012 03:26:03 +0000 (22:26 -0500)]
Add --dry-run option to build script

The --dry-run option (-n for short) also allows levels of dry-run, where
the first level just shows what the build script itself will do. However
if you -n 2, then it will recurse the dry-run to the make as well, so
you can get a full dry-run of everything.

Change-Id: I3a3c8a844411219e7afe6a570bc9ef6718ba472f
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoJust move functions closer to their logical place in the code
Marius Storm-Olsen [Sat, 7 Apr 2012 03:20:13 +0000 (22:20 -0500)]
Just move functions closer to their logical place in the code

Makes it easier to read the code

Change-Id: I71ed3affa3d3fe4e2b782898c78f1c1a97371d26
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agooverride the remote refs only for /heads/ master_201204201952
Oswald Buddenhagen [Wed, 18 Apr 2012 13:43:23 +0000 (15:43 +0200)]
override the remote refs only for /heads/

it's possible to add more refs, which makes git refuse to update the
configuration unless a value pattern to overwrite is specified.

Change-Id: I326c05a8ed200339bf8f3f45032409150570538c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agobe explicit about qtbase/configure failing
Oswald Buddenhagen [Tue, 10 Apr 2012 08:06:03 +0000 (10:06 +0200)]
be explicit about qtbase/configure failing

so one has a base directory for paths it reports.

Task-number: QTBUG-25190
Change-Id: Ib222e2d7b07bf986a9eccd6934e51574b5a5a052
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
8 years agoUpdated submodules. master_201204171821
Qt Submodule Update Bot [Tue, 17 Apr 2012 07:10:39 +0000 (17:10 +1000)]
Updated submodules.

Change-Id: Iee405a2fc2ec148a1807752270d692e30a6d01a5
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
8 years agoUpdated submodules. master_201204170933
Qt Submodule Update Bot [Mon, 16 Apr 2012 22:12:40 +0000 (08:12 +1000)]
Updated submodules.

Change-Id: I2ff258da4c471556c58008035f13f0aadfae2635
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>