aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Updated submodules.Qt Submodule Update Bot2012-05-1212-0/+0
| | | | | Change-Id: I432843fa50648b25b3bc6f172068dfb5a23af937 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Update WebKit to include QDeclarative* -> QQml* build fixes from KentSimon Hausmann2012-05-111-0/+0
| | | | | Change-Id: Ie7a4018bed545a1e531b16fd163ff76fd73e3b3b Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Remove dependency of qttools on qtscript from qt.pro.Friedemann Kleint2012-05-111-1/+1
| | | | | | | The experimental scripting feature of QtUiLoader was removed. Change-Id: Ied8ae2210815642ff6cc19f3546829736d5edacd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-1022-0/+0
| | | | | Change-Id: Ia4e416b1f43988378fe8d5e90c3fc6e724517176 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated WebKit to a new (building) snapshotSimon Hausmann2012-05-071-0/+0
| | | | | Change-Id: I741623aa5eb79f27f2be8a49e8e427e21eb6d546 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-073-0/+0
| | | | | Change-Id: I0ab8650f7b5f700f5362eae4e652476d9b6801d1 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-061-0/+0
| | | | | Change-Id: Ib77d8a94b6f66d212ce98f5b8847a8baa095371e Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-052-0/+0
| | | | | Change-Id: I10cd81046c17148437dccd87f3861c171cda6a6a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* remove pointless $$IN_PWD/ prefixes on subdirsOswald Buddenhagen2012-05-051-28/+28
| | | | | | Change-Id: I26aac3952e9e2dea05be7db6300a5f97b44fe6e7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-0413-0/+0
| | | | | Change-Id: I88442f81edb4464cc88ac7c970333e7e59f1d200 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-0414-0/+0
| | | | | Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-05-0325-0/+0
| | | | | Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unnecessary rules for .gitignoreYuchen Deng2012-04-241-258/+1
| | | | | | Change-Id: I07293521a4088593750f08a298160e9b476a9d73 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Support the --continue option, ignoring build failuresMarius Storm-Olsen2012-04-201-6/+25
| | | | | Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Follow -j [n] documentation, where no [n] means unlimitedMarius Storm-Olsen2012-04-201-6/+8
| | | | | Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Clean up exit/die/return mess for exe*()Marius Storm-Olsen2012-04-201-13/+16
| | | | | | | | | 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>
* Fix copy'n'paste and code move bugsMarius Storm-Olsen2012-04-201-2/+2
| | | | | | Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Add documentation for the build scriptMarius Storm-Olsen2012-04-201-0/+67
| | | | | | Change-Id: I59fdf997971b0fbb2e4b41a18735fe72215e21c1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Add --dry-run option to build scriptMarius Storm-Olsen2012-04-201-13/+24
| | | | | | | | | | | 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>
* Just move functions closer to their logical place in the codeMarius Storm-Olsen2012-04-201-56/+56
| | | | | | | | 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>