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
409 Commits 118 Branches 270 Tags
c5e269cc9f3611dc59d793ea0dfd8dd2d1255abe
Commit Graph

409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius Storm-Olsen
c5e269cc9f Fix readme to instruct building with the build script instead 
Also, on Windows the build script adds the gnuwin32\bin directory, so
we don't need that part in the readme

Change-Id: I36ac9ebef9ce8b74fa75f63be7243bb334512a32
 2012-03-28 05:48:40 -05:00
Marius Storm-Olsen
e0128ca376 Clean up build script 
Remove loading of thread modules. Not core module, and we don't use
them.

Return value of system command.

Add --force-qmake option, and by default avoid running qmake when a
Makefile already exists.

Do not pass '-j 1' unless explicit on the command line, and pick up
'MAKE' environment variable. (Thiago)

Remove usage of File::Which, as it's not a core module, and often not
present on host machines. (Peppe)

Remove '-s' or '/s' optin to make/nmake, as we cannot see how far we
have compiled, and we only get warnings/errors.

Change the qtwebkit build command, and add separate command for
installing qtwebkit. Also add the required build tools for WebKit
on Windows.

Change-Id: I79bffa39a13ece78fa401f39a38a1ccaf0f389b0
 2012-03-27 22:49:31 -05:00
Qt Submodule Update Bot
712875dc29 Updated submodules. 
Change-Id: I707e32535dacae1ec16226c0028c28efaf20b900
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-27 09:06:34 +02:00
Marius Storm-Olsen
b60fa530d9 Add build script for Qt 5 
The build script will build each module individually, and install them
if needed, in the correct order.

Change-Id: I9416e624b080b8b25241270e909bd120a4028137
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-03-26 21:24:44 +02:00
Qt Submodule Update Bot
707e32535d Updated submodules. 
Change-Id: I1a121f1cb7f3188c94befbfae4418a6e5c9347e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-26 09:15:19 +02:00
Qt Submodule Update Bot
1a121f1cb7 Updated submodules. 
Change-Id: I8da3febd53b31c259ab1195ce842255f5ee2ab84
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-26 00:47:17 +02:00
Qt Submodule Update Bot
8da3febd53 Updated submodules. 
Change-Id: Ib7e524a79be2e5ba102b2009e5c453dcc8fdb2c9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-25 12:42:05 +02:00
Qt Submodule Update Bot
b7e524a79b Updated submodules. 
Change-Id: Id1a90d200b4a99e91e3fbdaf4e1cd8408a875364
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-24 00:52:14 +01:00
Qt Submodule Update Bot
d1a90d200b Updated submodules. 
Change-Id: I10fe94d265413c52a958d4c5e4419d97b927df8e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-22 23:37:56 +01:00
Marius Storm-Olsen
8320adcfa0 Add required dependencies for wayland module 
Change-Id: I3ca4e23052f93a57466045af1f76b3a36a7e2231
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
 2012-03-22 06:29:04 +01:00
Marius Storm-Olsen
c04675aab8 Only add dependency to qtactiveqt if it's available 
Don't need to be platform specific about it.

Change-Id: I3ca981ec03b977961afaa18f09cde10b8b99c64e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-03-21 14:39:14 +01:00
Qt Submodule Update Bot
10fe94d265 Updated submodules. 
Change-Id: I7d0327830bb4768753cb0c14a23d98fed08be7d2
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-21 10:37:10 +01:00
Qt Submodule Update Bot
7d0327830b Updated submodules. 
Change-Id: I443a0d2e8e365e930feb5df460576c815e8e78ea
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-21 05:26:11 +01:00
Friedemann Kleint
ad32d4f847 Fix README for the Alpha release. 
Add more platform-specific information and commands.

Change-Id: I54e5e8692b16330bf4d9316eaef0de5c895ec147
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 2012-03-20 14:42:50 +01:00
Qt Submodule Update Bot
443a0d2e8e Updated submodules. 
Change-Id: I90ec097148dff321fa161ceec41c4d2cf3a7eee0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-20 08:40:01 +01:00
Qt Submodule Update Bot
90ec097148 Updated submodules. 
Change-Id: I41be8112dd411bb5734ba177c5391c75dd98b0d3
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-19 16:59:08 +01:00
Qt Submodule Update Bot
41be8112dd Updated submodules. 
Change-Id: I322ee6fd14717802a1f15c38e9c0ee04674879b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-15 08:07:12 +01:00
Qt Submodule Update Bot
322ee6fd14 Updated submodules. 
Change-Id: I5a53de661c70041bca39a7c27666f299c04d7ccb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-14 06:10:28 +01:00
Sergio Ahumada
ae4d6b9313 init-repository: mark as requiring perl 5.8 
This script also works with perl 5.8, so changing the minumum requirement
from v5.10 to v5.8.

Change-Id: Ia5e59f929bca3e795da015830aeae7ef0d7067e0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-03-14 02:40:10 +01:00
Qt Submodule Update Bot
5a53de661c Updated submodules. 
Change-Id: Ib652510287f21697d673b007e7354e51248dbd7b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-03-13 23:19:34 +01:00
Qt Submodule Update Bot
b652510287 Updated submodules. 
Change-Id: I1d8dd4cffc93d619de473f3b9082923bfeaa5eab
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-13 09:05:41 +01:00
Toby Tomkins
e3c8992fae QtSVG: Add dependency to declarative and quick1 if qtsvg is available. 
Currently there is a soft dependency on qtsvg that causes a build of
qt5 to have unknown build order for qtsvg and other modules. This
change makes it a hard dependency if the qtsvg module is available.

Change-Id: Ic58a63f3f5f1d813ba832455c1ad3af41599926b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
 2012-03-13 02:47:16 +01:00
Qt Submodule Update Bot
1d8dd4cffc Updated submodules. 
Change-Id: Ibb28a5b1ba12a5d88da14245e15080e04942141d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-12 23:47:38 +01:00
Simon Hausmann
5df54ad846 Update WebKit 
Includes build fixes for latest API changes in qtbase/qtdeclarative as
well as the final QML2 API.

Change-Id: Ia3023c1dcd45b6acdcf71e4659fe81231740c344
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-03-12 14:16:44 +01:00
Qt Submodule Update Bot
bb28a5b1ba Updated submodules. 
Change-Id: I98a9eedf8fad52cc719e99041cec716171573145
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-12 08:24:21 +01:00
Qt Submodule Update Bot
98a9eedf8f Updated submodules. 
Change-Id: I5ef268c784a65ed24332dfea1769e66b7b476a55
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-12 01:06:50 +01:00
Qt Submodule Update Bot
5ef268c784 Updated submodules. 
Change-Id: I944f23b42b16ec81dc01a8d5b6d958153c277edb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-11 00:35:05 +01:00
Marius Storm-Olsen
aa431f407f Don't try to unlink non-existing alternates file 
If you clone using alternates, but the checkout you are using as
alternates does not have a submodule, there will be no alternates
file for this submodule.

Change-Id: Ibd9ed5454459587b6df9d420af4d66d61f4317ca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-03-09 21:14:07 +01:00
Qt Submodule Update Bot
944f23b42b Updated submodules. 
Change-Id: I0f86b327e4c71dcd811472a53c0b685eb6cbe0e1
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-09 18:36:14 +01:00
Marius Storm-Olsen
8703d56ab2 WebKit2 is not yet supported on Windows, so avoid trying to build it 
Change-Id: If514bae79364def9fd3138c088e2cac98cac4a91
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-03-09 12:31:24 +01:00
Marius Storm-Olsen
610bb3545d Don't try to compile wayland on Windows or Mac, even if checked out 
Change-Id: Ie66430e661b54aea4d17eb6e2e0fb7a351d62d97
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
 2012-03-08 22:18:14 +01:00
Qt Submodule Update Bot
0f86b327e4 Updated submodules. 
Change-Id: Ifae64ac90b68532d159e692fddd42afbc36132a2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-08 08:34:07 +01:00
Qt Submodule Update Bot
fae64ac90b Updated submodules. 
Change-Id: I5efc1e72fe916bbab53ed07c472dc82546856cde
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-03-08 03:36:55 +01:00
Qt Submodule Update Bot
5efc1e72fe Updated submodules. 
Change-Id: I56f438fe18408c99f6a3e46b75e96b5004f1e087
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-05 02:43:01 +01:00
Qt Submodule Update Bot
56f438fe18 Updated submodules. 
Change-Id: I6868b56e525ca71c281011c1faf0cd7dc4393c91
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-03-04 09:04:57 +01:00
Qt Submodule Update Bot
6868b56e52 Updated submodules. 
Change-Id: Ibc8806c07b28499d11677fa36710a3eee5791763
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
 2012-03-03 09:24:16 +01:00
Sergio Ahumada
d3a8758a8c Added new module, qtgraphicaleffects. 
Not yet enabled by default.

Change-Id: I96d770c504281c8e6bb452d6742ea555c1c7405c
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-03 00:53:12 +01:00
Qt Submodule Update Bot
bc8806c07b Updated submodules. 
Change-Id: I92c6ddea46d94f3f7106da6fa436fb41f7cb4197
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-03-01 09:44:31 +01:00
Toby Tomkins
d3be383a0c QtLocation: Add hard dependency on qtjsondb to qtlocation. 
Currently there is a soft dependency on qtjsondb. This change makes it
a hard dependency.

Change-Id: Iba29c91093c3c6c67c4121f6f220e62686708040
Reviewed-by: abcd <amos.choy@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
 2012-03-01 05:48:07 +01:00
Qt Submodule Update Bot
92c6ddea46 Updated submodules. 
Change-Id: Iace98c78bd5080dc4108c908063e6b890aeebb38
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
 2012-02-29 09:20:55 +01:00
Qt Submodule Update Bot
ace98c78bd Updated submodules. 
Change-Id: I110218ff59ff5e0099865dc1f33a0cc7e78fdbf1
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-29 00:59:11 +01:00
Qt Submodule Update Bot
110218ff59 Updated submodules. 
Change-Id: I799b0f5184f42d18c8b683c5bd355e52ff1a4b9c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-28 08:50:05 +01:00
Qt Submodule Update Bot
799b0f5184 Updated submodules. 
Change-Id: I5fd4066161c909463c14a2f59ba2d726c1a1d78a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-28 03:48:51 +01:00
Qt Submodule Update Bot
5fd4066161 Updated submodules. 
Change-Id: I08116e00e55d3d65864f4bc00a60defec1543cb6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-02-27 23:28:55 +01:00
Qt Submodule Update Bot
08116e00e5 Updated submodules. 
Change-Id: I04da6363036806d35f4b049c6931f7d8634cb61d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-27 08:09:52 +01:00
Qt Submodule Update Bot
04da636303 Updated submodules. 
Change-Id: I08c07fbadb501b0d93452d81a47c0a0b4af64fa2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-27 00:14:06 +01:00
Qt Submodule Update Bot
08c07fbadb Updated submodules. 
Change-Id: I2c614ce9b8bd078660e5b6955a2af1faa79a043c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-26 00:52:44 +01:00
Qt Submodule Update Bot
2c614ce9b8 Updated submodules. 
Change-Id: Ie5acb7022476ecaef8f7899632092de739df897b
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-25 09:46:02 +01:00
Qt Submodule Update Bot
e5acb70224 Updated submodules. 
Change-Id: I7f8c9b7eaf9efcda699d4f170cb72f5c2cb71a1d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2012-02-25 01:21:51 +01:00
Simon Hausmann
5de3da997e Update WebKit 
This brings WebKit in sync with the latest Qt 5 API and behavioural changes.

Change-Id: Ia0b2b3ad8f4db82ad39675912f6a168ad3ed6ae6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
 2012-02-24 16:40:07 +01:00