Commit Graph

509 Commits

Author SHA1 Message Date
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
Lars Knoll
008a5daf77 Cleanup build dependencies
Change-Id: Ibee6b46db3c10d80790af170470dd3439e1b6f88
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-06-07 01:10:12 +02:00
Jyri Tahtela
c9ac88fec8 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>
2012-06-07 00:37:01 +02:00
Qt Submodule Update Bot
40f8c17b0f Updated submodules.
Change-Id: I2bd9baf5193b93c048c7fe3ee0a4c27f15a20642
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-06-05 13:14:20 +02:00
Qt Submodule Update Bot
2bd9baf519 Updated submodules.
Change-Id: I3f0b6f886b36befe64fee98af3fa4d4617b41170
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-06-04 21:28:21 +02:00
Qt Submodule Update Bot
3f0b6f886b Updated submodules.
Change-Id: Ifa716b77c11c4bbc59e92540d166f65887ed7d74
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-06-04 13:23:32 +02:00
Tasuku Suzuki
5c14da5a7b 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>
2012-06-02 08:49:55 +02:00
Qt Submodule Update Bot
fa716b77c1 Updated submodules.
Change-Id: I03000b0a8af2c5947fb0b7a36f5c4aaaae85cab6
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-06-02 08:49:37 +02:00
Simon Hausmann
530f63916b 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>
2012-06-01 22:34:45 +02:00
Qt Submodule Update Bot
03000b0a8a Updated submodules.
Change-Id: Ic52bc09b9afa99140b8f6858bf63347e1adf1576
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-06-01 16:24:33 +02:00
Simon Hausmann
97ef09db37 WebKit update
Change-Id: I925f1d2cf4322b3db6848534d0fe2f18bd8183a2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-06-01 11:42:33 +02:00
Qt Submodule Update Bot
c52bc09b9a Updated submodules.
Change-Id: I28a3353168fd7ed94df89acbcc76893ddfa2a867
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-01 06:48:20 +02:00
Qt Submodule Update Bot
28a3353168 Updated submodules.
Change-Id: I5df103be25453280cdcf5807336546cbf833f133
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-06-01 00:36:15 +02:00
Qt Submodule Update Bot
5df103be25 Updated submodules.
Change-Id: I316b2b51e3fc6c47106e467fb0d88a10bcdaf245
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-30 16:07:24 +02:00
Qt Submodule Update Bot
316b2b51e3 Updated submodules.
Change-Id: I3578d99ff1b522b84bb7b1e5a146dea8c4680e9e
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-28 22:12:49 +02:00
Qt Submodule Update Bot
3578d99ff1 Updated submodules.
Change-Id: I2ac6eb7166756b0fde9a890e7344d7a574ca6d0b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-28 08:33:11 +02:00
Simon Hausmann
d412547ef3 WebKit update that includes build fix
Change-Id: Ia9e2bd9ec5f3efe804b1cb6e3d5705692752f119
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-05-27 21:57:51 +02:00
Qt Submodule Update Bot
2ac6eb7166 Updated submodules.
Change-Id: I6a99d4b30d4086ea6800f28baf739a4c4993316a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-05-27 07:14:11 +02:00
Qt Submodule Update Bot
6a99d4b30d Updated submodules.
Change-Id: I67a552a66fef59f25b08493593c353aadefbda05
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-05-26 16:22:06 +02:00
Qt Submodule Update Bot
67a552a66f Updated submodules.
Change-Id: I3c804ae3da2737bec6f37ef523a3b95bb3be47ad
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-25 19:01:04 +02:00
Simon Hausmann
8c37b00fbd 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>
2012-05-25 19:00:30 +02:00
Toby Tomkins
9985003ac4 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>
2012-05-23 00:15:45 +02:00
Toby Tomkins
0c57b507f3 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>
2012-05-23 00:15:45 +02:00
Qt Submodule Update Bot
3c804ae3da Updated submodules.
Change-Id: Ic6b525dafe4436f17a870b69bd07caf3625ef363
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-22 13:33:33 +02:00
Qt Submodule Update Bot
c6b525dafe Updated submodules.
Change-Id: I30d3e4549515ce82cf63006cbeff06e6ea4b7a00
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-22 05:18:20 +02:00
Qt Submodule Update Bot
30d3e45495 Updated submodules.
Change-Id: I7a10dca9ee8bc2158e9d211feb4005a29fb7b419
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-05-16 09:52:10 +02:00
Aaron McCarthy
4b497e1de4 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>
2012-05-15 09:10:56 +02:00
Rohan McGovern
f1409e7b02 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>
2012-05-15 04:18:42 +02:00
Qt Submodule Update Bot
47e8da3a17 Updated submodules.
Change-Id: Iae16a14cf831b35bfc58a4b14f2bc109b27b6813
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-14 02:02:10 +02:00
Qt Submodule Update Bot
ae16a14cf8 Updated submodules.
Change-Id: Idf4acd4b44261fed883c456b77e442a4234aa746
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-05-13 05:30:21 +02:00
Qt Submodule Update Bot
df4acd4b44 Updated submodules.
Change-Id: I432843fa50648b25b3bc6f172068dfb5a23af937
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-12 00:38:12 +02:00
Simon Hausmann
5146b9449d Update WebKit to include QDeclarative* -> QQml* build fixes from Kent
Change-Id: Ie7a4018bed545a1e531b16fd163ff76fd73e3b3b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-05-11 17:23:39 +02:00
Friedemann Kleint
f40f4bb6d7 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>
2012-05-11 17:06:44 +02:00
Qt Submodule Update Bot
432843fa50 Updated submodules.
Change-Id: Ia4e416b1f43988378fe8d5e90c3fc6e724517176
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-05-10 21:08:58 +02:00