aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2012-07-039-0/+0
| | | | | Change-Id: Ia5eb50d59cb1465bb1c28c1e29212bf4f188d0cc Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-036-0/+0
| | | | | Change-Id: Ic6fba546d194cef5b538a33e444330c28d64684c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-035-0/+0
| | | | | Change-Id: Ib18a0dcff0d2bcaf249fddf9aa73469d23f3c694 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-029-0/+0
| | | | | Change-Id: I758fc0b6db4d360ea5ea3d0e814b0212aa2fe8ac Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-022-0/+0
| | | | | Change-Id: Ic1e727e30db05eda41f7f7ecf7c248ad9b6390d9 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-011-0/+0
| | | | | Change-Id: I5ac094341e0fb108507b9375f16c12814e52a00a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-07-011-0/+0
| | | | | Change-Id: I6e0b3836f392b1c5fdb4f2c06113c1649e1404ec Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-302-0/+0
| | | | | Change-Id: I677c8c5b68bc779ffdf1d755fe764cd4394f5caf Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-309-0/+0
| | | | | Change-Id: I94e7f7bcb98cb8543505d2e8c43cd0021604b354 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Enabled installation of QtGraphicalEffects add-on module.Marko Niemelä2012-06-291-2/+0
| | | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-06-2926-0/+0
| | | | | Change-Id: I78b8403e415e7e8d9405daebc9619c4a7cb85910 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* create top-level .qmake.super instead of .qmake.cacheOswald Buddenhagen2012-06-292-4/+3
| | | | | | | | | | 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>
* webkit-examples depends on qttools (uitools)Oswald Buddenhagen2012-06-291-6/+7
| | | | | Change-Id: I4e94785003feedd7db904eec659bb5794a7b433b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* remove stale workaround for circular dependencyOswald Buddenhagen2012-06-291-2/+1
| | | | | | | webkit does not depend on quick1 anymore Change-Id: I6e813dd773e37c4fed66a8ff096c77365c64fcb2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* fix SUBDIRS sorting according to dependencies againOswald Buddenhagen2012-06-291-1/+1
| | | | | | | quick1 depends on tools now Change-Id: I1575c03af2e6af1244f75d3c9e72481536d1a913 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update WebKitSimon Hausmann2012-06-192-3/+12
| | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-06-1925-0/+0
| | | | | Change-Id: I40f8c17b0f1e85cad0794c348c2aca043fc2ece8 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated qtquick1, qttools.Rohan McGovern2012-06-132-0/+0
| | | | | | | | | | | | | 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>
* Fix dependencies between quick1 and toolsLars Knoll2012-06-131-3/+3
| | | | | Change-Id: I80ace901a2fc57f72ce9bb1d20cfa90f3faa1870 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qtquick1 now depends on qttools, not the other way roundLars Knoll2012-06-082-5/+9
| | | | | | | | 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>
* Remove doc gallery dependency onto QtScriptLars Knoll2012-06-071-1/+1
| | | | | Change-Id: Ide27d6e19a386ce1af5ee4b44b3366aaa430546c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Cleanup build dependenciesLars Knoll2012-06-071-3/+3
| | | | | Change-Id: Ibee6b46db3c10d80790af170470dd3439e1b6f88 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Qt5: change wiki address in READMEJyri Tahtela2012-06-071-1/+1
| | | | | | | Fix old wiki address to point to new wiki. Change-Id: Ia5361288cb0afd9ef172b669e894d6a61ca831da Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-058-0/+0
| | | | | Change-Id: I2bd9baf5193b93c048c7fe3ee0a4c27f15a20642 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-045-0/+0
| | | | | Change-Id: I3f0b6f886b36befe64fee98af3fa4d4617b41170 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-049-0/+0
| | | | | Change-Id: Ifa716b77c11c4bbc59e92540d166f65887ed7d74 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* qt.pro: update modules dependency on qtxmlpatternsTasuku Suzuki2012-06-021-5/+11
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-06-026-0/+0
| | | | | Change-Id: I03000b0a8af2c5947fb0b7a36f5c4aaaae85cab6 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Update WebKitSimon Hausmann2012-06-011-0/+0
| | | | | | | This snapshot should include the fix to do -Werror only in developer builds Change-Id: I5de3494cdf9396d7a734e69d3a44c0195101166f Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-019-0/+0
| | | | | Change-Id: Ic52bc09b9afa99140b8f6858bf63347e1adf1576 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* WebKit updateSimon Hausmann2012-06-011-0/+0
| | | | | Change-Id: I925f1d2cf4322b3db6848534d0fe2f18bd8183a2 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-015-0/+0
| | | | | Change-Id: I28a3353168fd7ed94df89acbcc76893ddfa2a867 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-06-0118-0/+0
| | | | | Change-Id: I5df103be25453280cdcf5807336546cbf833f133 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-3016-0/+0
| | | | | Change-Id: I316b2b51e3fc6c47106e467fb0d88a10bcdaf245 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-286-0/+0
| | | | | Change-Id: I3578d99ff1b522b84bb7b1e5a146dea8c4680e9e Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-287-0/+0
| | | | | Change-Id: I2ac6eb7166756b0fde9a890e7344d7a574ca6d0b Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* WebKit update that includes build fixSimon Hausmann2012-05-271-0/+0
| | | | | Change-Id: Ia9e2bd9ec5f3efe804b1cb6e3d5705692752f119 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-271-0/+0
| | | | | Change-Id: I6a99d4b30d4086ea6800f28baf739a4c4993316a Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-267-0/+0
| | | | | Change-Id: I67a552a66fef59f25b08493593c353aadefbda05 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-2520-0/+0
| | | | | Change-Id: I3c804ae3da2737bec6f37ef523a3b95bb3be47ad Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated WebKit to a newer snapshot that buildsSimon Hausmann2012-05-253-4/+1
| | | | | | | | 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>
* qt.pro: change qtfeedback dependency on qtmultimedia to optional.Toby Tomkins2012-05-231-2/+5
| | | | | | | | | | | 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>
* qt.pro: Fix dependencies for qtgraphicaleffects.Toby Tomkins2012-05-231-1/+1
| | | | | | Change-Id: If96ee9b43cafbe3139234fa4ce822d282e7cff43 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Marko Niemelä <marko.a.niemela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-227-0/+0
| | | | | Change-Id: Ic6b525dafe4436f17a870b69bd07caf3625ef363 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-2223-0/+0
| | | | | Change-Id: I30d3e4549515ce82cf63006cbeff06e6ea4b7a00 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-1615-0/+0
| | | | | Change-Id: I7a10dca9ee8bc2158e9d211feb4005a29fb7b419 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix Qt Location dependencies.Aaron McCarthy2012-05-151-2/+7
| | | | | | | | | | | 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>
* Updated submodules.Rohan McGovern2012-05-1513-0/+0
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-05-141-0/+0
| | | | | Change-Id: Iae16a14cf831b35bfc58a4b14f2bc109b27b6813 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-133-0/+0
| | | | | Change-Id: Idf4acd4b44261fed883c456b77e442a4234aa746 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>