lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
492 Commits 118 Branches 270 Tags
008a5daf776ba719c995d15a4e8e2f36f1003366
Commit Graph

492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Hausmann
e51fa873ca Updated WebKit to a new (building) snapshot 
Change-Id: I741623aa5eb79f27f2be8a49e8e427e21eb6d546
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-05-07 17:50:59 +02:00
Qt Submodule Update Bot
a4e416b1f4 Updated submodules. 
Change-Id: I0ab8650f7b5f700f5362eae4e652476d9b6801d1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-05-07 05:11:59 +02:00
Qt Submodule Update Bot
0ab8650f7b Updated submodules. 
Change-Id: Ib77d8a94b6f66d212ce98f5b8847a8baa095371e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-05-06 01:55:13 +02:00
Qt Submodule Update Bot
b77d8a94b6 Updated submodules. 
Change-Id: I10cd81046c17148437dccd87f3861c171cda6a6a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-05-05 16:27:53 +02:00
Oswald Buddenhagen
09a7cd16d9 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>
 2012-05-05 11:06:32 +02:00
Qt Submodule Update Bot
10cd81046c Updated submodules. 
Change-Id: I88442f81edb4464cc88ac7c970333e7e59f1d200
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-05-04 21:33:36 +02:00
Qt Submodule Update Bot
88442f81ed Updated submodules. 
Change-Id: I1968c54d4f7c96d2df40c0e2b416125adf217634
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-05-04 05:36:04 +02:00
Qt Submodule Update Bot
1968c54d4f Updated submodules. 
Change-Id: I6562d7b44dc104c482da1cbf9aaf7b20014da171
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-05-03 09:42:14 +02:00
Yuchen Deng
6d70a4f5cb Remove unnecessary rules for .gitignore 
Change-Id: I07293521a4088593750f08a298160e9b476a9d73
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2012-04-24 15:20:08 +02:00
Marius Storm-Olsen
9894009117 Support the --continue option, ignoring build failures 
Change-Id: I409f6b157cbe9de7c173ac1b8458b06548051db9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-04-20 18:52:01 +02:00
Marius Storm-Olsen
dbf53d1ffb Follow -j [n] documentation, where no [n] means unlimited 
Change-Id: Icf5561d5405418da6fa132e65d460ebb176b6d12
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-04-20 18:51:56 +02:00
Marius Storm-Olsen
8ddc280393 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>
 2012-04-20 18:51:50 +02:00
Marius Storm-Olsen
9fa0f5ddf4 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>
 2012-04-20 18:51:45 +02:00
Marius Storm-Olsen
9be91b36b5 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>
 2012-04-20 18:51:40 +02:00
Marius Storm-Olsen
e400f9d6a6 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>
 2012-04-20 18:51:36 +02:00
Marius Storm-Olsen
3dffd4e710 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>
 2012-04-20 18:51:30 +02:00
Oswald Buddenhagen
1e103533a0 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>
 2012-04-20 11:33:40 +02:00