Compare commits

...

604 Commits

Author SHA1 Message Date
Oswald Buddenhagen
3f2ff8b460 Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
2015-08-14 13:34:32 +02:00
Qt Submodule Update Bot
0d60d720f8 Updated submodules.
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-19 18:49:53 +00:00
Qt Submodule Update Bot
00defc7101 Updated submodules.
Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-31 06:58:29 +00:00
Oswald Buddenhagen
4a5968ce75 Merge branch '5.4' into 5.4.2
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
2015-05-29 20:12:13 +02:00
Oswald Buddenhagen
843a3407f2 Merge tag 'v5.4.1' into 5.4
Qt 5.4.1 Release
2015-05-29 15:53:05 +02:00
Oswald Buddenhagen
5400507252 Merge tag 'v5.4.0' into 5.4
Qt 5.4.0 Release
2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot
210493d641 Updated submodules.
Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot
670466b6a3 Updated submodules.
Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-28 11:33:18 +00:00
Qt Submodule Update Bot
07856d73e1 Updated submodules.
Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot
dfffbfdc26 Updated submodules.
Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot
b62714f88c Updated submodules.
Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot
24f1b3219d Updated submodules.
Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot
f7cb995d04 Updated submodules.
Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot
11963ba9f0 Updated submodules.
Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot
39ce0228da Updated submodules.
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-28 10:58:28 +00:00
Sergio Ahumada
95bb29e243 Replace old qt-project.org wiki with wiki.qt.io
Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot
68b5c48282 Updated submodules.
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-15 09:16:10 +00:00
Oswald Buddenhagen
451f0a193b Adjust submodule branches
Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot
59e3021a52 Updated submodules.
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-09 09:28:44 +00:00
Oswald Buddenhagen
ac6168c0cb use git clone --branch instead of --no-checkout
git submodule update does not cause an actual checkout if HEAD matches
the recorded submodule sha1 even if it was not actually checked out.

it would be possible to work around this by calling git checkout HEAD in
each submodule if no files are checked out, but that seems hacky.

instead, just make the module cloning already check out the desired
branch. this produces checkouts that are within a few commits of the
final sha1, so isn't too bad.

Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7
2015-03-04 12:23:13 +01:00
Qt Submodule Update Bot
e3cd5bb368 Updated submodules.
Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-16 19:57:25 +00:00
Qt Submodule Update Bot
be35b9f9af Updated submodules.
Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-14 11:18:41 +00:00
Qt Submodule Update Bot
0badf61792 Updated submodules.
Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot
98737b388b Updated submodules.
Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-13 04:29:58 +00:00
Qt Submodule Update Bot
9fb1a2e12f Updated submodules.
Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot
b71478c424 Updated submodules.
Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot
dc93c0d4d7 Updated submodules.
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:23 +00:00
Oswald Buddenhagen
34c7caab3f don't fetch again when updating submodules
we already did it a moment ago.

this should affect only the --remote case, but there is no harm in
always specifying it.

Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:10 +00:00
Oswald Buddenhagen
9ebad7830d don't checkout when cloning
we will subsequently do a submodule update with a possibly different
sha1 anyway.

Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:06 +00:00
Oswald Buddenhagen
1ad0a17fa0 make manual fetching sane
it is in no way said that the remote's HEAD will contain the commit to
be checked out - in fact, it's pretty much guaranteed that it won't for
anything but the default branch. fetching the whole remote avoids
additional roundtrips and makes the --branch feature actually work
reasonably.

Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:03 +00:00
Oswald Buddenhagen
d553fc4fa9 always check out the target branch when using --branch
a submodule update with --remote will use the tip of the remote's
branch, but it won't actually switch to the branch if HEAD doesn't point
to it yet.

Change-Id: If13e31da2646683dfb9e832eaab929190acb0167
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2015-02-06 06:23:59 +00:00
Oswald Buddenhagen
b236ef6aef fix --branch without --no-update
clearly, i botched the syntax, but i can't even tell how. that's perl.
the new version is more readable anyway.

Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2015-02-06 06:23:54 +00:00
Qt Submodule Update Bot
81efb6de3c Updated submodules.
Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot
ef1f126ddc Updated submodules.
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-01-29 04:28:53 +00:00
Oswald Buddenhagen
c3a6185b7e Adjust submodule branches
Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
2015-01-08 12:53:09 +01:00
Qt Submodule Update Bot
0163cb617a Updated submodules.
Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-23 11:41:25 +01:00
Qt Submodule Update Bot
9ca0c52513 Updated submodules.
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-15 08:29:57 +01:00
Qt Submodule Update Bot
3439140073 Updated submodules.
Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot
1998742cea Updated submodules.
Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot
a68a6b964f Updated submodules.
Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-12-02 12:15:22 +01:00
Oswald Buddenhagen
663f814c24 adjust submodule branch names for 5.4 branch
Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-12-02 12:15:15 +01:00
Qt Submodule Update Bot
b1885ea725 Updated submodules.
Change-Id: I338ee26271c05b612fc58381270ca471db12aaef
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-27 06:41:45 +01:00
Oswald Buddenhagen
6040cb2ff5 Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
2014-11-25 18:00:25 +01:00
Qt Submodule Update Bot
338ee26271 Updated submodules.
Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-25 05:39:27 +01:00
Qt Submodule Update Bot
77f387bc89 Updated submodules.
Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-21 09:26:31 +01:00
Qt Submodule Update Bot
968f8a2a5e Updated submodules.
Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-20 09:02:53 +01:00
Qt Submodule Update Bot
7c0bc23056 Updated submodules.
Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-20 07:00:26 +01:00
Qt Submodule Update Bot
4b19950128 Updated submodules.
Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-19 05:46:17 +01:00
Qt Submodule Update Bot
96d903eec0 Updated submodules.
Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-12 22:35:27 +01:00
Oswald Buddenhagen
38cfc8ec95 don't fetch unless we are updating
it's just wasting time.

Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-11-12 10:49:16 +01:00
Kai Koehne
402bf7aec2 Fix cloning with mirrors
Commit 486f5f37761 broke the cloning with one of the mirror options:

git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists
fatal: The remote end hung up unexpectedly

Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-12 10:49:07 +01:00
Kai Koehne
8f35cb2886 Fix description of --mirror argument
The argument actually requires a trailing slash.

Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-12 10:48:54 +01:00
Oswald Buddenhagen
d5946d420f teach init-repository about branches
specifically, add the --branch option and the necessary keys to
.gitmodules.

Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-12 10:48:37 +01:00
Qt Submodule Update Bot
e8053418e4 Updated submodules.
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-10 06:41:19 +01:00
Qt Submodule Update Bot
cafd720586 Updated submodules.
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-07 12:28:28 +01:00
Qt Submodule Update Bot
201b4c135a Updated submodules.
Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-04 08:00:22 +01:00
Jan Arve Saether
00a3c36bc1 Ignore alternate if its not a git repo
Don't just check if the submodule folder exist, since that doesn't
qualify it for being a valid git repo.

Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-03 12:50:42 +01:00
Qt Submodule Update Bot
ca7018cd4f Updated submodules.
Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-03 07:59:03 +01:00
Qt Submodule Update Bot
00e3f00b79 Updated submodules.
Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-31 06:50:24 +01:00
Qt Submodule Update Bot
a87766e218 Updated submodules.
Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-30 06:39:30 +01:00
Qt Submodule Update Bot
b54838f4a5 Updated submodules.
Change-Id: I18cc387deb811a2870842837353d6322511e1872
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-29 06:46:07 +01:00
Qt Submodule Update Bot
18cc387deb Updated submodules.
Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-28 06:54:29 +01:00
Qt Submodule Update Bot
86f7d9ce98 Updated submodules.
Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-23 17:46:28 +02:00
Bruno Coudoin
cd12d1f202 fix to let init-repository work on non english locale
This patch forces the C locale before calling 'git submodule'
in order to get the non localized string 'Entering' that we filter out.

Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-10-17 13:26:43 +02:00
Qt Submodule Update Bot
3f0739b279 Updated submodules.
Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-17 13:26:35 +02:00
Qt Submodule Update Bot
d8a40d6570 Updated submodules.
Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-10-13 09:08:32 +02:00
Qt Submodule Update Bot
2f80b640ab Updated submodules.
Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-01 12:35:05 +02:00
Qt Submodule Update Bot
b927255703 Updated submodules.
Change-Id: I361f771ae66d1128f407992c228c1c76b0e69e4c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-09-30 17:52:01 +02:00
Qt Submodule Update Bot
361f771ae6 Updated submodules.
Change-Id: Ie6af514f7185fc618f5093accedfb4f0937e5039
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-25 06:59:10 +02:00
Matti Paaso
d063e757b1 Adding qtquick1 and qtwayland also into submodule initialization
Without these components, src package creation fails in packaging.

Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-25 06:58:45 +02:00
Qt Submodule Update Bot
e6af514f71 Updated submodules.
Change-Id: Ib2e577904b850ea2ba3a8223688b05a21b4921f7
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-24 06:49:56 +02:00
Joerg Bornemann
597bb62d2b remove qtjsondb
It's dead, Jim.

Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-23 20:29:32 +02:00
Oswald Buddenhagen
0af9ceef91 properly recurse submodule initialization
Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:12 +02:00
Oswald Buddenhagen
934651b766 don't unnecessarily initialize unwanted submodules
it wastes time and causes output noise.

Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:06 +02:00
Oswald Buddenhagen
836f00a76e don't uninit submodules before re-initing
git-submodule init will simply not touch the already initialized
submodules. this is just fine, as we'll overwrite the config entries
with our own urls (and remove the obsolete ones) afterwards anyway.

Change-Id: I6372bd48be9792e456899dc829226921990140c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:04 +02:00
Oswald Buddenhagen
6ab23f16f5 keep information about default repos in .gitmodules
it's backwards to keep this in the script itself.

Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:02 +02:00
Oswald Buddenhagen
485f5f3776 don't pass around url unnecessarily
we now have everything we need to construct it on the fly.

Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:01 +02:00
Oswald Buddenhagen
4553d9ec11 get submodule urls from .gitmodules
keeping a redundant copy in the script is plain backwards.

Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:59 +02:00
Oswald Buddenhagen
3ade7c4567 rewrite submodule exclusion logic
instead of doing multiple passes over the submodules, do everything in
one go.

as a bonus, as the internal structure uses exclusion entries in the
module list, we can make that feature user-accessible just as well.

Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:58 +02:00
Oswald Buddenhagen
93f173b3c5 nuke the --http option
it was a vestige from the times when the submodules had absolute urls
pointing at git://gitorious.org. as we now use relative urls, things
work just fine without that option.

Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:56 +02:00
Qt Submodule Update Bot
b2e577904b Updated submodules.
Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-23 15:10:43 +02:00
Qt Submodule Update Bot
919c0332ff Updated submodules.
Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-15 17:09:26 +02:00
Qt Submodule Update Bot
1e275c54ea Updated submodules.
Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-11 16:30:52 +02:00
Jocelyn Turcotte
1ae0689829 init-repository: Support cases where $submodule/.git is a file
Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the
super-module's $GIT_DIR/modules/<name>/

Test for existence instead of testing for a directory before attempting
a git clone there.

Change-Id: Ic539e770067da1417a2ad374c21253212473abe6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-10 18:24:13 +02:00
Qt Submodule Update Bot
5fdb4490cb Updated submodules.
Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-07 16:17:49 +02:00
Qt Submodule Update Bot
74d7cf7e42 Updated submodules.
Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-04 11:16:45 +02:00
Qt Submodule Update Bot
f16e291eea Updated submodules.
Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-02 20:34:14 +02:00
Qt Submodule Update Bot
aa47c338f8 Updated submodules.
Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-01 17:06:23 +02:00
Qt Submodule Update Bot
2159de889d Updated submodules.
Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-08-31 14:59:32 +02:00
Qt Submodule Update Bot
fefebb996c Updated submodules.
Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-30 05:11:09 +02:00
Jani Heikkinen
59c32b2db8 Updated license files in Qt5
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-08-30 05:10:46 +02:00
Frederik Gladhorn
22e5c8ce25 Add qtwebengine as submodule
qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.

Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
2014-08-29 14:28:35 +02:00
Qt Submodule Update Bot
2c3556629b Updated submodules.
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-27 20:33:00 +02:00
Frederik Gladhorn
64b0e38032 Add QtWayland to default checkout
QtWayland is going to be released with Qt 5.4.

Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2014-08-20 12:56:30 +02:00
Milian Wolff
be6de20889 Add QtWebChannel as optional dependency of QtWebKit.
This is required to prepare the merge of the integration patch.
The QtWebChannel and QtWebSockets lines in qt.pro are moved such
that they occur before their first use in QtWebKit.

Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-15 09:03:39 +02:00
Jocelyn Turcotte
633051d095 init-repository: Support submodules more than one dir deep
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-15 09:03:24 +02:00
Jocelyn Turcotte
ce45f45dfb init-repository: Make sure that we update a submodule before we recurse
Unless we do so, doing git submodule init in a submodule would use the
currently checked out version of its .gitmodule instead of the one of
its pinned SHA1.

Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2014-08-15 09:03:16 +02:00
Jocelyn Turcotte
8801fd0258 Let init-repository build the mirror URL from the original URL
This allows repositories that have a different submodule name than their
URL file part to be using the mirror.

i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git

Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-15 09:02:58 +02:00
Frederik Gladhorn
48cd6bb500 Build Wayland on Linux (except Android)
Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2014-08-14 14:25:13 +02:00
Andras Becsi
ed9a5c8a62 initialize qtwebengine's chromium submodule after cloning it
Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-12 16:03:32 +02:00
Frederik Gladhorn
9677483cdc Add qtwebchannel as submodule
This also updates the qtwebsockets revision since
that's needed to compile.

Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2014-08-08 19:50:01 +02:00
Qt Submodule Update Bot
e073b25926 Updated submodules.
Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-08-08 07:48:56 +02:00
Qt Submodule Update Bot
6ccb1f47aa Updated submodules.
Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-08-01 07:44:21 +02:00
Qt Submodule Update Bot
091f46c34c Updated submodules.
Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-07-30 08:04:43 +02:00
Alex Blasche
f81391639e Remove jsondb from qtpim dependency list
Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2014-06-18 16:23:26 +02:00
Qt Submodule Update Bot
ffab81d96a Updated submodules.
Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-06-17 22:54:51 +02:00
Sergio Ahumada
892e391cb0 Updated submodules.
Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-06-04 09:56:56 +02:00
Sergio Ahumada
7368b4b1e3 Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
2014-05-26 15:44:48 +02:00
Qt Submodule Update Bot
f4479c349b Updated submodules.
Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-05-25 11:15:55 +02:00
Qt Submodule Update Bot
620dc10e25 Updated submodules.
Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-05-21 06:51:08 +02:00
Oswald Buddenhagen
3fb8e1301a don't claim that multimedia needs quick
it's a soft dependency and it appears to be properly checked in the
subprojects.

Task-number: QTBUG-38616
Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-05-13 18:49:52 +02:00
Qt Submodule Update Bot
64f379141c Updated submodules.
Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-13 18:49:40 +02:00
Qt Submodule Update Bot
c9eb01ba38 Updated submodules.
Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-04 13:24:01 +02:00
Qt Submodule Update Bot
25acd00fed Updated submodules.
Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-26 19:55:35 +02:00
Qt Submodule Update Bot
055e282245 Updated submodules.
Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-09 17:34:51 +02:00
Qt Submodule Update Bot
afd8acb9dc Updated submodules.
Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-09 07:07:13 +02:00
Qt Submodule Update Bot
56a5eee34a Updated submodules.
Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-04 21:01:59 +02:00
Qt Submodule Update Bot
9b93bd0fa9 Updated submodules.
Change-Id: I2c06e806a22480919b27133b080281cad06ebf26
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-04-04 10:53:08 +02:00
Qt Submodule Update Bot
2c0f1cfb71 Updated submodules.
Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-03 07:14:33 +02:00
Alex Blasche
60f5070d97 Remove qt3d from qtlocation's dependency list
QtLocation no longer depends on Qt3D.

Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
2014-04-02 12:12:44 +02:00
Qt Submodule Update Bot
2c06e806a2 Updated submodules.
Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-02 06:54:36 +02:00
Qt Submodule Update Bot
4fadcf5d88 Updated submodules.
Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-01 19:29:23 +02:00
Qt Submodule Update Bot
fb66951776 Updated submodules.
Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-28 07:34:43 +01:00
Qt Submodule Update Bot
55e55c405f Updated submodules.
Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-27 20:38:00 +01:00
Qt Submodule Update Bot
982ee75828 Updated submodules.
Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-26 07:43:18 +01:00
Qt Submodule Update Bot
06d2b3a720 Updated submodules.
Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-22 12:56:43 +01:00
Sergio Ahumada
67400663f8 Add qtenginio#stable as part of the default modules
Also update qtenginio to the latest stable sha1.

Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-03-21 13:16:20 +01:00
Qt Submodule Update Bot
b065abc7fd Updated submodules.
Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-21 13:16:16 +01:00
Qt Submodule Update Bot
e045c53198 Updated submodules.
Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-19 19:52:59 +01:00
Qt Submodule Update Bot
6d47ef2b92 Updated submodules.
Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-18 05:42:39 +01:00
Qt Submodule Update Bot
74af16bd0d Updated submodules.
Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-16 13:12:02 +01:00
Qt Submodule Update Bot
556a3377ff Updated submodules.
Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-15 14:00:16 +01:00
Qt Submodule Update Bot
8ce1937883 Updated submodules.
Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-10 07:03:48 +01:00
Qt Submodule Update Bot
e198c124d3 Updated submodules.
Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-07 20:37:07 +01:00
Qt Submodule Update Bot
7704ce065d Updated submodules.
Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-06 18:47:48 +01:00
Qt Submodule Update Bot
592415857c Updated submodules.
Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-03-05 18:36:01 +01:00
Qt Submodule Update Bot
e169f588d8 Updated submodules.
Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-04 11:28:56 +01:00
Qt Submodule Update Bot
6380ce86f1 Updated submodules.
Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-03 14:50:47 +01:00
Oswald Buddenhagen
9372697001 automatically install hooks
Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-28 14:17:21 +01:00
Qt Submodule Update Bot
ed6175da93 Updated submodules.
Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-28 07:07:01 +01:00
Qt Submodule Update Bot
63200543dd Updated submodules.
Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
2014-02-26 07:33:29 +02:00
Oswald Buddenhagen
4e92039103 nuke qlalr submodule
it was merged back into qtbase.

Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-02-22 18:22:38 +01:00
Qt Submodule Update Bot
0a23321599 Updated submodules.
Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-21 07:16:40 +01:00
Oswald Buddenhagen
6b22ad702d remove reviewed-by template
unlike previously thought, gerrit does not remove recognized reviewers
who did not actually make a review. so better not suggest adding
potentially misleading footers.

Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15
2014-02-20 12:21:07 +01:00
Oswald Buddenhagen
a3152cb8f1 Merge remote-tracking branch 'gerrit/dev' into stable
Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
2014-02-19 16:13:02 +01:00
Qt Submodule Update Bot
dc199e37d5 Updated submodules.
Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-17 20:44:41 +01:00
Frederik Gladhorn
a7dc6fd595 Add qtwebsockets as submodule
This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that

Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-17 06:32:17 +01:00
Qt Submodule Update Bot
fe236cc44c Updated submodules.
Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot
b2385231c4 Updated submodules.
Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-15 17:13:03 +01:00
Qt Submodule Update Bot
7befa70253 Updated submodules.
Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot
805c735b02 Updated submodules.
Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-13 10:31:05 +01:00
Qt Submodule Update Bot
ae9c68d190 Updated submodules.
Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-10 14:03:43 +01:00
Friedemann Kleint
ef51fe0ebb Merge "Merge branch 'stable' into dev" into refs/staging/dev 2014-02-06 08:46:01 +01:00
Qt Submodule Update Bot
3b525e1235 Updated submodules.
Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-05 12:46:41 +01:00
Frederik Gladhorn
76e16b228e Merge branch 'stable' into dev
Conflicts:
	qtactiveqt
	qtandroidextras
	qtbase
	qtconnectivity
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
2014-01-29 13:52:49 +01:00
Oswald Buddenhagen
604f330cd2 don't unnecessarily confuse qt creator
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.

Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot
b25883ebaa Updated submodules.
Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot
a968d5d531 Updated submodules.
Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot
5fd794ca6d Updated submodules.
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-17 09:37:44 +01:00
Alex Blasche
4b256e249b Add QtAndroidExtras to dependency list of QtConnectivity
We only need it for Android builds though.

Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot
f37564a749 Updated submodules.
Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot
c8d3a71d7c Updated submodules.
Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot
402457bcfb Updated submodules.
Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot
baac9b5129 Updated submodules.
Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot
06d0fa240f Updated submodules.
Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot
a250914fec Updated submodules.
Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot
f7b7ff4f9f Updated submodules.
Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2013-12-16 12:41:55 +01:00
Qt Submodule Update Bot
ec0c8697aa Updated submodules.
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-16 11:26:06 +01:00
Oswald Buddenhagen
dbac1e77f7 try to make the ChangeLog template more inviting
move it even futher up and encourage integrating it into the rest of the
commit message.

Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-30 15:24:54 +01:00
Qt Submodule Update Bot
7c73e564bd Updated submodules.
Change-Id: I749bc264b23ead54af325301479320766afce090
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-10 17:10:04 +01:00
Qt Submodule Update Bot
749bc264b2 Updated submodules.
Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-06 12:19:01 +01:00
Qt Submodule Update Bot
234dcbfcba Updated submodules.
Change-Id: Ib742f171c913b182d699270890599e3628d5df10
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-05 13:05:12 +01:00
Qt Submodule Update Bot
b742f171c9 Updated submodules.
Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-04 21:57:31 +01:00
Qt Submodule Update Bot
babbfd7ae3 Updated submodules.
Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-04 08:13:47 +01:00
Frederik Gladhorn
cf08b0d109 Add qtenginio as submodule
Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-01 13:38:03 +01:00
Qt Submodule Update Bot
5987a236d0 Updated submodules.
Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-01 07:32:42 +01:00
Qt Submodule Update Bot
08e6aa58fb Updated submodules.
Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-31 20:00:22 +01:00
Qt Submodule Update Bot
8b4022260b Updated submodules.
Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-10-31 11:03:11 +01:00
Allan Sandfeld Jensen
758d922716 Refine qt-module dependencies for massively parallel builds
QtWebKit should be build after QtMultimedia for multimedia support on Mac
and Windows.

QtScript should be build after QtTools because an example uses UiTools.

Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-24 18:48:58 +02:00
Qt Submodule Update Bot
c116096065 Updated submodules.
Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-10-22 05:27:19 +02:00
Qt Submodule Update Bot
7e2e8cad66 Updated submodules.
Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-16 18:38:03 +02:00
Sergio Ahumada
4c925babf9 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot
cb2d850b47 Updated submodules.
Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-15 21:01:19 +02:00
Qt Submodule Update Bot
d000023376 Updated submodules.
Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-15 20:33:49 +02:00
Sergio Ahumada
38b7c75f6b Merge branch 'stable' into dev
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot
1aa3ccbc4c Updated submodules.
Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-14 17:52:01 +02:00
Qt Submodule Update Bot
f9a5d19416 Updated submodules.
Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-10-12 23:23:49 +02:00
Mandeep Sandhu
728cd2e173 Ignore auto-generated file .qmake.super
Added rule in .gitignore for .qmake.super.
This file is generated when building Qt from the root dir.

Task-number: QTBUG-33439
Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-10-08 15:45:02 +02:00
Oswald Buddenhagen
f09783bb80 move changelog entry before the real footers
the change-id will be added at the end, which will look just plain
stupid if the other "real" footers come above the changelog.
also, a smart log author would integrate the changelog entry into the
flow of the message, so further up in the template is more natural.

Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-10-08 15:44:55 +02:00
Sergio Ahumada
bc6bcaa323 qt.pro: Fix dependencies for qtconnectivity
Remove the hard dependency on qtsystems and changing it
with a hard dependency on qtbase and a optional dependency
on qtdeclarative instead.

Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-10-08 15:44:50 +02:00
Qt Submodule Update Bot
7f523a7aa3 Updated submodules.
Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-08 10:50:26 +02:00
J-P Nurmi
bf0bfeb991 Mark qtmultimedia as an optional dependency for qtwinextras
The QtWinExtras Music Player example uses QtMultimedia.

Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-08 10:48:23 +02:00
Qt Submodule Update Bot
e937791dcb Updated submodules.
Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-07 09:03:53 +02:00
Sergio Ahumada
0d22f2d30d Add new qtandroidextras repository
Also adding it as part of the default modules.

Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-09-27 12:53:47 +02:00
Sergio Ahumada
f3636c9757 Add qtmacextras#stable as part of the default modules
Also updating the sha1 to the latest one that has passed
the CI already.

Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-09-27 12:53:41 +02:00
Qt Submodule Update Bot
2f20faa052 Updated submodules.
Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-26 08:00:01 +02:00
Sergio Ahumada
433e143b23 Merge branch 'dev' into stable
Conflicts:
	qtjsbackend
2013-09-23 12:24:59 +02:00
Sergio Ahumada
acd97fec50 Updated submodules.
Change-Id: Iaaf1ec8b87ff1558d0cd5025bd4faf39a1b21e77
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-20 22:44:49 +02:00
Sergio Ahumada
2bcd8e1a9f Add qtlocation#dev as part of the default modules
Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-09-20 08:40:57 +02:00
Sergio Ahumada
23101c9dd5 Updated qtlocation submodule
Change-Id: I40d980381231ed8a5103200b82570f284915e121
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-19 16:06:33 +02:00
Qt Submodule Update Bot
e39f4e8b4b Updated submodules.
Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-16 18:34:26 +02:00
Qt Submodule Update Bot
270009dfde Updated submodules.
Change-Id: I3840892d83b4c825c0a19a4326f5f392a2352585
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-13 12:44:52 +02:00
Sergio Ahumada
f3ee66d9b2 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-09-12 09:02:30 +02:00
Qt Submodule Update Bot
3840892d83 Updated submodules.
Change-Id: Iea9702923e86fc3decadbc831e31b349bd40ac44
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-12 08:25:26 +02:00
Sergio Ahumada
4072c25a70 Merge branch 'stable' into dev
Conflicts:
	qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
2013-09-11 13:31:41 +02:00
Qt Submodule Update Bot
ea9702923e Updated submodules.
Change-Id: I70c2051332bb3404f4a63ec3ddc16e22bde13bd9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-10 20:35:21 +02:00
Sergio Ahumada
96bd21c4c4 Add qtconnectivity#dev as part of the default modules
Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-09-10 20:11:42 +02:00
Qt Submodule Update Bot
70c2051332 Updated submodules.
Change-Id: I85d30ddaa31fc6067d5741286c056981eec1a7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-09 12:33:41 +02:00
Qt Submodule Update Bot
85d30ddaa3 Updated submodules.
Change-Id: I6ca2fbea871d34e2dcd8f616599c34da7fe6f8dc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-09-06 13:30:53 +02:00
Qt Submodule Update Bot
770893c71b Updated submodules.
Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-31 09:31:33 +02:00
Sergio Ahumada
c0594e303e Add qtwinextras#dev as part of the default modules
Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-08-29 17:24:09 +02:00
Qt Submodule Update Bot
6ca2fbea87 Updated submodules.
Change-Id: Ib6faaac71302be0c47b9904be5481c4b281e9008
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-29 17:24:04 +02:00
Frederik Gladhorn
33b6b2677e Add ChangeLog template.
Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-08-26 08:52:03 +02:00
Qt Submodule Update Bot
b6faaac713 Updated submodules.
Change-Id: Ifb2020a44f9cddd7b969e038c611bf7cbadfeac8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-21 20:39:31 +02:00
Alex Blasche
941dd92e5b Add --oslo option to init-repository
Oslo devs can use a local git mirror.

Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-21 09:42:07 +02:00
Alex Blasche
824cfe84a8 Cleanup of init-repository
Removes old Nokia URLs and options associated with Nokia infrastructure

Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-20 08:37:04 +02:00
Oswald Buddenhagen
e8816c8ef4 purge qtjsbackend
Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-17 00:50:29 +02:00
Qt Submodule Update Bot
fb2020a44f Updated submodules.
Change-Id: Ie3de6338ce0362c3d85ebb06e7b304521b27a1bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-08-15 22:59:54 +02:00
Qt Submodule Update Bot
e3de6338ce Updated submodules.
Change-Id: Iad241de71b1302fedbe37c20fad2da71632ec46f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-13 14:27:57 +02:00
Simon Hausmann
2ede7f403a Remove qtjsbackend as dependency for qtdeclarative
This is the first step. The next step is to remove it from qtdeclarative's
sync.profile after this integrates.

Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-13 02:52:05 +02:00
Qt Submodule Update Bot
ad241de71b Updated submodules.
Change-Id: I51c0a11ff3a3914cac1baf2a4fa6ef826089860f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-12 20:49:57 +02:00
Qt Submodule Update Bot
dd9853b3cb Updated submodules.
Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-07 10:33:43 +02:00
Nico Vertriest
a145dba334 Doc: specified how to install documentation
Added command "make install_docs"

Task-number: QTBUG-32212
Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-08-06 13:26:59 +02:00
J-P Nurmi
94eef4e5f7 qtwinextras: add qtdeclarative as an optional dependency
qtwinextras contains optional QML types, so qtdeclarative must
be listed as an optional dependency to avoid build breaks.

Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-04 18:45:19 +02:00
Qt Submodule Update Bot
35fe76d9c3 Updated submodules.
Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-07-30 06:43:51 +02:00
Qt Submodule Update Bot
51c0a11ff3 Updated submodules.
Change-Id: Id06469a62635d263631c308ffa2d16a794a6b75f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-07-29 13:03:17 +02:00
Qt Submodule Update Bot
d06469a626 Updated submodules.
Change-Id: I292fa5832ffb6890479a220ee07c7020f313537c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-07-24 17:26:16 +02:00
Qt Submodule Update Bot
292fa5832f Updated submodules.
Change-Id: If5e182de18267e8d54919b7e20d650582ff3f467
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-07-24 06:13:55 +02:00
Qt Submodule Update Bot
23c300afd1 Updated submodules.
Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-23 10:32:41 +02:00
Qt Submodule Update Bot
6d1d35416f Updated submodules.
Change-Id: I6493c3d8137a4659814949f96465d374dbad1781
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-21 10:54:29 +02:00
Qt Submodule Update Bot
f5e182de18 Updated submodules.
Change-Id: I0927a9a0f8b0cedac8027eec865d3e2118078054
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-21 01:32:35 +02:00
Qt Submodule Update Bot
6493c3d813 Updated submodules.
Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-20 18:39:58 +02:00
Qt Submodule Update Bot
7b8a659ecc Updated submodules.
Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-20 09:46:23 +02:00
Qt Submodule Update Bot
0927a9a0f8 Updated submodules.
Change-Id: If350c3bb5172d5de13a162e9e5ba2720eb890c14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-19 13:55:07 +02:00
Qt Submodule Update Bot
c3532a18c9 Updated submodules.
Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-18 12:23:14 +02:00
Qt Submodule Update Bot
c57a761615 Updated submodules.
Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-17 15:12:10 +02:00
Qt Submodule Update Bot
f350c3bb51 Updated submodules.
Change-Id: Ia289ec8a0390ff4c0b957cd7f4d7c8cd726e2d1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-14 11:08:56 +02:00
Sergio Ahumada
33aa233ae4 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-14 11:07:55 +02:00
Qt Submodule Update Bot
8c4e0a4a95 Updated submodules.
Change-Id: I0b24bc3851237425f0738df422a20ade09095681
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-13 11:41:49 +02:00
Qt Submodule Update Bot
a289ec8a03 Updated submodules.
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-13 00:19:56 +02:00
Qt Submodule Update Bot
0b24bc3851 Updated submodules.
Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-11 18:39:47 +02:00
Sergio Ahumada
6a0f795172 Merge branch 'stable' into dev
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtxmlpatterns

Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
2013-07-11 13:29:44 +02:00
Qt Submodule Update Bot
e16cdebb77 Updated submodules.
Change-Id: I8e11fdb9392d8fcff7b1b1b2673891ea77d6cf0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-11 00:48:20 +02:00
Qt Submodule Update Bot
8e11fdb939 Updated submodules.
Change-Id: I9b68559f3cc82db32e93d4040fa2b17f8315397b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-10 18:34:53 +02:00
Oswald Buddenhagen
ef8000991e leave makefile generation to the real configure
call it with the "secret" -top-level option, which shifts the makefile
generation one level up.

this makes the configure call the last thing we do, thus also avoiding
the problems we had with the -help switch (and the previous attempts at
fixing it).

Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-10 06:30:46 +02:00
Qt Submodule Update Bot
9b68559f3c Updated submodules.
Change-Id: I20ecf7efa58302efc96b80a1da136a19e4946f4b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-09 04:46:44 +02:00
Qt Submodule Update Bot
20ecf7efa5 Updated submodules.
Change-Id: I5ae49dac5a57f3a691713781a7f5390a44d6c8ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-05 21:43:37 +02:00
Qt Submodule Update Bot
5ae49dac5a Updated submodules.
Change-Id: I0e9f726baf60c4af7caa2ef403f087cb915b420b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-02 15:19:05 +02:00
Qt Submodule Update Bot
0e9f726baf Updated submodules.
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-29 16:25:54 +02:00
Sergio Ahumada
d060acfac5 Add qtmacextras and qtwinextras to qt5.git#stable
Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-26 05:48:00 +02:00
Sergio Ahumada
f3d6fe82ab Merge branch 'stable' into dev
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtx11extras
	qtxmlpatterns

Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527
2013-06-24 18:34:14 +02:00
Sergio Ahumada
76e3f3d2a6 Merge branch 'release' into stable
Conflicts:
	qtbase
	qtdeclarative
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtsensors
	qttools

Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
2013-06-24 08:40:03 +02:00
Sergio Ahumada
16e4fb6c98 configure: Fix srcpath when you run configure in the top-level dir
Using the absolute path to configure, otherwise you get:

  [user@locahost qt5]$ ./configure -minimal
  + cd qtbase
  + ./qtbase/configure -minimal
  ./configure: line 58: ./qtbase/configure: No such file or directory

Change-Id: Ic7568cc571aaa52c56bcd28fa1b6bde8abb32c8e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-23 23:48:51 +02:00
Frederik Gladhorn
a3dd3624f9 Merge "Merge branch 'release' into stable" into refs/staging/stable 2013-06-23 14:17:44 +02:00
Qt Submodule Update Bot
e9b62c8c69 Updated submodules.
Change-Id: I375328584b6361cd9f364be05b29afa5f33ac318
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-22 22:17:17 +02:00
Qt Submodule Update Bot
66b6d8fc7d Updated submodules.
Change-Id: I6670595185ea486237fe71c156e081ffe8bb40cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-22 19:24:07 +02:00
Qt Submodule Update Bot
df0a7fd6dc Updated submodules.
Change-Id: I7124fb036a5cdbc24eb8f818493deb2d13d1fe2d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-22 09:46:43 +02:00
Joerg Bornemann
8732a4c5cd fix Berlin's mirror URL
Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
2013-06-21 23:25:09 +02:00
Qt Submodule Update Bot
7124fb036a Updated submodules.
Change-Id: If828e05a91be62763bb1872ba828f71012c96b06
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-21 20:34:56 +02:00
Qt Submodule Update Bot
6670595185 Updated submodules.
Change-Id: I6a60f386b899ec6a55dd780c40fa03f2738778de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-21 17:33:02 +02:00
Alex Blasche
28460e497c Remove JsonDB from QtSystems and QtLocation dependency list
There is no optional jsondb build anymore

Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-21 07:56:06 +02:00
Sergio Ahumada
89e3b0deae Merge branch 'release' into stable
Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtquick1
	qtquickcontrols
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtx11extras
	qtxmlpatterns

Change-Id: I3abc0b033809366c993b0c358575e120c4f5953b
2013-06-20 22:53:54 +02:00
Oswald Buddenhagen
8c2518eea4 rewrite top-level configures without perl
otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would
be fairly useless for top-level builds.

Task-number: QTBUG-31786
Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-20 14:58:18 +02:00
Sergio Ahumada
23a639d4cc Don't include README.git in source packages
It doesn't make sense for non-git content anyways.

Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-06-18 12:57:06 +02:00
Qt Submodule Update Bot
6a60f386b8 Updated submodules.
Change-Id: I511255ebfd7e046391e4b3f03f06f7ba84597cdb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-17 20:38:19 +02:00
Qt Submodule Update Bot
375328584b Updated submodules.
Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-17 16:25:13 +02:00
Sergio Ahumada
7661124ff1 Update LICENSE.PREVIEW.COMMERCIAL license
Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-06-17 09:25:48 +02:00
Qt Submodule Update Bot
f828e05a91 Updated submodules.
Change-Id: I3a55bb51ac59f7e66b8a75f574e494a8da0a2754
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-16 20:33:57 +02:00
Qt Submodule Update Bot
35350e9779 Updated submodules.
Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-16 15:22:59 +02:00
Sergio Ahumada
80d90b4862 Updated submodules.
Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-15 06:22:11 +02:00
Qt Submodule Update Bot
511255ebfd Updated submodules.
Change-Id: I188bb452fd59f6c0b4be329fd82f88f603daae0f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-14 10:33:28 +02:00
Qt Submodule Update Bot
111d8165f6 Updated submodules.
Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-13 07:44:22 +02:00
Qt Submodule Update Bot
188bb452fd Updated submodules.
Change-Id: I3a770f5d4569edf4056b883d6533a7f4584b0ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-11 10:33:08 +02:00
Qt Submodule Update Bot
3918311aeb Updated submodules.
Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-11 05:45:22 +02:00
Qt Submodule Update Bot
6a19225d75 Updated submodules.
Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-09 08:48:03 +02:00
Qt Submodule Update Bot
f1d7bdd444 Updated submodules.
Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-08 02:21:57 +02:00
Qt Submodule Update Bot
7d1e12cc1e Updated submodules.
Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-06 21:32:55 +02:00
Qt Submodule Update Bot
cfdf021c18 Updated submodules.
Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-06-05 17:04:46 +02:00
Qt Submodule Update Bot
641bab7bde Updated submodules.
Change-Id: Ia11c7ef6709a97ea1352d2f3c10512da31700a2e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-04 08:56:06 +02:00
Qt Submodule Update Bot
3a770f5d45 Updated submodules.
Change-Id: I049006602743ca4903ee71ab20c6f69639fb6ae1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-01 12:39:19 +02:00
Qt Submodule Update Bot
0490066027 Updated submodules.
Change-Id: I3b9d57e4133feb47d847b928cfe54e2e15f1a186
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-31 22:30:32 +02:00
Qt Submodule Update Bot
a11c7ef670 Updated submodules.
Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-31 13:11:06 +02:00
Qt Submodule Update Bot
3b9d57e413 Updated submodules.
Change-Id: I90ca6825c475bd22822edb3e95f78dcc5504038e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-31 11:48:44 +02:00
Sergio Ahumada
ecd64f626d Add license files mandated by (L)GPL.
Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
2013-05-30 22:32:43 +02:00
Sergio Ahumada
f62ba0352b Updated submodules.
This manually updates

  qt3d
  qtconnectivity
  qtdocgallery
  qtfeedback
  qtjsondb
  qtpim
  qtsystems

Change-Id: I9e496ae3c108aa11bb9806d925200e0c5beac16b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-05-29 14:29:39 +02:00
Qt Submodule Update Bot
ad91faa3bd Updated submodules.
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-29 13:01:57 +02:00
David Faure
c28bacd49f Update submodule qtlocation, to fix compilation error
(module version wasn't set)

Change-Id: I16ce30bf97b8e3e6613ac73fe0f3d5e7d8358ca7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-28 15:44:39 +02:00
Sergio Ahumada
a0267228f9 Updated submodules.
Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-05-28 13:30:54 +02:00
Qt Submodule Update Bot
90ca6825c4 Updated submodules.
Change-Id: I4fcad903b132fa253bbc202463d99fceae64b220
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-28 08:28:39 +02:00
Qt Submodule Update Bot
3a55bb51ac Updated submodules.
Change-Id: If9fc16a5b48771a056b8156e6ebeb5a17ac09a45
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-27 20:45:03 +02:00
Qt Submodule Update Bot
4fcad903b1 Updated submodules.
Change-Id: I7627c87948ff36902852a491177bd6ce9a9c6875
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-27 14:19:02 +02:00
Qt Submodule Update Bot
7627c87948 Updated submodules.
Change-Id: I7e979b67af985dcd16b12199d3b8d29a6a0f5438
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-27 09:24:29 +02:00
Qt Submodule Update Bot
f9fc16a5b4 Updated submodules.
Change-Id: Ifbd69b7602a9b8fd114d9c20583adc47fad27124
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-27 09:24:15 +02:00
Qt Submodule Update Bot
fbd69b7602 Updated submodules.
Change-Id: Ib25fcb31a7e0b315ea7090e2d4c45fd684313439
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-26 19:48:54 +02:00
Qt Submodule Update Bot
7e979b67af Updated submodules.
Change-Id: I47fb446cbe5c8d85fbe29168adddd80abdc4963f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-26 18:34:30 +02:00
Qt Submodule Update Bot
47fb446cbe Updated submodules.
Change-Id: Ieafc5686a62071ab835129ba97860ae13979758f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-26 06:07:56 +02:00
Sergio Ahumada
da69011610 Updated submodules.
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-25 20:22:21 +02:00
Qt Submodule Update Bot
eafc5686a6 Updated submodules.
Change-Id: I7473ab6b3c111bbbce8a53420ee196b614850dc2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-25 02:33:37 +02:00
Qt Submodule Update Bot
7473ab6b3c Updated submodules.
Change-Id: I123cf8b2cb48921ac0eb73786efc1ddc3a7b4826
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-24 21:17:11 +02:00
Qt Submodule Update Bot
123cf8b2cb Updated submodules.
Change-Id: Ibbc5dca735c3651ea01e6fd860348a2ad841ae1a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-24 16:28:01 +02:00
Qt Submodule Update Bot
bbc5dca735 Updated submodules.
Change-Id: Ibb9e60870c825fa336e1816f2402d72df4efabaa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-24 11:28:06 +02:00
Qt Submodule Update Bot
bb9e60870c Updated submodules.
Change-Id: Icbe70b9b60cb57634b6ef3e07f34983e6cc2738f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-23 21:57:11 +02:00
Qt Submodule Update Bot
cbe70b9b60 Updated submodules.
Change-Id: I3814e96edd8db204eb93396c46b5d2812fb8898d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-23 16:43:12 +02:00
Sergio Ahumada
f89dd01d19 Merge branch 'stable' into release
Conflicts:
	README
	qtwebkit-examples-and-demos

Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
2013-05-23 15:46:50 +02:00
Qt Submodule Update Bot
3814e96edd Updated submodules.
Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-23 11:29:54 +02:00
Qt Submodule Update Bot
292a7a7430 Updated submodules.
Change-Id: I38dc5b49f6ba2b0c7053856ee815d58d7e2decd2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-23 00:47:23 +02:00
Qt Submodule Update Bot
38dc5b49f6 Updated submodules.
Change-Id: Ie78aad71e6d584fc4b8f0a831ed74370d85201ba
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-22 19:54:16 +02:00
Sergio Ahumada
45b8f5c7fc Updated qtquickcontrols submodule.
Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-05-11 19:02:05 +02:00
Qt Submodule Update Bot
e78aad71e6 Updated submodules.
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-05-09 12:22:54 +02:00
Oswald Buddenhagen
bbb720486f Merge branch 'stable' into dev
the sha1s of existing modules were skipped (the update bot will handle
them as usual). all newly appeared modules got their sha1s forward-merged.

Conflicts:
	.gitmodules
	qt.pro
	<plenty of submodules>

Change-Id: I724998c2011f274c3aea5996a7fdbe303d246551
2013-05-02 15:16:06 +02:00
Oswald Buddenhagen
33072afc58 use relative submodule specs
this saves various trouble.
this syntax is supported since git 1.7.0.

Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-01 06:12:31 +02:00
Oswald Buddenhagen
730e330068 renamed qtwebkit-examples-and-demos => qtwebkit-examples
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
2013-05-01 06:12:16 +02:00
Qt Submodule Update Bot
b25fcb31a7 Updated submodules.
Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-29 23:17:16 +02:00
Qt Submodule Update Bot
18aaac1806 Updated submodules.
Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-21 18:45:04 +02:00
Qt Submodule Update Bot
09c3d8537e Updated submodules.
Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-20 02:49:49 +02:00
Oswald Buddenhagen
7b034fec34 skip modules whose mandatory dependencies are missing
so that for example "-skip webkit" will also skip qtwebkit-examples.

Task-number: QTBUG-30307
Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2013-04-18 19:09:07 +02:00
Qt Submodule Update Bot
cfbfb61233 Updated submodules.
Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-18 12:43:32 +02:00
Qt Submodule Update Bot
6d08e322c7 Updated submodules.
Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-17 18:38:52 +02:00
Qt Submodule Update Bot
fced9b8199 Updated submodules.
Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-17 13:18:36 +02:00
Qt Submodule Update Bot
8e64df0756 Updated submodules.
Change-Id: Iec1a2c155705e9448566b9c543384a6e422e26fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-12 20:46:09 +02:00
Qt Submodule Update Bot
ec1a2c1557 Updated submodules.
Change-Id: Icd769b2d31fb4f3703352b01316ba3c697a579cd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-04-12 14:36:51 +02:00
Qt Submodule Update Bot
3f9837797d Updated submodules.
Change-Id: If618a97229d55cf58fb668fbeaa4a7b0b47f3b14
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-09 12:27:22 +02:00
Qt Submodule Update Bot
3e26038d5c Updated submodules.
Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-05 18:38:42 +02:00
Sergio Ahumada
80c8ed3c21 Add new modules (qtquickcontrols, qtserialport and qtx11extras)
Also adding qtsensors as part of the default modules and updating
its sha1.

Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-04-04 17:25:51 +02:00
Qt Submodule Update Bot
f618a97229 Updated submodules.
Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-04 09:42:52 +02:00
Oswald Buddenhagen
66ed87fc67 re-add a bunch of modules
this allows for easy cloning and build system maintenance also for
modules which are currently irrelevant, thus hopefully keeping the
barrier to their revival low. it does not affect the casual developer or
the CI system, as init-repository will not clone these modules.

This (abstractly) reverts commits
41c3f2cb5f,
725a51b1d8 and
1117d4da2c.

Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-03 20:47:18 +02:00
Oswald Buddenhagen
ec783bb21e clone only a specific subset of repositories by default
the list corresponds to the current contents of .gitmodules.
this will allow us to re-add more modules to the supermodule without
bothering people and the qt5 integration with unmaintained modules.

Change-Id: I8bc429fed8e4d1f729b375b302531472d3c4e267
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-04-03 20:47:07 +02:00
Qt Submodule Update Bot
696ab3466b Updated submodules.
Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-30 13:42:58 +01:00
Qt Submodule Update Bot
2f8a096c9c Updated submodules.
Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-27 16:01:20 +01:00
Qt Submodule Update Bot
231887b543 Updated submodules.
Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-26 12:07:50 +01:00
Qt Submodule Update Bot
b47a94b9fb Updated submodules.
Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-25 19:18:06 +01:00
Qt Submodule Update Bot
3a3420b02e Updated submodules.
Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-25 10:40:58 +01:00
Qt Submodule Update Bot
5c752f164a Updated submodules.
Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-22 14:10:50 +01:00
Qt Submodule Update Bot
b99b4bc070 Updated submodules.
Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-03-19 14:11:54 +01:00
Qt Submodule Update Bot
ce407c1283 Updated submodules.
Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-03-05 14:15:26 +01:00
Qt Submodule Update Bot
d3d46ac7b3 Updated submodules.
Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9
Reviewed-by: Liang Qi <liang.qi@digia.com>
2013-02-27 19:44:42 +01:00
Laszlo Papp
2ef82978ca README: Update with the reference platforms and remove the mingw entry
Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-23 02:14:55 +01:00
Oswald Buddenhagen
08ec2c7a62 make it possible to explicitly exclude particular modules
Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-20 22:55:13 +01:00
Oswald Buddenhagen
aeed8ce504 semi-automate adding submodules
this way adding a module actually becomes a one-liner

Change-Id: Ie31039d36e948094c3ec241758eaab330304b194
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-20 22:55:09 +01:00
Oswald Buddenhagen
0089431326 don't make webkit build conditional on ICU
webkit now contains its own configure magic to disable itself.

Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-20 22:55:06 +01:00
Frederik Gladhorn
8b6ae1cdd9 Merge remote-tracking branch 'origin/stable' into dev
All submodules are kept at their dev branch version.

Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtqa
	qtquick1
	qtrepotools
	qtscript
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples-and-demos
	qtxmlpatterns

Change-Id: Ib9086eb5fef5580792286c9c6efd0f30e186543d
2013-02-20 10:40:05 +01:00
David Faure
ff63f0f3dc Add module qtx11extras to qt5.git
QX11Info was part of the Qt4 API, it should be part of the Qt5 API too.

Change-Id: I08810ce25d0a91805a7fe4de5c8cb8f1b4ab3686
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-02-08 15:55:18 +01:00
Qt Submodule Update Bot
cd769b2d31 Updated submodules.
Change-Id: I6207f23126d98141aefe4523cc785ca88fb6d0ff
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-31 12:37:37 +01:00
Qt Submodule Update Bot
585c525fd1 Updated submodules.
Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-30 10:14:08 +01:00
Qt Submodule Update Bot
b3ef11f427 Updated submodules.
Change-Id: I347949e258d3c75ad506aefa2a28712266007c15
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-28 21:41:39 +01:00
Qt Submodule Update Bot
347949e258 Updated submodules.
Change-Id: I79193d2b4d9b58e1b4928857156e1523ea970b74
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-27 13:38:39 +01:00
Qt Submodule Update Bot
79193d2b4d Updated submodules.
Change-Id: I2f43917c1d4b3648615c52d4fe012d44561e5d0c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-26 19:59:26 +01:00
Jerome Pasion
6623ffc4ec Doc: Added information about the documentation in qt5/README file.
-added basic information and links to wiki and qtbase/doc/README file.

Task-number: QTBUG-29057
Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-25 15:44:40 +01:00
Qt Submodule Update Bot
2f43917c1d Updated submodules.
Change-Id: I371d08eb4a1e748e042c09a872af9bcb6e03b405
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-25 15:44:37 +01:00
Qt Submodule Update Bot
6207f23126 Updated submodules.
Change-Id: I6ff7fbc6859f27ffebb0289fed485ed13d2aef79
Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-01-25 15:37:04 +01:00
Qt Submodule Update Bot
371d08eb4a Updated submodules.
Change-Id: I319b198bbf22c551bc05a308211cb1666f520d89
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-22 11:59:35 +01:00
Qt Submodule Update Bot
3d960ec9a9 Updated submodules.
Change-Id: Id7ca18632a1fe4ef542e131aafd3ebb9e854b363
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-22 11:59:05 +01:00
Qt Submodule Update Bot
6ff7fbc685 Updated submodules.
Change-Id: I713cc7fcc2e6d636117200f7df4a845af4ec06e9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-21 10:43:42 +01:00
Qt Submodule Update Bot
319b198bbf Updated submodules.
Change-Id: I3f1cc2e9387ac936ad9d02cff409798da9cd9835
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-19 06:01:32 +01:00
Qt Submodule Update Bot
713cc7fcc2 Updated submodules.
Change-Id: I79f9d60b77248a97d6ec999566d3aa8ce7058926
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-18 08:01:14 +01:00
Qt Submodule Update Bot
3f1cc2e938 Updated submodules.
Change-Id: Ia0270c339333b78457e2397709353c86483ce8ae
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-17 21:38:33 +01:00
Qt Submodule Update Bot
a0270c3393 Updated submodules.
Change-Id: Iafb0caec7665e3d3f7b0c8e8c00ed4616734f163
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-16 21:37:23 +01:00
Qt Submodule Update Bot
d7ca18632a Updated submodules.
Change-Id: I9e7460525d8ca86a4578e602d7ce8f71c103ecb3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-16 18:58:16 +01:00
Qt Submodule Update Bot
afb0caec76 Updated submodules.
Change-Id: I7514c6e0f62ccd168c0081f83c9e4c0248e7e130
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-15 23:38:15 +01:00
Qt Submodule Update Bot
9e7460525d Updated submodules.
Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-14 18:56:22 +01:00
Qt Submodule Update Bot
7514c6e0f6 Updated submodules.
Change-Id: Ia2d9fb7323ba08ccd1cf08752073efd212012da4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-14 00:46:25 +01:00
Jan Arve Saether
c639fec072 Add ruby to the list of new dependencies for Qt 5 on Windows
Change-Id: Ieb168e8cd21633216fdb141907047da4e41c5091
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-01-13 15:55:59 +01:00
Qt Submodule Update Bot
d2b2b92d49 Updated submodules.
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-13 09:53:12 +01:00
Sergio Ahumada
0381f7bd54 Updated submodules.
Change-Id: Ic95561b551e1b777dd164d5dfc865f6f02f1c0b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-13 01:27:30 +01:00
Qt Submodule Update Bot
a2d9fb7323 Updated submodules.
Change-Id: I56d9eaba8f6699c6635f76277aedde7a2fbb992b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-12 07:14:30 +01:00
Qt Submodule Update Bot
56d9eaba8f Updated submodules.
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-11 18:58:49 +01:00
Qt Submodule Update Bot
1652b1e10a Updated submodules.
Change-Id: If565e02bdbdf8d2e3f08f45db96224c20074f168
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-09 23:32:19 +01:00
Qt Submodule Update Bot
79f9d60b77 Updated submodules.
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-01 20:47:40 +01:00
David Faure
ba4baee789 Update win_flex.exe from sourceforge
This fixes compilation on Windows XP.
The previous binary must have been made with a more recent
version of Windows.

Change-Id: I17f392069199f01d603524c8166d940ff1da93bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-19 11:10:03 +01:00
Sergio Ahumada
901fd28fd8 Updated submodules.
Change-Id: Ifd3ee8634a28f7e769ac6b59c4b7738091210c39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-12 21:53:21 +01:00
Sergio Ahumada
fd3ee8634a Updated submodules.
Change-Id: I56e6962ad7de00811c1d45484666b86829e75600
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-12 16:09:59 +01:00
Sergio Ahumada
56e6962ad7 Updated submodules.
Change-Id: Ie653efe17d14880969d4089e0cdf89ea5b3825a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-10 22:44:33 +01:00
Sergio Ahumada
e653efe17d Updated submodules.
Change-Id: If0efc5c5cc5c3942409a347e826b60108bfea1cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-10 16:04:01 +01:00
Sergio Ahumada
f0efc5c5cc Updated submodules.
Change-Id: I238c0f5ce080825f5d82a883c0b39d0cf04ea720
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-06 13:05:44 +01:00
Sergio Ahumada
238c0f5ce0 Updated submodules.
Change-Id: I8d77ff1ef2422259dd6baed5cae9815260e5bee2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-06 07:15:44 +01:00
Sergio Ahumada
8d77ff1ef2 Updated submodules (stable)
Change-Id: I5a3bcda566072f6c78968eecafdfd904f7986fc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-04 15:33:37 +01:00
Oswald Buddenhagen
495c7a13f7 (re-)add top-level 'check' target
Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-04 15:33:34 +01:00
Sergio Ahumada
f67e9c6bf2 Updated submodules (stable)
Change-Id: Ibf84cdee0f17a0d295a34fcb3b2b4155fb16face
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-02 14:46:28 +01:00
Oswald Buddenhagen
039f8c8555 remove special handling of qtwebkit
the svn mirror is now CI-controlled on gerrit and mirrored to gitorious
like any other qt module.

Change-Id: I05ead0a4aaa4fc5348a3e3d39d9ee7db734580f4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
2012-11-30 11:14:52 +01:00
Qt Submodule Update Bot
8cb6c9373f Updated submodules.
Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-30 11:14:46 +01:00
Oswald Buddenhagen
c409a85bb8 re-instate a top-level docs target
now that it's not in default_post any more, each concerned repo needs to
request it explicitly. as this is not a regular qt module, it happens a
bit differently than elsewhere.

Change-Id: I47f741e09add302fb4b1146be73da2f26a67a5af
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-11-30 00:17:42 +01:00
Qt Submodule Update Bot
5e8c47946a Updated submodules.
Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-29 08:57:37 +01:00
Qt Submodule Update Bot
c18c2a76ef Updated submodules.
Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-28 12:29:41 +01:00
Qt Submodule Update Bot
a41ce6cb4f Updated submodules.
Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-27 03:54:51 +01:00
Qt Submodule Update Bot
97d477d4ff Updated submodules.
Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-26 16:44:08 +01:00
Simon Hausmann
af96eba3e7 WebKit update
A new snapshot bringing in new bug fixes :)

Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-23 22:03:54 +01:00
Sergio Ahumada
bf8311f879 Updated submodules.
Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-22 21:27:42 +01:00
Joerg Bornemann
9eefa9fb9a Fix parallel builds in WebKit
The parallel builds aborts because parallel execution of flex breaks
due to the usage of the same temporary file names. This stems from
using a hard coded temp file name "~flex_temp_out_main" and
"random numbers" based on constants in mkstempFILE.

Fixing those issues by embedding the current PID into the temp file
names. Patch is in gnuwin32/patches/win_flex.patch

Change-Id: I6c0cd499b3c9c35128280ec0fee5e450a9ca097f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-22 14:58:19 +01:00
Qt Submodule Update Bot
471842d8f4 Updated submodules.
Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-21 23:50:45 +01:00
Qt Submodule Update Bot
b335981ca0 Updated submodules.
Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-21 13:53:56 +01:00
Samuel Rødal
24031b2120 Merge remote-tracking branch 'gerrit/newdocs' into HEAD
Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
2012-11-20 11:00:40 +01:00
Qt Submodule Update Bot
b1c03b4497 Updated submodules.
Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-20 03:46:39 +01:00
Qt Submodule Update Bot
a9e3e72b2e Updated submodules.
Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-17 12:13:19 +01:00
Qt Submodule Update Bot
b9f3ea418a Updated submodules.
Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-17 02:27:40 +01:00
Qt Submodule Update Bot
766ed50650 Updated submodules.
Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-14 12:48:25 +01:00
Qt Submodule Update Bot
0f16101977 Updated submodules.
Change-Id: I2ad41f3ba71831b1a2634a616f7985de27af89cf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-11-14 05:52:00 +01:00
Oswald Buddenhagen
db59699011 brisbane is no more
the berlin mirror is currently dysfunct as well, but i'm leaving the
code in in the expectation that it will finally re-surface (under a
different url).

Change-Id: Ifee885a6ba17c5ef3502b6547ffd850bc5f742a5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-14 05:51:47 +01:00
Oswald Buddenhagen
b9b8db0745 fix argument quoting when invoking "proper" configure
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-14 05:51:43 +01:00
Qt Submodule Update Bot
2ad41f3ba7 Updated submodules.
Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-12 22:02:41 +01:00
Qt Submodule Update Bot
371ae019fc Updated submodules.
Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-11 11:41:03 +01:00
Qt Submodule Update Bot
cb530cbe80 Updated submodules.
Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-10 19:40:52 +01:00
Qt Submodule Update Bot
8dfa5d43e1 Updated submodules.
Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-10 11:20:22 +01:00
Qt Submodule Update Bot
4ec68bcba5 Updated submodules.
Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-09 06:22:14 +01:00
Qt Submodule Update Bot
7319eb06fd Updated submodules.
Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-08 17:18:07 +01:00
Qt Submodule Update Bot
e605d1675e Updated submodules.
Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-07 17:40:11 +01:00
Sergio Ahumada
7a9722d3ab Updated submodules
Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-07 11:46:40 +01:00
Simon Hausmann
76d59a3fa4 Manual update of qtbase from master for qt5.git
Change-Id: I6649832b9a395cda862a032b910ed69479964895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-06 15:55:11 +01:00
Qt Submodule Update Bot
a6254526d8 Updated submodules.
Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-11-06 10:53:06 +01:00
Qt Submodule Update Bot
01b8ffb28f Updated submodules.
Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-05 20:09:22 +01:00
Qt Submodule Update Bot
2b92b3ea1f Updated submodules.
Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-11-01 12:30:27 +01:00
Sergio Ahumada
0125076d12 Updated submodules.
Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-10-30 16:21:37 +01:00
Stephen Kelly
41c3f2cb5f Remove submodules which are not part of Qt 5.0.
Task-number: QTBUG-27736
Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-10-30 16:21:34 +01:00
Qt Submodule Update Bot
a1f4d9db15 Updated submodules.
Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-26 18:44:56 +02:00
Simon Hausmann
71c071399a Minor WebKit update to fix 64-bit Windows build
Just three patches on top that should fix the 64-bit build that uses
C-Loop LLInt for JSC.

Change-Id: I9dc87416dbf0ee3e3b47b46d6529dd951e5c15e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-25 16:08:34 +02:00
Tor Arne Vestbø
c72a240108 Add prepare_docs to CONFIG as preparation to two-pass doc builds
Won't have any effect until the corresponding patch lands in qtbase.

Change-Id: I807ca48d3e2ab671f0d56eea27f72455304d367b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-25 12:19:13 +02:00
Qt Submodule Update Bot
c0772fa7a5 Updated submodules.
Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-25 11:41:03 +02:00
Simon Hausmann
98a605eb6b Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changes
Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 03:46:47 +02:00
Qt Submodule Update Bot
f81bf2b5ee Updated submodules.
Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-19 19:38:01 +02:00
Tor Arne Vestbø
0e1169ca2d Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'
Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-19 19:37:52 +02:00
Qt Submodule Update Bot
0e169c8e8b Updated submodules.
Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-10-15 15:19:50 +02:00
Qt Submodule Update Bot
34f1dbc74a Updated submodules.
Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-10-15 03:06:59 +02:00
Qt Submodule Update Bot
21f9eaf60e Updated submodules.
Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-14 08:11:21 +02:00
Qt Submodule Update Bot
da8730bf21 Updated submodules.
Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-13 23:51:35 +02:00
Qt Submodule Update Bot
749b83f337 Updated submodules.
Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-02 21:13:38 +02:00
Qt Submodule Update Bot
508072fb03 Updated submodules.
Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-10-02 02:04:22 +02:00
Qt Submodule Update Bot
cd3a4676c8 Updated submodules.
Change-Id: I008fb07a0f735a1416e6594737505becc671de39
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-10-01 14:52:13 +02:00
Qt Submodule Update Bot
008fb07a0f Updated submodules.
Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-09-30 02:35:49 +02:00
Qt Submodule Update Bot
d3a55bf0aa Updated submodules.
Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-29 08:15:48 +02:00
Jonathan Liu
600b295f2c Revert "Check for a non-error, non-continue case."
This reverts commit 6bd52260c8.
Running configure -help should not break builds by removing
.qmake.cache.

Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-28 18:19:12 +02:00
Qt Submodule Update Bot
58acd59fa6 Updated submodules.
Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-28 13:01:26 +02:00
Qt Submodule Update Bot
8f9fcfdcb5 Updated submodules.
Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-27 21:02:49 +02:00
Simon Hausmann
e4d841490b Introduce dependency: QtQuick1 needs QtWebKit
The QML1 WebKit integration is moved to the QtQuick1 module, so this
dependency needs to be expressed in qt.pro.

It is technically an optional dependency, because the module can be built
without, but if WebKit is available then it should be built before QtQuick1.

Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-09-26 15:30:47 +02:00
Simon Hausmann
a2d6af491e WebKit update for MinGW build fix
Change-Id: I5b541d144a91a8bebece62a6f3abd4108848ca39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-25 20:53:47 +02:00
Iikka Eklund
4e87fe89ce Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Ieac8fb85896427cd5e3c6d91698c455a0dc9e495
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-25 14:31:30 +02:00
Qt Submodule Update Bot
4865835418 Updated submodules.
Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-24 20:48:32 +02:00
Simon Hausmann
58178a8a0e New WebKit snapshot with build fixes for latest qtbase
Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-24 13:08:58 +02:00
Qt Submodule Update Bot
bf4c64ada0 Updated submodules.
Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-24 13:08:53 +02:00
Simon Hausmann
6ccb808ef6 WebKit update
This should fix the build errors that "looked" like errors from Qt3D
but were triggered through an incorrect QtWebKit module master header file,
as well as the supposed linking errors related to WebKit2.

Also disable the WebKit build if ICU is not available instead of breaking
the build when reaching WebKit.

Change-Id: I109b4152c081250c8950ef62dd7278129b716f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-21 16:45:16 +02:00
Oswald Buddenhagen
c0626490d1 don't tell people to add qtbase/bin to PATH
there is no reason whatsoever to do this (any more).

Change-Id: Ib68c60ef137db0d68100f51a4efcaa27dd3c72e3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-21 16:45:11 +02:00
Oswald Buddenhagen
be16d21a80 delete build script
the modularized build system is now good enough

Change-Id: Idcc3fb2b6d6201ad7ecbb8e91bd257530797762b
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-09-21 16:45:06 +02:00
Oswald Buddenhagen
0e1c9d3724 remove traces of webkit build being claimed to be special
Change-Id: I72a36c7aedf7f364a3bd53755af17b803c532cf2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-21 16:45:02 +02:00
Oswald Buddenhagen
aa7ff01d60 remove outdated blurb about shadow builds being 2nd class citizens
Change-Id: Iee86330dd182d346673b9b21f408d944709f2ce5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-09-21 16:44:56 +02:00
Simon Hausmann
837c3e68a0 Fix path to Qt 5 WebKit mirror for Brisbane
Point to the small module that contains snapshots of WebKit instead of
of to the repo that contains several gigabytes of history.

Change-Id: I96df293c8c6de76ea6e56836a0d6018c25f6bb0a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-09-21 16:44:53 +02:00
Sergio Ahumada
23701ec556 Updated qtwebkit-examples-and-demos submodule
Change-Id: I0860a4e43ee3fadb765835d22f51474b40b99c1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-21 16:44:48 +02:00
Simon Hausmann
138fb6e22e WebKit update with various build fixes
Change-Id: I47639d78003214f3eafc1499ae35408fb39b5df0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-09-18 20:30:25 +02:00
Qt Submodule Update Bot
8fbf48fd93 Updated submodules.
Change-Id: I2e1a8b49f437a68e8be5f44351116aa4d9638994
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-09-17 13:47:16 +02:00
Qt Submodule Update Bot
2e1a8b49f4 Updated submodules.
Change-Id: Ic1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-09-15 23:25:05 +02:00
Thiago Macieira
c4c9ca640a Don't include init-repository and .gitmodules in the package either
Even though qt5.git will not be packaged either.

Change-Id: I9bc02170dde1262aeb839741722d275bdb9e4b46
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-09-14 17:31:34 +02:00
Simon Hausmann
5de69ba432 Update WebKit
This updates WebKit to the latest snapshot that enables the build of WebKit2
on Windows and also drastically simplifies the build of WebKit within Qt
to be built the same way as the other modules, i.e. using qmake && make

Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
2012-09-14 17:31:31 +02:00
Qt Submodule Update Bot
c1a3e0c2f2 Updated submodules.
Change-Id: I34904ca89dbda946e557121ad4f58ac0f9777d9b
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-09-13 01:04:58 +02:00
Simon Hausmann
34cf394226 Add win_flex to the convenience GNU tools for the WebKit build on Windows
The latest builds of ANGLE in WebKit require a version of flex that is newer
than what GnuWin32 can provide. The only distribution I've found that doesn't
pull in all of CygWin is winflexbison.

This patch adds the binary of it along with a README explaining the purpose
of this gnuwin32 directory altogether.

Change-Id: Ia00fa5d628891c9d4c30586f42274c7c602362ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-09-12 15:36:31 +02:00
Simon Hausmann
10d5a02dcd Another WebKit update
This one should fix the qtquick2 detection and prepare for the removal
of qtwebkit.pri in favour of qmake && make as way of building WebKit

Change-Id: Ie78a4c68c2e58343cf9e2c603e8f126a65a124b3
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-09-12 06:37:14 +02:00
Simon Hausmann
c83a5d49a3 WebKit update to catch up with latest source incompatible changes in qtbase
Change-Id: Ic00da49b7947d29582fa76a4b1b375a962f92bc4
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-09-10 19:51:00 +02:00
Corentin Jabot
9b19587959 Cut some build dependencies
A lot of modules had a hard depency on qtdeclarative
(for extra qml components or qml examples).

Now, these modules can be build without the need of qtdeclarative.
These modules are:
qttools (since 3b9ac2dc08310aa13b121274afea130fa4f7c6f8 )
qtmultimedia (since 02f144ba6f50bb7d404e2808b9bb4fa32a206aea )
qtsystems (since 12408d021af8b9f8e0afad7ae67f389974ed0607 )
qtlocation (since fa404bfb7a83ecb01deb4df16d5ac72a8c5ab066 )
qtsensors ( since 3c069e5e4a720582f37f0b2d053d19632f6ddfe2 )

Also, useless dependencies are cut, and the dependencies declared
in build.dependencis mirror more accurately what is done is qt.pro

Those modifications allow an easier and faster build for people who
do not use qml.

Note that qtdelarative will still be needed to build the tests
of each of the modules listed above

Change-Id: Icf7711c07d041b8ef836f213fadeebb9328877d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-08 23:18:52 +02:00
Qt Submodule Update Bot
34904ca89d Updated submodules.
Change-Id: I36e84c61a13aa5cf7d40ced02b46879822fc4b6e
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-09-07 03:33:39 +02:00
Thiago Macieira
0b501b19de Update the git-archive export options
The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: Ib70cba174211ff75d69ec6ba30b680e0757ab369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 14:33:37 +02:00
Qt Submodule Update Bot
36e84c61a1 Updated submodules.
Change-Id: Ibd1716005ac279cf0d8416e20aace26025fa503d
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-09-05 08:29:34 +02:00
Qt Submodule Update Bot
bd1716005a Updated submodules.
Change-Id: Ied65966d5d176f5d354b17a8fa1f50fead14ccaa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-09-03 20:14:21 +02:00
Christian Strømme
5fc7879313 Splitting up the README files
Moved git related information over to README.git,
and polished the README file slightly.

Change-Id: I863e2c2ef9c2020964185e96ddb87a05d82c30a6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-09-03 07:02:20 +02:00
Kai Koehne
3913643642 README: Fix "Building Qt 5 from Git" link
Building_Qt_5_from_Git is a redirect to the version with '-' nowadays.

Change-Id: I48e7919c54af4adfb478ea64c93c844b107fbc4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 13:55:57 +02:00
Qt Submodule Update Bot
ed65966d5d Updated submodules.
Change-Id: I5a109341ca30e1914732304a15c11a04f61d380f
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-29 02:15:24 +02:00
Simon Hausmann
877cec0228 Fix make install with WebKit
Avoid running "make install" through build-webkit and therefore risk
accidentally rebuilding the lot. We call build-webkit either with --release
or without, but we never pass --debug. Therefore the build directory is
always WebKitBuild/Release.

This is a stop-gap for the Qt 5 beta. After the release we'll get rid of
qtwebkit.pri altogether and WebKit will be built with just qmake and make.

Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-28 13:02:06 +02:00
Lars Knoll
f4f66ff107 Updated submodules.
Change-Id: I8e407c602cda9c30eda458b0aacb7465787f22c4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-28 13:01:56 +02:00
Lars Knoll
725a51b1d8 Remove qtjsondb from qt5.git
The jsondb module has been ongoing research work. But it won't be done
in time for Qt 5.0, and is currently also less relevant. It's also
currently not being actively worked on. So let's remove it
from the list of modules compiled with qt5.git and keep it as
research.

The module can still be compiled stand-alone on top of the Qt essentials.

Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
2012-08-28 07:42:17 +02:00
Simon Hausmann
f00429b71a Disable WebKit2 for the Qt 5 beta
Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.

Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-27 12:13:42 +02:00
Qt Submodule Update Bot
5a109341ca Updated submodules.
Change-Id: Id20cb51b5d6b7aa239becf2dda1e49f89c0b5c24
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-27 00:53:36 +02:00
Lars Knoll
016d5d856f Update qtbase submodule.
Change-Id: Ifdadb7a8a25c6845cc775aea3f3f4d1af516f2a1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-26 08:59:32 +02:00
Qt Submodule Update Bot
d20cb51b5d Updated submodules.
Change-Id: Ic0036e77b2b6700a6f177e4dbf07feec4d6b7167
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
2012-08-25 17:18:17 +02:00
Lars Knoll
93dbfad341 Updated submodules.
Change-Id: I077d126ef7a7b6490a625c971f72357614aeeb3f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-24 20:56:11 +02:00
Qt Submodule Update Bot
c0036e77b2 Updated submodules.
Change-Id: I1fdd777ae919214aac4f3f4951439739eb65644c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-24 05:46:45 +02:00
Lars Knoll
3ad7be1929 Updated submodules.
Change-Id: I36e3af2d6a1b8727754e705e470f4d541cb110a0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-23 22:04:33 +02:00
Simon Hausmann
ec77419ac8 New WebKit snapshot with various build fixes
Include make install on Windows (prospective), build on OS X 10.6 and
without QML2

Change-Id: I4e0448287af203d6a391c17b73ad1ba45dd7a164
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-23 17:14:33 +02:00
Qt Submodule Update Bot
1fdd777ae9 Updated submodules.
Change-Id: I25ca35fc58f272d17bde1e97d055762c2075daeb
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-23 02:17:17 +02:00
Simon Hausmann
002f18fd52 New WebKit snapshot with 64-bit MSVC build fix
Change-Id: I8d62d99047e5516f235c9f02769f6780b8c2b82a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-22 13:39:23 +02:00
Lars Knoll
2a5067e6cc Updated submodules.
Change-Id: Ifbf37f388c053bf377b04a2a19fe0da8e3e257b1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-21 23:36:17 +02:00
Simon Hausmann
9867c4af7b New WebKit snapshot
Includes build fixes for newer Qt 5

Change-Id: Ib32a0c6ef2b3b3891cb51104dc089597876566fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-21 16:03:42 +02:00
Qt Submodule Update Bot
25ca35fc58 Updated submodules.
Change-Id: I5d79b1f86dc3b073e6ca5565cd5676debd6ebe29
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-20 13:15:21 +02:00
Simon Hausmann
4541cd9f60 New WebKit snapshot
Fixes build issues with qwindowsysteminterface header file moves and
removes need for extra patches on top of WK1 MSVC build.

Change-Id: Iebf4e1727a79f8b9c857f7270ee2341eca8d9985
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-08-12 09:33:44 +02:00
Qt Submodule Update Bot
5d79b1f86d Updated submodules.
Change-Id: I263f260d580b7d66ee67419ecbab777b86227d99
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-08 15:29:41 +02:00
Lars Knoll
1117d4da2c Remove docgallery from qt5.git
The document gallery has been pretty much unmaintained for a year
now and the only backends we have are for tracker (ie. the N9),
the deprecated jsondb client API and the simulator. it doesn't
work anywhere else currently.

Change-Id: I5c12e23be7ed8862e891e996fbd6191e79f4fdef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-08-06 13:45:32 +02:00
Qt Submodule Update Bot
263f260d58 Updated submodules.
Change-Id: I05561273d53f0c197f528183fa0e6be09b8e3c0c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-08-02 07:09:41 +02:00
Qt Submodule Update Bot
05561273d5 Updated submodules.
Change-Id: I742353c43c52e58f4a7f21c721c43b62c46d6e5b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-08-02 00:32:15 +02:00
Qt Submodule Update Bot
742353c43c Updated submodules.
Change-Id: If7f4b927e892a034697729dd0818211ef2487b3f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-08-01 03:53:40 +02:00
Qt Submodule Update Bot
f7f4b927e8 Updated submodules.
Change-Id: Ie19caf122b2dd4d29119fb4d0367b1cf504c594c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-31 09:36:25 +02:00
Lars Knoll
5fb5e0dfc7 Remove phonon as discussed on the mailing list
phonon's upstream is in KDE's repositories and the port
to Qt 5 on qt-project is not maintained. So it's only
logical to remove it. KDE frameworks 5 will hopefully
provide a phonon module for Qt 5 again in the future.

Change-Id: I30189d921913868f2253841648ba57b2aaf3650c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-07-30 17:23:22 +02:00
Simon Hausmann
898848326a New WebKit snapshot with prospective Mac OS X Mountain Lion build fix
Change-Id: I1b526d3113cc99123758259b0c632512199c2648
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-30 11:41:41 +02:00
Simon Hausmann
ec904560e7 New WebKit snapshot that follows latest Qt API changes
Change-Id: I526701439f1768681b6b3424f07f3a5931aae1eb
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-24 17:08:04 +02:00
Simon Hausmann
65079e2706 New WebKit snapshot with better configure tests
Change-Id: I6de43b46f6d62a2dc68ef196bee60f6a79e743fa
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-23 09:34:26 +02:00
Laszlo Papp
654fcc335c Follow the protocol requests for webkit (special treatment for internal)
It is currently not possible to successfully run the init-repository script with
certain protocols, like "http", since those requests does not apply for
qtwebkit. Hence, the cloning of qtwebkit fails behind the corporate rules which
is against the original purpose of those command line options.

If the requested protocol is "internal", then the replacement of qtwebkit
should still be excluded since that would potentially cause breakages.

Change-Id: I738738f1c367cf1b4f18ffed05f37715a78e94ae
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-19 15:56:54 +02:00
Qt Submodule Update Bot
e19caf122b Updated submodules.
Change-Id: I2b4b350459cfab4638b5fd5b276f0b0d206120c8
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-19 15:55:50 +02:00
Qt Submodule Update Bot
2b4b350459 Updated submodules.
Change-Id: Id5fe783fda5471f3244c8c871cb0eb7f603c2458
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-19 06:15:55 +02:00
Qt Submodule Update Bot
d5fe783fda Updated submodules.
Change-Id: I1e7d6ecc9d7834f134a6050bc16f3245208b12a6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-18 19:11:45 +02:00
Simon Hausmann
c9fd867234 New snapshot that should fix the recently introduced rendering issues
Change-Id: Ie41f043dbe1693a620b1b03a975056ee0802adb1
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-18 14:04:30 +02:00
Rohan McGovern
34f300fd4b init-repository: fixed incorrect example for --mirror option
The full gerrit project name (including e.g. 'qt/' prefix) is appended
to the mirror. The previous example implied that only the last portion
was appended.

Change-Id: I6313427edc8e3dac0e9819ebec9de1d71763e07f
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
2012-07-18 07:38:00 +02:00
Qt Submodule Update Bot
1e7d6ecc9d Updated submodules.
Change-Id: If3e608ac5908ec87daf9ec5fabbb53131215ca6e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-17 01:12:09 +02:00
Simon Hausmann
bb7e88b0fb New WebKit snapshot with more Windows build fixes
Change-Id: I1945e611879ad24824db31d3fa208cf05cd5da00
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-16 16:19:47 +02:00
Qt Submodule Update Bot
f3e608ac59 Updated submodules.
Change-Id: Ib8aa817f803d8cb96e76c9f5ada24a6c5c8439ae
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-16 07:34:27 +02:00
Qt Submodule Update Bot
b8aa817f80 Updated submodules.
Change-Id: Ife4e459e44de1a90eb14498604e112d4ead4cb45
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-12 00:12:19 +02:00
Simon Hausmann
1d63be4b88 New WebKit snapshot that contains fixes needed after qtbase buildsystem changes
Change-Id: Ie9fc20e45b649422065da870dcd644e0b7497093
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
2012-07-11 14:31:08 +02:00
Aaron McCarthy
107515b047 Add soft dependency on Qt Multimedia to Qt Location.
The Qt Location mapviewer example makes use of Qt Multimedia.

Task-number: QTBUG-26468
Change-Id: Ifa6e71ef582e32866567ca318903e2359248a3d0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 08:59:38 +02:00
Qt Submodule Update Bot
fe4e459e44 Updated submodules.
Change-Id: I15426edcf0b62b2ec8ed114c2d5296f3b9d9d6f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 05:19:15 +02:00
Qt Submodule Update Bot
15426edcf0 Updated submodules.
Change-Id: I30214b8ee280d9845928ea867e0d7ab6f4adf70e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-11 00:20:29 +02:00
Qt Submodule Update Bot
30214b8ee2 Updated submodules.
Change-Id: I9e7d0c7a0d3ce5f15c48d3884dab10fc3026c160
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-10 00:22:18 +02:00
Qt Submodule Update Bot
9e7d0c7a0d Updated submodules.
Change-Id: Iaf77a620f74fa17a3b072356b2a5a1647bfad83b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-09 03:24:44 +02:00
Qt Submodule Update Bot
af77a620f7 Updated submodules.
Change-Id: I7e062e5d1ac6d8cce52e66b566fcc64480f5b377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-06 07:56:18 +02:00
Qt Submodule Update Bot
7e062e5d1a Updated submodules.
Change-Id: Iec8eecbaf8909e9d79921955cedd4417b2f0b4d4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-05 08:05:58 +02:00
Qt Submodule Update Bot
ec8eecbaf8 Updated submodules.
Change-Id: Ic6db6da949fb476b6623de5f8d5a57f64dde8de3
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-05 01:00:29 +02:00
Qt Submodule Update Bot
c6db6da949 Updated submodules.
Change-Id: I16ac53f263ea10a71064a9c93979bb28299845b2
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-04 14:28:21 +02:00
Qt Submodule Update Bot
16ac53f263 Updated submodules.
Change-Id: Ia6f6e65088e3d5180e317f3d5894165b4a4016b7
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-04 06:11:21 +02:00
Qt Submodule Update Bot
a6f6e65088 Updated submodules.
Change-Id: Ic5ceab9842c1778504fe8b064a1b08424e00cfc4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-04 00:59:10 +02:00
Qt Submodule Update Bot
c5ceab9842 Updated submodules.
Change-Id: Ia5eb50d59cb1465bb1c28c1e29212bf4f188d0cc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-03 14:37:30 +02:00
Qt Submodule Update Bot
a5eb50d59c Updated submodules.
Change-Id: Ic6fba546d194cef5b538a33e444330c28d64684c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-03 05:25:43 +02:00
Qt Submodule Update Bot
c6fba546d1 Updated submodules.
Change-Id: Ib18a0dcff0d2bcaf249fddf9aa73469d23f3c694
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-03 00:39:26 +02:00
Qt Submodule Update Bot
b18a0dcff0 Updated submodules.
Change-Id: I758fc0b6db4d360ea5ea3d0e814b0212aa2fe8ac
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-07-02 14:40:04 +02:00
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
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
Oswald Buddenhagen
c2543dc358 be explicit about qtbase/configure failing
so one has a base directory for paths it reports.

Task-number: QTBUG-25190
Change-Id: Ib222e2d7b07bf986a9eccd6934e51574b5a5a052
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-20 11:33:35 +02:00
Qt Submodule Update Bot
6562d7b44d Updated submodules.
Change-Id: Iee405a2fc2ec148a1807752270d692e30a6d01a5
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-04-17 10:05:34 +02:00
Qt Submodule Update Bot
ee405a2fc2 Updated submodules.
Change-Id: I2ff258da4c471556c58008035f13f0aadfae2635
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-17 01:16:54 +02:00
Qt Submodule Update Bot
2ff258da4c Updated submodules.
Change-Id: Id71eac3df29719dab31738d5ce6dd8a95cbe2642
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-16 01:06:21 +02:00
Qt Submodule Update Bot
d71eac3df2 Updated submodules.
Change-Id: I3ffb06482d9e956bbb211bf3d859f0c4fc4c0bbf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-14 01:13:08 +02:00
Qt Submodule Update Bot
3ffb06482d Updated submodules.
Change-Id: Ib56dc98feea2a1f3d08d3886bc37997aea5839b0
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2012-04-13 09:52:54 +02:00
Qt Submodule Update Bot
b56dc98fee Updated submodules.
Change-Id: I326ac549a1082e6aaf315fea0da08a7c40a225cd
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-13 00:47:06 +02:00
Marius Storm-Olsen
63124a31c7 Merge commit 'qt-v5.0.0-alpha1'
Change-Id: I182dae2e5c8622227751346b82822af0e90853c4
2012-04-11 13:24:27 -05:00
Oswald Buddenhagen
ba669e8f03 sort subdirs by dependencies
not just using $$sort_depends(), so that the independent modules are
still sorted more or less logically.

Change-Id: I0c9630e338395997f7ee3cb40ef3028b8754af11
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-04-11 10:42:06 +02:00
Qt Submodule Update Bot
326ac549a1 Updated submodules.
Change-Id: I3d84b25eb5e300e427ef4c3e7329207f74dacd25
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-10 14:02:03 +02:00
Qt Submodule Update Bot
3d84b25eb5 Updated submodules.
Change-Id: I84dac570b9f422bd182b6389e58159a49349e260
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-10 03:38:16 +02:00
Qt Submodule Update Bot
84dac570b9 Updated submodules.
Change-Id: I51ca55ff29f53b909c3614b56609e067d2066124
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-07 00:45:35 +02:00
Qt Submodule Update Bot
51ca55ff29 Updated submodules.
Change-Id: If1a52c15fac028718d6f8ff6d2174a23cecb0e16
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-05 09:57:22 +02:00
Marius Storm-Olsen
1de59c1a07 Fix building on Windows and OSX
A problem with the dependency algorithm would make the top-most
dependent module not compile. Also affects building QtWayland on
Linux.

OSX has a problem when doing 'make install' on Qt configured with
prefix pointing to qtbase (no installation needed), so disable that
for the alpha, like on Windows.

Also, remove a redundant line in the script.

Change-Id: I368e80520977cf8a4bfcbbf13445f50c820aee9c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
6ab6bd8ff7 Avoid building webkit by default on Windows for now
WebKit still doesn't compile cleanly on Windows, so avoid it until
we have something which works.

Change-Id: I468dfbd01741705cd0bba3b035855d46acbb42e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
e4ed3288e9 Add build dependency for qtwayland + make qtwayland non default module
Running
    ./build qtwayland
will build qtwayland and its dependencies.

Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Marius Storm-Olsen
72f4597c9d Avoid 'make install' on Windows
We normally don't 'make install' on Windows, so avoid it for the alpha.

Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-04-05 04:35:38 +02:00
Qt Submodule Update Bot
f1a52c15fa Updated submodules.
Change-Id: Ifeb89e2305c7c378fe2ccb12f60e199822376f90
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-04-05 00:20:06 +02:00
Friedemann Kleint
38adcf8077 build: Do not clobber existing values of CL environment variable.
Change-Id: I88708560e0885fefa149aec7bd9789e585a79d57
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-04-04 18:33:30 +02:00
Qt Submodule Update Bot
feb89e2305 Updated submodules.
Change-Id: I15f3399576bd433898f8e89bbcb3c1196e0da5b9
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-31 14:33:43 +02:00
Simon Hausmann
8660603bb6 WebKit build fix (backport of http://trac.webkit.org/changeset/110426)
Change-Id: Id8c63524a068b8b604677c7115e7bdb2e6ab3b5c
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-30 14:05:28 +02:00
Friedemann Kleint
74f7b7f74c Fix build instructions (-j <n>).
Change-Id: Ib9b23fed10b687e67859058fb35f92b2250be98f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-29 16:23:47 +02:00
Qt Submodule Update Bot
15f3399576 Updated submodules.
Change-Id: I712875dc293a4f71fd0a99646c8cd9c36b183ecf
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2012-03-29 10:13:09 +02:00
61 changed files with 2839 additions and 1564 deletions

View File

@@ -4,15 +4,27 @@
# ==[ Details: Describe what changed and explain why it changed ]======|
# Change log entry (see below for instructions).
#[ChangeLog][][]
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# One task per entry. Remember space after colon.
#Task-number:
#
# Solicit reviewers. They still need to use the Gerrit frontend.
#Reviewed-by:
# ==[ Please wrap at 72 characters ]===================================|
#
# Remember to read http://wiki.qt-project.org/Commit_Policy
# Remember to read http://wiki.qt.io/Commit_Policy
#
# Change log entry: If this commit adds a significant feature, fixes an
# issue or contains a behavior change that is relevant to others,
# add a change log entry. It can be multiple lines long and ends with an
# empty newline. Try to integrate it into the flow of the commit message
# to avoid redundancy.
# Use the module name to indicate the area of the change e.g. [QtCore].
# Optionally specify a class or subtopic [QtNetwork][QSslSocket].
# Other common tags are: [General], [Important Behavior Changes],
# [Platform Specific Changes][Windows][OS X][Linux/XCB].
#
# [ChangeLog][module][class/topic] description of the really important
# change that was just made on several lines.

7
.gitattributes vendored Normal file
View File

@@ -0,0 +1,7 @@
.tag export-subst
.gitignore export-ignore
.gitattributes export-ignore
.gitmodules export-ignore
.commit-template export-ignore
init-repository export-ignore
README.git export-ignore

260
.gitignore vendored
View File

@@ -1,259 +1,3 @@
# This file is used to ignore files which are generated in the Qt build system
# ----------------------------------------------------------------------------
examples/*/*/*
!examples/*/*/*[.]*
!examples/*/*/README
examples/*/*/*[.]app
!examples/declarative/*
!examples/tutorials/*
!examples/tutorials/*/*
!examples/ja_JP/*/*
demos/*/*
!demos/spectrum/*
demos/spectrum/bin
!demos/*/*[.]*
demos/*/*[.]app
!demos/declarative/*
config.tests/*/*/*
!config.tests/*/*/*[.]*
config.tests/*/*/*[.]app
callgrind.out.*
pcviewer.cfg
*~
*.a
*.la
*.core
*.moc
*.o
*.obj
*.orig
*.swp
*.rej
*.so
*.pbxuser
*.mode1
*.mode1v3
*_pch.h.cpp
*_resource.rc
.#*
*.*#
core
Makefile
.qmake.cache
.qmake.vars
*.prl
tags
.DS_Store
*.debug
Makefile*
!qmake/Makefile.win32*
!qmake/Makefile.unix
*.prl
*.app
*.pro.user
*.qmlproject.user
*.gcov
bin/Qt*.dll
bin/assistant*
bin/designer*
bin/dumpcpp*
bin/idc*
bin/linguist*
bin/lrelease*
bin/lupdate*
bin/lconvert*
bin/moc*
bin/makeqpf*
bin/pixeltool*
bin/qmake*
bin/qdoc3*
bin/qt3to4*
bin/qtdemo*
bin/qttracereplay*
bin/rcc*
bin/uic*
bin/patternist*
bin/phonon*
bin/qcollectiongenerator*
bin/qdbus*
bin/qhelpconverter*
bin/qhelpgenerator*
bin/qtconfig*
bin/xmlpatterns*
bin/cetest*
bin/collectiongenerator
bin/helpconverter
bin/helpgenerator
bin/kmap2qmap*
bin/qlalr*
bin/qmlconv*
bin/qmldebugger*
bin/qml*
bin/qttracereplay*
configure.cache
config.status
mkspecs/default
mkspecs/qconfig.pri
moc_*.cpp
qmake/qmake.exe
qmake/Makefile.bak
src/corelib/global/qconfig.cpp
src/corelib/global/qconfig.h
src/corelib/global/qconfig.h.qmake
ui_*.h
tests/auto/qprocess/test*/*.exe
tests/auto/qtcpsocket/stressTest/*.exe
tests/auto/qprocess/fileWriterProcess/*.exe
tests/auto/qmake/testdata/quotedfilenames/*.exe
tests/auto/compilerwarnings/*.exe
tests/auto/qmake/testdata/quotedfilenames/test.cpp
tests/auto/qprocess/fileWriterProcess.txt
.com.apple.timemachine.supported
tests/auto/qlibrary/libmylib.so*
tests/auto/qresourceengine/runtime_resource.rcc
tools/activeqt/testcon/testcon.tlb
translations/*.qm
translations/*_untranslated.ts
qrc_*.cpp
# Test generated files
QObject.log
tst_*
!tst_*.*
tst_*.log
tst_*.debug
tst_*~
# xemacs temporary files
*.flc
# Vim temporary files
.*.swp
# Visual Studio generated files
*.ib_pdb_index
*.idb
*.ilk
*.pdb
*.sln
*.suo
*.vcproj
*vcproj.*.*.user
*.ncb
*.vcxproj
*.vcxproj.filters
*.vcxproj.user
# MinGW generated files
*.Debug
*.Release
# WebKit temp files
src/3rdparty/webkit/WebCore/mocinclude.tmp
src/3rdparty/webkit/includes.txt
src/3rdparty/webkit/includes2.txt
# Symlinks generated by configure
tools/qvfb/qvfbhdr.h
tools/qvfb/qlock_p.h
tools/qvfb/qlock.cpp
tools/qvfb/qwssignalhandler.cpp
tools/qvfb/qwssignalhandler_p.h
.DS_Store
.pch
.rcc
*.app
config.status
config.tests/unix/cups/cups
config.tests/unix/getaddrinfo/getaddrinfo
config.tests/unix/getifaddrs/getifaddrs
config.tests/unix/iconv/iconv
config.tests/unix/ipv6/ipv6
config.tests/unix/ipv6ifname/ipv6ifname
config.tests/unix/largefile/largefile
config.tests/unix/nis/nis
config.tests/unix/odbc/odbc
config.tests/unix/openssl/openssl
config.tests/unix/stl/stl
config.tests/unix/zlib/zlib
config.tests/unix/3dnow/3dnow
config.tests/unix/mmx/mmx
config.tests/unix/sse/sse
config.tests/unix/sse2/sse2
# Directories to ignore
# ---------------------
debug
examples/tools/plugandpaint/plugins
include/*
include/*/*
lib/*
!lib/fonts
!lib/README
plugins/*/*
release
tmp
doc-build
doc/html/*
doc/qch
doc-build
.rcc
.pch
.metadata
# Symbian build system generated files
# ---------------------
ABLD.BAT
bld.inf*
*.mmp
*.mk
*.rss
*.loc
!s60main.rss
*.pkg
plugin_commonu.def
*.qtplugin
*.sis
*.sisx
*.lst
*.exe
*.mif
*.rsc
*.sym
*.lib
# runonphone crash dumps
d_exc_*.txt
d_exc_*.stk
# Generated by abldfast.bat from devtools.
.abldsteps.*
# Carbide project files
# ---------------------
.project
.cproject
.make.cache
*.d
qtc-debugging-helper
src/corelib/lib
src/network/lib
src/xml/lib/
.pc/
# INTEGRITY generated files
*.gpj
*.int
*.ael
*.dla
*.dnm
*.dep
*.map
work
.qmake.super

164
.gitmodules vendored
View File

@@ -1,57 +1,175 @@
[submodule "qtbase"]
path = qtbase
url = git://gitorious.org/qt/qtbase.git
url = ../qtbase.git
branch = 5.4
initrepo = true
[submodule "qtsvg"]
path = qtsvg
url = git://gitorious.org/qt/qtsvg.git
url = ../qtsvg.git
branch = 5.4
initrepo = true
[submodule "qtdeclarative"]
path = qtdeclarative
url = git://gitorious.org/qt/qtdeclarative.git
url = ../qtdeclarative.git
branch = 5.4
initrepo = true
[submodule "qtactiveqt"]
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.4
initrepo = true
[submodule "qtscript"]
path = qtscript
url = git://gitorious.org/qt/qtscript.git
url = ../qtscript.git
branch = 5.4
initrepo = true
[submodule "qtmultimedia"]
path = qtmultimedia
url = git://gitorious.org/qt/qtmultimedia.git
url = ../qtmultimedia.git
branch = 5.4
initrepo = true
[submodule "qttools"]
path = qttools
url = git://gitorious.org/qt/qttools.git
url = ../qttools.git
branch = 5.4
initrepo = true
[submodule "qtxmlpatterns"]
path = qtxmlpatterns
url = git://gitorious.org/qt/qtxmlpatterns.git
url = ../qtxmlpatterns.git
branch = 5.4
initrepo = true
[submodule "qttranslations"]
path = qttranslations
url = ../qttranslations.git
branch = 5.4
initrepo = true
[submodule "qtdoc"]
path = qtdoc
url = git://gitorious.org/qt/qtdoc.git
[submodule "qtwebkit-examples-and-demos"]
path = qtwebkit-examples-and-demos
url = git://gitorious.org/qt/qtwebkit-examples-and-demos.git
url = ../qtdoc.git
branch = 5.4
initrepo = true
[submodule "qtrepotools"]
path = qtrepotools
url = ../qtrepotools.git
branch = master
initrepo = true
[submodule "qtwebkit"]
path = qtwebkit
url = git://gitorious.org/qtwebkit/qt5-module.git
url = ../qtwebkit.git
branch = 5.4
initrepo = true
[submodule "qtwebkit-examples"]
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = 5.4
initrepo = true
[submodule "qtqa"]
path = qtqa
url = ../qtqa.git
branch = master
initrepo = true
[submodule "qtlocation"]
path = qtlocation
url = git://gitorious.org/qt/qtlocation.git
url = ../qtlocation.git
branch = 5.4
initrepo = true
[submodule "qtsensors"]
path = qtsensors
url = git://gitorious.org/qt/qtsensors.git
url = ../qtsensors.git
branch = 5.4
initrepo = true
[submodule "qtsystems"]
path = qtsystems
url = git://gitorious.org/qt/qtsystems.git
url = ../qtsystems.git
branch = dev
[submodule "qtfeedback"]
path = qtfeedback
url = ../qtfeedback.git
branch = master
[submodule "qtdocgallery"]
path = qtdocgallery
url = ../qtdocgallery.git
branch = master
[submodule "qtpim"]
path = qtpim
url = ../qtpim.git
branch = dev
[submodule "qtconnectivity"]
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.4
initrepo = true
[submodule "qtwayland"]
path = qtwayland
url = git://gitorious.org/qt/qtwayland.git
url = ../qtwayland.git
branch = 5.4
initrepo = true
[submodule "qt3d"]
path = qt3d
url = git://gitorious.org/qt/qt3d.git
[submodule "qtjsbackend"]
path = qtjsbackend
url = git://gitorious.org/qt/qtjsbackend.git
url = ../qt3d.git
branch = dev
[submodule "qtimageformats"]
path = qtimageformats
url = git://gitorious.org/qt/qtimageformats.git
url = ../qtimageformats.git
branch = 5.4
initrepo = true
[submodule "qtquick1"]
path = qtquick1
url = git://gitorious.org/qt/qtquick1.git
url = ../qtquick1.git
branch = 5.4
initrepo = true
[submodule "qtgraphicaleffects"]
path = qtgraphicaleffects
url = git://gitorious.org/qt/qtgraphicaleffects.git
url = ../qtgraphicaleffects.git
branch = 5.4
initrepo = true
[submodule "qtquickcontrols"]
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.4
initrepo = true
[submodule "qtserialport"]
path = qtserialport
url = ../qtserialport.git
branch = 5.4
initrepo = true
[submodule "qtx11extras"]
path = qtx11extras
url = ../qtx11extras.git
branch = 5.4
initrepo = true
[submodule "qtmacextras"]
path = qtmacextras
url = ../qtmacextras.git
branch = 5.4
initrepo = true
[submodule "qtwinextras"]
path = qtwinextras
url = ../qtwinextras.git
branch = 5.4
initrepo = true
[submodule "qtandroidextras"]
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.4
initrepo = true
[submodule "qtenginio"]
path = qtenginio
url = ../qtenginio.git
branch = 1.1
initrepo = true
[submodule "qtwebsockets"]
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.4
initrepo = true
[submodule "qtwebchannel"]
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.4
initrepo = true
[submodule "qtwebengine"]
path = qtwebengine
url = ../qtwebengine.git
branch = 5.4
initrepo = true

1
.tag Normal file
View File

@@ -0,0 +1 @@
$Format:%H$

22
LGPL_EXCEPTION.txt Normal file
View File

@@ -0,0 +1,22 @@
Digia Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.

450
LICENSE.FDL Normal file
View File

@@ -0,0 +1,450 @@
GNU Free Documentation License
Version 1.3, 3 November 2008
Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
<http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
0. PREAMBLE
The purpose of this License is to make a manual, textbook, or other
functional and useful document "free" in the sense of freedom: to
assure everyone the effective freedom to copy and redistribute it,
with or without modifying it, either commercially or noncommercially.
Secondarily, this License preserves for the author and publisher a way
to get credit for their work, while not being considered responsible
for modifications made by others.
This License is a kind of "copyleft", which means that derivative
works of the document must themselves be free in the same sense. It
complements the GNU General Public License, which is a copyleft
license designed for free software.
We have designed this License in order to use it for manuals for free
software, because free software needs free documentation: a free
program should come with manuals providing the same freedoms that the
software does. But this License is not limited to software manuals;
it can be used for any textual work, regardless of subject matter or
whether it is published as a printed book. We recommend this License
principally for works whose purpose is instruction or reference.
1. APPLICABILITY AND DEFINITIONS
This License applies to any manual or other work, in any medium, that
contains a notice placed by the copyright holder saying it can be
distributed under the terms of this License. Such a notice grants a
world-wide, royalty-free license, unlimited in duration, to use that
work under the conditions stated herein. The "Document", below,
refers to any such manual or work. Any member of the public is a
licensee, and is addressed as "you". You accept the license if you
copy, modify or distribute the work in a way requiring permission
under copyright law.
A "Modified Version" of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
modifications and/or translated into another language.
A "Secondary Section" is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall
subject (or to related matters) and contains nothing that could fall
directly within that overall subject. (Thus, if the Document is in
part a textbook of mathematics, a Secondary Section may not explain
any mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
commercial, philosophical, ethical or political position regarding
them.
The "Invariant Sections" are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
that says that the Document is released under this License. If a
section does not fit the above definition of Secondary then it is not
allowed to be designated as Invariant. The Document may contain zero
Invariant Sections. If the Document does not identify any Invariant
Sections then there are none.
The "Cover Texts" are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
the Document is released under this License. A Front-Cover Text may
be at most 5 words, and a Back-Cover Text may be at most 25 words.
A "Transparent" copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
general public, that is suitable for revising the document
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
format whose markup, or absence of markup, has been arranged to thwart
or discourage subsequent modification by readers is not Transparent.
An image format is not Transparent if used for any substantial amount
of text. A copy that is not "Transparent" is called "Opaque".
Examples of suitable formats for Transparent copies include plain
ASCII without markup, Texinfo input format, LaTeX input format, SGML
or XML using a publicly available DTD, and standard-conforming simple
HTML, PostScript or PDF designed for human modification. Examples of
transparent image formats include PNG, XCF and JPG. Opaque formats
include proprietary formats that can be read and edited only by
proprietary word processors, SGML or XML for which the DTD and/or
processing tools are not generally available, and the
machine-generated HTML, PostScript or PDF produced by some word
processors for output purposes only.
The "Title Page" means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
this License requires to appear in the title page. For works in
formats which do not have any title page as such, "Title Page" means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.
The "publisher" means any person or entity that distributes copies of
the Document to the public.
A section "Entitled XYZ" means a named subunit of the Document whose
title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a
specific section name mentioned below, such as "Acknowledgements",
"Dedications", "Endorsements", or "History".) To "Preserve the Title"
of such a section when you modify the Document means that it remains a
section "Entitled XYZ" according to this definition.
The Document may include Warranty Disclaimers next to the notice which
states that this License applies to the Document. These Warranty
Disclaimers are considered to be included by reference in this
License, but only as regards disclaiming warranties: any other
implication that these Warranty Disclaimers may have is void and has
no effect on the meaning of this License.
2. VERBATIM COPYING
You may copy and distribute the Document in any medium, either
commercially or noncommercially, provided that this License, the
copyright notices, and the license notice saying this License applies
to the Document are reproduced in all copies, and that you add no
other conditions whatsoever to those of this License. You may not use
technical measures to obstruct or control the reading or further
copying of the copies you make or distribute. However, you may accept
compensation in exchange for copies. If you distribute a large enough
number of copies you must also follow the conditions in section 3.
You may also lend copies, under the same conditions stated above, and
you may publicly display copies.
3. COPYING IN QUANTITY
If you publish printed copies (or copies in media that commonly have
printed covers) of the Document, numbering more than 100, and the
Document's license notice requires Cover Texts, you must enclose the
copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
the full title with all words of the title equally prominent and
visible. You may add other material on the covers in addition.
Copying with changes limited to the covers, as long as they preserve
the title of the Document and satisfy these conditions, can be treated
as verbatim copying in other respects.
If the required texts for either cover are too voluminous to fit
legibly, you should put the first ones listed (as many as fit
reasonably) on the actual cover, and continue the rest onto adjacent
pages.
If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
a computer-network location from which the general network-using
public has access to download using public-standard network protocols
a complete Transparent copy of the Document, free of added material.
If you use the latter option, you must take reasonably prudent steps,
when you begin distribution of Opaque copies in quantity, to ensure
that this Transparent copy will remain thus accessible at the stated
location until at least one year after the last time you distribute an
Opaque copy (directly or through your agents or retailers) of that
edition to the public.
It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to
give them a chance to provide you with an updated version of the
Document.
4. MODIFICATIONS
You may copy and distribute a Modified Version of the Document under
the conditions of sections 2 and 3 above, provided that you release
the Modified Version under precisely this License, with the Modified
Version filling the role of the Document, thus licensing distribution
and modification of the Modified Version to whoever possesses a copy
of it. In addition, you must do these things in the Modified Version:
A. Use in the Title Page (and on the covers, if any) a title distinct
from that of the Document, and from those of previous versions
(which should, if there were any, be listed in the History section
of the Document). You may use the same title as a previous version
if the original publisher of that version gives permission.
B. List on the Title Page, as authors, one or more persons or entities
responsible for authorship of the modifications in the Modified
Version, together with at least five of the principal authors of the
Document (all of its principal authors, if it has fewer than five),
unless they release you from this requirement.
C. State on the Title page the name of the publisher of the
Modified Version, as the publisher.
D. Preserve all the copyright notices of the Document.
E. Add an appropriate copyright notice for your modifications
adjacent to the other copyright notices.
F. Include, immediately after the copyright notices, a license notice
giving the public permission to use the Modified Version under the
terms of this License, in the form shown in the Addendum below.
G. Preserve in that license notice the full lists of Invariant Sections
and required Cover Texts given in the Document's license notice.
H. Include an unaltered copy of this License.
I. Preserve the section Entitled "History", Preserve its Title, and add
to it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section Entitled "History" in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.
J. Preserve the network location, if any, given in the Document for
public access to a Transparent copy of the Document, and likewise
the network locations given in the Document for previous versions
it was based on. These may be placed in the "History" section.
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.
K. For any section Entitled "Acknowledgements" or "Dedications",
Preserve the Title of the section, and preserve in the section all
the substance and tone of each of the contributor acknowledgements
and/or dedications given therein.
L. Preserve all the Invariant Sections of the Document,
unaltered in their text and in their titles. Section numbers
or the equivalent are not considered part of the section titles.
M. Delete any section Entitled "Endorsements". Such a section
may not be included in the Modified Version.
N. Do not retitle any existing section to be Entitled "Endorsements"
or to conflict in title with any Invariant Section.
O. Preserve any Warranty Disclaimers.
If the Modified Version includes new front-matter sections or
appendices that qualify as Secondary Sections and contain no material
copied from the Document, you may at your option designate some or all
of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
You may add a section Entitled "Endorsements", provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
standard.
You may add a passage of up to five words as a Front-Cover Text, and a
passage of up to 25 words as a Back-Cover Text, to the end of the list
of Cover Texts in the Modified Version. Only one passage of
Front-Cover Text and one of Back-Cover Text may be added by (or
through arrangements made by) any one entity. If the Document already
includes a cover text for the same cover, previously added by you or
by arrangement made by the same entity you are acting on behalf of,
you may not add another; but you may replace the old one, on explicit
permission from the previous publisher that added the old one.
The author(s) and publisher(s) of the Document do not by this License
give permission to use their names for publicity for or to assert or
imply endorsement of any Modified Version.
5. COMBINING DOCUMENTS
You may combine the Document with other documents released under this
License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
license notice, and that you preserve all their Warranty Disclaimers.
The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
copy. If there are multiple Invariant Sections with the same name but
different contents, make the title of each such section unique by
adding at the end of it, in parentheses, the name of the original
author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.
In the combination, you must combine any sections Entitled "History"
in the various original documents, forming one section Entitled
"History"; likewise combine any sections Entitled "Acknowledgements",
and any sections Entitled "Dedications". You must delete all sections
Entitled "Endorsements".
6. COLLECTIONS OF DOCUMENTS
You may make a collection consisting of the Document and other
documents released under this License, and replace the individual
copies of this License in the various documents with a single copy
that is included in the collection, provided that you follow the rules
of this License for verbatim copying of each of the documents in all
other respects.
You may extract a single document from such a collection, and
distribute it individually under this License, provided you insert a
copy of this License into the extracted document, and follow this
License in all other respects regarding verbatim copying of that
document.
7. AGGREGATION WITH INDEPENDENT WORKS
A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
distribution medium, is called an "aggregate" if the copyright
resulting from the compilation is not used to limit the legal rights
of the compilation's users beyond what the individual works permit.
When the Document is included in an aggregate, this License does not
apply to the other works in the aggregate which are not themselves
derivative works of the Document.
If the Cover Text requirement of section 3 is applicable to these
copies of the Document, then if the Document is less than one half of
the entire aggregate, the Document's Cover Texts may be placed on
covers that bracket the Document within the aggregate, or the
electronic equivalent of covers if the Document is in electronic form.
Otherwise they must appear on printed covers that bracket the whole
aggregate.
8. TRANSLATION
Translation is considered a kind of modification, so you may
distribute translations of the Document under the terms of section 4.
Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License, and all the license notices in the
Document, and any Warranty Disclaimers, provided that you also include
the original English version of this License and the original versions
of those notices and disclaimers. In case of a disagreement between
the translation and the original version of this License or a notice
or disclaimer, the original version will prevail.
If a section in the Document is Entitled "Acknowledgements",
"Dedications", or "History", the requirement (section 4) to Preserve
its Title (section 1) will typically require changing the actual
title.
9. TERMINATION
You may not copy, modify, sublicense, or distribute the Document
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense, or distribute it is void, and
will automatically terminate your rights under this License.
However, if you cease all violation of this License, then your license
from a particular copyright holder is reinstated (a) provisionally,
unless and until the copyright holder explicitly and finally
terminates your license, and (b) permanently, if the copyright holder
fails to notify you of the violation by some reasonable means prior to
60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, receipt of a copy of some or all of the same material does
not give you any rights to use it.
10. FUTURE REVISIONS OF THIS LICENSE
The Free Software Foundation may publish new, revised versions of the
GNU Free Documentation License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in
detail to address new problems or concerns. See
http://www.gnu.org/copyleft/.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
License "or any later version" applies to it, you have the option of
following the terms and conditions either of that specified version or
of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation. If the Document
specifies that a proxy can decide which future versions of this
License can be used, that proxy's public statement of acceptance of a
version permanently authorizes you to choose that version for the
Document.
11. RELICENSING
"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
World Wide Web server that publishes copyrightable works and also
provides prominent facilities for anybody to edit those works. A
public wiki that anybody can edit is an example of such a server. A
"Massive Multiauthor Collaboration" (or "MMC") contained in the site
means any set of copyrightable works thus published on the MMC site.
"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
license published by Creative Commons Corporation, a not-for-profit
corporation with a principal place of business in San Francisco,
California, as well as future copyleft versions of that license
published by that same organization.
"Incorporate" means to publish or republish a Document, in whole or in
part, as part of another Document.
An MMC is "eligible for relicensing" if it is licensed under this
License, and if all works that were first published under this License
somewhere other than this MMC, and subsequently incorporated in whole or
in part into the MMC, (1) had no cover texts or invariant sections, and
(2) were thus incorporated prior to November 1, 2008.
The operator of an MMC Site may republish an MMC contained in the site
under CC-BY-SA on the same site at any time before August 1, 2009,
provided the MMC is eligible for relicensing.
ADDENDUM: How to use this License for your documents
To use this License in a document you have written, include a copy of
the License in the document and put the following copyright and
license notices just after the title page:
Copyright (c) YEAR YOUR NAME.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License".
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
replace the "with...Texts." line with this:
with the Invariant Sections being LIST THEIR TITLES, with the
Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
If you have Invariant Sections without Cover Texts, or some other
combination of the three, merge those two alternatives to suit the
situation.
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of
free software license, such as the GNU General Public License,
to permit their use in free software.

292
LICENSE.GPLv2 Normal file
View File

@@ -0,0 +1,292 @@
GNU GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU General Public License version 2, which is displayed below.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your freedom
to share and change it. By contrast, the GNU General Public License is
intended to guarantee your freedom to share and change free software
--to make sure the software is free for all its users. This General
Public License applies to most of the Free Software Foundation's
software and to any other program whose authors commit to using it.
(Some other Free Software Foundation software is covered by the GNU
Lesser General Public License instead.) You can apply it to your
programs, too.
When we speak of free software, we are referring to freedom, not price.
Our General Public Licenses are designed to make sure that you have the
freedom to distribute copies of free software (and charge for this
service if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid anyone
to deny you these rights or to ask you to surrender the rights. These
restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether gratis
or for a fee, you must give the recipients all the rights that you
have. You must make sure that they, too, receive or can get the source
code. And you must show them these terms so they know their rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software patents.
We wish to avoid the danger that redistributors of a free program will
individually obtain patent licenses, in effect making the program
proprietary. To prevent this, we have made it clear that any patent
must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains a
notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of running
the Program is not restricted, and the output from the Program is
covered only if its contents constitute a work based on the Program
(independent of having been made by running the Program). Whether that
is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's source
code as you receive it, in any medium, provided that you conspicuously
and appropriately publish on each copy an appropriate copyright notice
and disclaimer of warranty; keep intact all the notices that refer to
this License and to the absence of any warranty; and give any other
recipients of the Program a copy of this License along with the
Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion of
it, thus forming a work based on the Program, and copy and distribute
such modifications or work under the terms of Section 1 above, provided
that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but does
not normally print such an announcement, your work based on the
Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of a
storage or distribution medium does not bring the other work under the
scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software
interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your cost
of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to control
compilation and installation of the executable. However, as a special
exception, the source code distributed need not include anything that
is normally distributed (in either source or binary form) with the
major components (compiler, kernel, and so on) of the operating system
on which the executable runs, unless that component itself accompanies
the executable.
If distribution of executable or object code is made by offering access
to copy from a designated place, then offering equivalent access to
copy the source code from the same place counts as distribution of the
source code, even though third parties are not compelled to copy the
source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt otherwise
to copy, modify, sublicense or distribute the Program is void, and will
automatically terminate your rights under this License. However,
parties who have received copies, or rights, from you under this License
will not have their licenses terminated so long as such parties remain
in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further restrictions
on the recipients' exercise of the rights granted herein. You are not
responsible for enforcing compliance by third parties to this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent license
would not permit royalty-free redistribution of the Program by all
those who receive copies directly or indirectly through you, then the
only way you could satisfy both it and this License would be to refrain
entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License may
add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among countries
not thus excluded. In such case, this License incorporates the limitation
as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail
to address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Program does not specify a version
number of this License, you may choose any version ever published by
the Free Software Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the
author to ask for permission. For software which is copyrighted by
the Free Software Foundation, write to the Free Software Foundation;
we sometimes make exceptions for this. Our decision will be guided by
the two goals of preserving the free status of all derivatives of our
free software and of promoting the sharing and reuse of software
generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
NECESSARY SERVICING, REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE
TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS

514
LICENSE.LGPLv21 Normal file
View File

@@ -0,0 +1,514 @@
GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 2.1, which is displayed below.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!

173
LICENSE.LGPLv3 Normal file
View File

@@ -0,0 +1,173 @@
GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 3, which is displayed below.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this
licensedocument, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, “this License” refers to version 3 of the GNU Lesser
General Public License, and the “GNU GPL” refers to version 3 of the
GNU General Public License.
“The Library” refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An “Application” is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A “Combined Work” is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the “Linked
Version”.
The “Minimal Corresponding Source” for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The “Corresponding Application Code” for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort
to ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this
license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken
together, effectively do not restrict modification of the portions of
the Library contained in the Combined Work and reverse engineering for
debugging such modifications, if you also do each of the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this
license document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of
this License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with
the Library. A suitable mechanism is one that (a) uses at run
time a copy of the Library already present on the user's
computer system, and (b) will operate properly with a modified
version of the Library that is interface-compatible with the
Linked Version.
e) Provide Installation Information, but only if you would
otherwise be required to provide such information under section 6
of the GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the Application
with a modified version of the Linked Version. (If you use option
4d0, the Installation Information must accompany the Minimal
Corresponding Source and Corresponding Application Code. If you
use option 4d1, you must provide the Installation Information in
the manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library
side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of
it is a work based on the Library, and explaining where to find
the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
as you received it specifies that a certain numbered version of the
GNU Lesser General Public License “or any later version” applies to
it, you have the option of following the terms and conditions either
of that published version or of any later version published by the
Free Software Foundation. If the Library as you received it does not
specify a version number of the GNU Lesser General Public License,
you may choose any version of the GNU Lesser General Public License
ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the Library.

628
LICENSE.PREVIEW.COMMERCIAL Normal file
View File

@@ -0,0 +1,628 @@
TECHNOLOGY PREVIEW LICENSE AGREEMENT
For individuals and/or legal entities resident in the Americas (North
America, Central America and South America), the applicable licensing
terms are specified under the heading "Technology Preview License
Agreement: The Americas".
For individuals and/or legal entities not resident in The Americas, the
applicable licensing terms are specified under the heading "Technology
Preview License Agreement: Rest of the World".
TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
Agreement version 2.4
This Technology Preview License Agreement ("Agreement")is a legal agreement
between Digia USA, Inc. ("Digia"), with its registered office at 2350
Mission College Blvd., Suite 1020, Santa Clara, California 95054,
U.S.A. and you (either an individual or a legal entity) ("Licensee") for the
Licensed Software (as defined below).
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be governed by and construed in accordance with the
federal laws of the United States of America and the internal laws of
the State of New York without given effect to any choice of law rule
that would result in the application of the laws of any other
jurisdiction. The United Nations Convention on Contracts for the
International Sale of Goods (CISG) shall not apply. Each Party (a)
hereby irrevocably submits itself to and consents to the jurisdiction of
the United States District Court for the Southern District of New York
(or if such court lacks jurisdiction, the state courts of the State of
New York) for the purposes of any action, claim, suit or proceeding
between the Parties in connection with any controversy, claim, or
dispute arising out of or relating to this Agreement; and (b) hereby
waives, and agrees not to assert by way of motion, as a defense or
otherwise, in any such action, claim, suit or proceeding, any claim that
is not personally subject to the jurisdiction of such court(s), that the
action, claim, suit or proceeding is brought in an inconvenient forum or
that the venue of the action, claim, suit or proceeding is improper.
Notwithstanding the foregoing, nothing in this Section 9.6 is intended
to, or shall be deemed to, constitute a submission or consent to, or
selection of, jurisdiction, forum or venue for any action for patent
infringement, whether or not such action relates to this Agreement.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.
TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
Agreement version 2.4
This Technology Preview License Agreement ("Agreement") is a legal
agreement between Digia Finland Ltd ("Digia"), with its registered office at
Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a
legal entity) ("Licensee") for the Licensed Software.
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions. Any disputes
arising out of or relating to this Agreement shall be resolved in
arbitration under the Rules of Arbitration of the Chamber of Commerce of
Helsinki, Finland. The arbitration tribunal shall consist of one (1), or
if either Party so requires, of three (3), arbitrators. The award shall
be final and binding and enforceable in any court of competent
jurisdiction. The arbitration shall be held in Helsinki, Finland and the
process shall be conducted in the English language.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.

139
README
View File

@@ -5,8 +5,22 @@ HOW TO BUILD QT5
Synopsis
========
See http://qt-project.org/wiki/Building_Qt_5_from_Git for instructions
on building Qt 5.
System requirements
------------------
- Perl 5.8 or later
- Python 2.7 or later
- C++ compiler supporting the C++98 standard
For other platform specific requirements,
please see section "Setting up your machine" on:
http://wiki.qt.io/Get_The_Source
Optional requirements
---------------------
- OpenSSL for SSL sockets or HTTPS
- Wayland
New dependencies in Qt 5
------------------------
@@ -29,99 +43,28 @@ HOW TO BUILD QT5
-----------
cd <path>/qt-everywhere-opensource-src-<version>
export PATH=$PATH:$PWD/qtbase/bin
./configure -prefix $PWD/qtbase -opensource -nomake tests
./build -j 4
make -j 4
Windows:
--------
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that Perl
version 5.12 or later and Python version 2.7 or later can be found in the
path.
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
following tools can be found in the path:
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
cd <path>\qt-everywhere-opensource-src-<version>
set PATH=%PATH%;%CD%\qtbase\bin;
configure -prefix %CD%\qtbase -opensource -nomake tests
perl build
nmake // jom // mingw32-make
For MinGW (gcc version 4.6 or later), ensure that the compiler can
be found in the path.
The build script will use jom if it's found in the path, which means you can
use -j <n> options on Windows as well. If not, the /MP option is added to the
compile options of the Microsoft Visual Studio compiler, to use all available
cores for batch building.
To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
"-make-tool jom" on the configure command line. If you do not use jom,
adding "/MP" to the CL environment variable is a good idea.
More details follow.
Building QtWebKit
=================
Linux, Mac:
-----------
The tools bison, flex and gperf which are required for building.
cd qtwebkit
export WEBKITOUTPUTDIR=$$PWD/WebKitBuild
perl Tools/Scripts/build-webkit --qt --qmake=../qtbase/bin/qmake --install-libs=<install dir> --release --makeargs=$MAKEFLAGS
Windows:
--------
The tools bison, flex and gperf which are required for building are
provided for convenience in the folder gnuwin32\bin.
set PATH=%PATH%;%CD%\gnuwin32\bin
cd qtwebkit
set WEBKITOUTPUTDIR=%CD%/WebKitBuild
perl Tools\Scripts\build-webkit --qt --qmake=..\qtbase\bin\qmake.exe --install-libs=<install dir> --release --makeargs=%MAKEFLAGS%
Get The Submodules
==================
Obtaining the source code is described in detail at
http://wiki.qt-project.org/Main_Page and
http://qt-project.org/wiki/Get_The_Source.
Cloning Qt5 does not automatically clone all submodules.
To get the submodules, it is recommended to use the `init-repository' script.
./init-repository
See `./init-repository -help' for full documentation on the many supported
options.
Update The Submodules (optional)
================================
After a plain `git clone' and `init-repository', you will have each submodule
checked out to a particular SHA1. This combination of SHA1s is guaranteed to
have passed some basic acceptance testing.
If (and only if!) you need newer versions of some submodules, you can manually
fetch and/or pull and/or reset any modules you like, or use the qt5_tool to
pull all modules:
./qtrepotools/bin/qt5_tool -p
NOTE! As soon as you change the SHA1 of any submodule, you are using a
combination of modules which is potentially untested and broken! If you want
something which is more likely to compile, stick to the module SHA1s provided
in this repository.
Install The Git Grafts (optional)
=================================
If you want to be able to connect the Qt5 and Qt4 development history, you
may set up git grafts with the following command:
git submodule foreach '../qtrepotools/bin/git-qt-grafts <path_to_history>'
Build!
======
@@ -166,12 +109,36 @@ HOW TO BUILD QT5
Hints
=====
Shadow builds are possible, but not as well tested/supported as in-source
builds.
The submodule repository qtrepotools contains useful scripts for
developers and release engineers. Consider adding qtrepotools/bin
to your PATH environment variable to access them.
The qt5_tool in qtrepotools has some more features which may be of interest.
Try `qt5_tool --help'.
Building Qt5 from git
=====================
See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
for more information.
See http://wiki.qt.io/Qt_5 for the reference platforms.
Documentation
=============
After configuring and compiling Qt, building the documentation is possible by running
"make docs".
After having built the documentation, you need to install it with the following
command:
make install_docs
The documentation is installed in the path set to $QT_INSTALL_DOCS.
Running "qmake -query" will list the value of QT_INSTALL_DOCS.
Information about Qt 5's documentation is located in qtbase/doc/README
or in the following page: http://wiki.qt.io/Qt5DocumentationProject
Note: Building the documentation is only tested on desktop platforms.

55
README.git Normal file
View File

@@ -0,0 +1,55 @@
OBTAINING QT5 FROM GIT
======================
Synopsis
========
For a more in-depth description on how to build Qt5 from git,
please see: http://wiki.qt.io/Building_Qt_5_from_Git
Get The Submodules
==================
Cloning Qt5 does not automatically clone all submodules.
To get the submodules, it is recommended to use the `init-repository' script.
./init-repository
See `./init-repository -help' for full documentation on the many supported
options.
Update The Submodules (optional)
================================
After a plain `git clone' and `init-repository', you will have each submodule
checked out to a particular SHA1. This combination of SHA1s is guaranteed to
have passed some basic acceptance testing.
If (and only if!) you need newer versions of some submodules, you can manually
fetch and/or pull and/or reset any modules you like, or use the qt5_tool to
pull all modules:
./qtrepotools/bin/qt5_tool -p
NOTE! As soon as you change the SHA1 of any submodule, you are using a
combination of modules which is potentially untested and broken! If you want
something which is more likely to compile, stick to the module SHA1s provided
in this repository.
Install The Git Grafts (optional)
=================================
If you want to be able to connect the Qt5 and Qt4 development history, you
may set up git grafts with the following command:
git submodule foreach '../qtrepotools/bin/git-qt-grafts <path_to_history>'
Developing and Contributing to Qt
================================
For more information on how to develop and contribute to Qt, please see:
http://wiki.qt.io/Category:Developing_Qt

447
build
View File

@@ -1,447 +0,0 @@
#!/usr/bin/perl
#############################################################################
##
## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
## Contact: http://www.qt-project.org/
##
## This file is part of the utilities of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## GNU Lesser General Public License Usage
## This file may be used under the terms of the GNU Lesser General Public
## License version 2.1 as published by the Free Software Foundation and
## appearing in the file LICENSE.LGPL included in the packaging of this
## file. Please review the following information to ensure the GNU Lesser
## General Public License version 2.1 requirements will be met:
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Nokia gives you certain additional
## rights. These rights are described in the Nokia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU General
## Public License version 3.0 as published by the Free Software Foundation
## and appearing in the file LICENSE.GPL included in the packaging of this
## file. Please review the following information to ensure the GNU General
## Public License version 3.0 requirements will be met:
## http://www.gnu.org/copyleft/gpl.html.
##
## Other Usage
## Alternatively, this file may be used in accordance with the terms and
## conditions contained in a signed written agreement between you and Nokia.
##
##
##
##
##
##
## $QT_END_LICENSE$
##
#############################################################################
use v5.008;
use strict;
use warnings;
package Qt::Build;
use Carp qw( confess );
use English qw( -no_match_vars );
use Getopt::Long qw( GetOptionsFromArray );
use Pod::Usage qw( pod2usage );
use Cwd qw( getcwd );
use File::Spec qw( path catfile );
use Config;
# Like `system', but possibly log the command, and die on non-zero exit code
sub exe
{
my ($self, @cmd) = @_;
print "+ @cmd\n" unless ($self->{quiet});
if (system(@cmd) != 0) {
confess "@cmd exited with status $CHILD_ERROR";
}
return 0;
}
sub dropPrivileges()
{
my ($self) = @_;
if ($> == 0) { # EUID == 0: must drop if possible
local $! = undef;
if ($< != 0) { # UID != 0 (run through setuid). swap UID with EUID
($(, $)) = ($), $();
die "Cannot lower gid privileges: $!" if $!;
($<, $>) = ($>, $<);
die "Cannot lower uid privileges: $!" if $!;
} else { # UID == 0: run through sudo?
if (defined $ENV{SUDO_GID}) {
$) = "$ENV{SUDO_GID} $ENV{SUDO_GID}";
die "Cannot lower gid privileges: $!" if $!;
}
if (defined $ENV{SUDO_UID}) {
$> = $ENV{SUDO_UID};
die "Cannot lower uid privileges: $!" if $!;
}
}
}
}
sub exeHighPriv()
{
my ($self, @cmd) = @_;
return $self->exe(@cmd);
}
sub exeLowPriv()
{
my ($self, @cmd) = @_;
if ("$Config{osname}" =~ /mswin/i) {
# Just like exeHighPriv for now
return $self->exe(@cmd);
} else {
my $ret;
my $pid = fork();
die "Couldn't fork" unless defined $pid;
if ($pid == 0) {
$self->dropPrivileges;
$self->exe(@cmd);
exit 0;
} else {
waitpid($pid, 0);
return $?;
}
}
}
sub new
{
my ($class, @arguments) = @_;
my $self = {};
bless $self, $class;
$self->parse_arguments(@arguments);
$self->detect_configuration;
my $depfile = "build.dependencies";
my $result;
our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
# following variables may be expanded in the evaluation below
my $MAKEOPTS = $self->{'MAKEOPTS'};
my $MAKE = $self->{'MAKE'};
unless ($result = do $depfile) {
die "build couldn't parse $depfile: $@" if $@;
die "build couldn't execute $depfile: $!" unless defined $result;
}
$self->{'deps'} = \%build_dependencies;
$self->{'buildcmds'} = \%build_commands;
$self->{'instcmds'} = \%install_commands;
$self->{'nondefault'} = \@nondefault_modules;
return $self;
}
sub parse_arguments
{
my ($self, @args) = @_;
%{$self} = (%{$self},
'verbose' => 0,
'continue' => 0,
'jobs' => -1,
'force_qmake' => 0,
'build-submodules' => [],
);
GetOptionsFromArray(\@args,
'verbose|v:1' => \$self->{'verbose'},
'continue' => \$self->{'continue'},
'jobs|j:1' => \$self->{'jobs'},
'force-qmake' => \$self->{'force_qmake'},
'help|?' => sub { pod2usage(1); },
) || pod2usage(2);
push(@{$self->{'build-submodules'}}, @args) if (@args);
return;
}
sub which {
my ($self, $exe) = @_;
foreach my $path (File::Spec->path()) {
my $file = File::Spec->catfile($path, $exe);
return $file if -x $file;
}
return;
}
sub detect_configuration
{
my ($self) = @_;
die "You need to configure Qt before you try to build it, aborting." if (!-e 'qtbase/.qmake.cache');
use Cwd qw(abs_path);
use Env qw(@PATH);
my $abs_path = abs_path('qtbase/bin');
unshift @PATH, $abs_path;
if ($self->{'jobs'} >= 0) {
$self->{'MAKEOPTS'} = "-j $self->{'jobs'}";
} else {
$self->{'MAKEOPTS'} = "";
}
$self->{'MAKE'} = $ENV{MAKE} || "make";
if ("$Config{osname}" =~ /mswin/i) {
my $exe = $self->which("nmake.exe");
$exe = $self->which("jom.exe") if (defined $exe && $self->which("jom.exe"));
$exe = $self->which("mingw32-make.exe") if (!defined $exe);
# Use the /MP compiler option, if using nmake, to use all CPU threads when compiling
if ($exe =~ 'nmake') {
use Env qw(@CL);
unshift @CL, '/MP';
}
$self->{'MAKE'} = "\"$exe\"" if (defined $exe);
$self->{'MAKEOPTS'} = "" if (defined $exe && $exe =~ /nmake/);
# Tools needed for building QtWebKit/Windows (Bison, Flex, gperf, iconv)
my $abs_path = abs_path('gnuwin32/bin');
unshift @PATH, "$abs_path";
}
}
sub find_pro_file
{
my ($self, $dir) = @_;
my $D;
if (opendir($D,$dir)) {
($dir =~ /\/$/) || ($dir .= "/");
foreach my $file (sort readdir($D)) {
if ($file =~ /^.*\.pro$/) {
closedir($D);
return $file;
}
}
closedir($D);
}
}
sub eliminate_empty_modules
{
my ($self) = @_;
foreach my $repo (keys(%{$self->{'deps'}})) {
if (!$self->find_pro_file($repo)) {
printf "Missing module %s, ignored\n", $repo;
delete $self->{'deps'}->{$repo};
}
}
}
sub check_build_module
{
my ($self, $module) = @_;
my @missing_link;
foreach my $submod (split(/,/, $self->{'deps'}->{$module})) {
next if ($submod =~ /:s$/); # Soft dependency
if (defined $self->{'deps'}->{$submod}) {
push(@missing_link, $self->check_build_module($submod));
} else {
push(@missing_link, $submod);
}
}
return @missing_link;
}
sub check_build_modules
{
my ($self, $fail) = @_;
my $letsdie = 0;
foreach my $module (@{$self->{'build-submodules'}}) {
if (defined $self->{'deps'}->{$module}) {
my @missing_link = $self->check_build_module($module);
if (scalar @missing_link) {
$letsdie = 1;
my $mods = join(", ", @missing_link);
print STDERR "Ignoring module '$module': requires $mods\n";
}
} else {
print STDERR "No module named '$module'\n";
$letsdie = 1;
}
}
die "FAIL: Missing module dependencies, build aborted." if ($letsdie && $fail);
}
sub resolve_soft_dependencies
{
my ($self) = @_;
my @nondefault = @{$self->{'nondefault'}};
foreach my $module (keys(%{$self->{'deps'}})) {
my @deps = split(/,/, $self->{'deps'}->{$module});
my @newdeps;
foreach my $dep (@deps) {
if ($dep =~ /(.*):s$/) {
my $mod = $1;
if (defined $self->{'deps'}->{$mod}
&& !grep {$_ eq $mod} @nondefault) {
push(@newdeps, $mod);
}
} else {
push(@newdeps, $dep);
}
}
$self->{'deps'}->{$module} = join(",", @newdeps);
}
}
sub mark_as_finished
{
my ($self, $doneModule) = @_;
delete $self->{'deps'}->{$doneModule};
foreach my $module (keys(%{$self->{'deps'}})) {
my @deps = split(/,/, $self->{'deps'}->{$module});
@deps = grep { $_ !~ /$doneModule/ } @deps;
$self->{'deps'}->{$module} = join(",", @deps);
}
}
sub get_next_modules
{
my ($self, $module) = @_;
my @nextModules;
my $deps = $self->{'deps'}->{$module};
return if (!defined $deps);
$self->{'seenHash'}->{$module}++;
if ($deps eq '') {
push (@nextModules, $module);
return @nextModules;
}
foreach my $dep (split(/,/, $deps)) {
push (@nextModules, $self->get_next_modules($dep)) unless $self->{'seenHash'}->{$dep};
}
return @nextModules;
}
sub get_all_next_modules
{
my ($self) = @_;
$self->{'seenHash'} = ();
my @nextModules;
foreach my $module (@{$self->{'build-submodules'}}) {
my @mods = $self->get_next_modules($module);
push(@nextModules, @mods);
}
my %seen = ();
my @uniqModules;
foreach my $item (@nextModules) {
push(@uniqModules, $item) unless $seen{$item}++;
}
return @uniqModules;
}
sub build_project
{
my ($self, $module) = @_;
my $build_command = $self->{'buildcmds'}->{$module};
my $install_command = $self->{'instcmds'}->{$module};
if (!defined $build_command) {
if (!-e "$module/Makefile") {
$self->exeLowPriv("cd $module && qmake -r") && die "'cd $module && $build_command' failed: $?";
}
$build_command = "$self->{MAKE} $self->{MAKEOPTS}" if (!defined $build_command);
}
$self->exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?";
$install_command = "$self->{MAKE} install" if (!defined $install_command);
### TODO: Should be fixed after the alpha
unless ("$Config{osname}" =~ /(dar|ms)win/i) {
$self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?";
}
$self->mark_as_finished($module);
return 0;
}
sub build_qt
{
my ($self) = @_;
printf "OS Name ........ %s\n", $Config{osname};
printf "Verbose ........ %s\n", ($self->{'verbose'} ? $self->{'verbose'} : "no");
printf "Continue ....... %s\n", ($self->{'continue'} ? "yes" : "no");
printf "Force qmake..... %s\n", ($self->{'force_qmake'} ? "yes" : "no");
printf "Jobs ........... %s\n", ($self->{'jobs'} >= 0 ? $self->{'jobs'} : "unset");
my $path = $ENV{'PATH'};
print "PATH $path\n";
print "Modules to build:\n";
my $mods = "(all present)";
$mods = join(", ", @{$self->{'build-submodules'}}) if (@{$self->{'build-submodules'}});
print " $mods\n";
while (my @modules = $self->get_all_next_modules) {
foreach my $module (@modules) {
print "build $module...\n";
$self->build_project($module);
}
}
print "build done!\n";
return 0;
}
sub run
{
my ($self) = @_;
$self->eliminate_empty_modules;
if (scalar @{$self->{'build-submodules'}} > 0) {
$self->check_build_modules(1);
} else {
my @default = keys(%{$self->{'deps'}});
my @nondefault = @{$self->{'nondefault'}};
foreach my $item (@nondefault) {
@default = grep { $_ ne $item } @default;
}
push(@{$self->{'build-submodules'}}, @default);
$self->check_build_modules(0);
}
$self->resolve_soft_dependencies;
$self->build_qt;
# print Dumper($self);
return;
}
#==============================================================================
Qt::Build->new(@ARGV)->run if (!caller);
1;

View File

@@ -1,66 +0,0 @@
# Platform independent modules
# Dependencies separated with comma ','
# Dependencies with ':s' appended indicate soft dependencies, which
# means that they are a dependency if the module is present, if not
# they are ignored.
use Config;
%build_dependencies = (
"qlalr" => "qtbase",
"qt3d" => "qtbase,qtdeclarative",
"qtbase" => "",
"qtconnectivity" => "qtsystems",
"qtdeclarative" => "qtbase,qtxmlpatterns,qtjsbackend,qtsvg:s",
"qtdoc" => "qtbase,qtdeclarative",
"qtdocgallery" => "qtbase,qtscript,qtdeclarative,qtjsondb:s",
"qtfeedback" => "qtbase,qtmultimedia,qtdeclarative",
"qtgraphicaleffects" => "qtbase,qtdeclarative,qtsvg,qtxmlpatterns",
"qtimageformats" => "qtbase",
"qtjsbackend" => "qtbase",
"qtjsondb" => "qtbase,qtdeclarative,qtxmlpatterns",
"qtlocation" => "qtbase,qtdeclarative,qt3d,qtjsondb:s",
"qtmultimedia" => "qtbase,qtdeclarative",
"qtphonon" => "qtbase",
"qtpim" => "qtdeclarative,qtjsondb:s",
"qtqa" => "qtbase",
"qtquick1" => "qtbase,qtscript,qtxmlpatterns,qtsvg:s",
"qtscript" => "qtbase",
"qtsensors" => "qtbase,qtdeclarative",
"qtsvg" => "qtbase",
"qtsystems" => "qtbase,qtdeclarative,qtjsondb:s",
"qttools" => "qtbase,qtscript,qtdeclarative,qtquick1,qtwebkit:s",
"qttranslations" => "qttools",
"qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
"qtwebkit-examples-and-demos" => "qtwebkit",
"qtxmlpatterns" => "qtbase",
);
@nondefault_modules = (
"qtwayland",
);
if ("$Config{osname}" =~ /mswin/i) {
%build_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2",
);
push @nondefault_modules, ("qtwebkit", "qtwebkit-examples-and-demos");
} else {
%build_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --release --no-netscape-plugin",
);
}
%install_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --makeargs=\"install\"",
);
# Platform specific modules
if ("$Config{osname}" =~ /linux/i) {
$build_dependencies{"qtwayland"} = "qtbase,qtdeclarative";
}
if ("$Config{osname}" =~ /(ms|cyg)win/i) {
$build_dependencies{"qtactiveqt"} = "qtbase";
}

132
configure vendored
View File

@@ -1,113 +1,57 @@
#!/usr/bin/perl
#! /bin/sh
#############################################################################
##
## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
## Contact: http://www.qt-project.org/
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
## Contact: http://www.qt-project.org/legal
##
## This file is part of the build tools of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## GNU Lesser General Public License Usage
## This file may be used under the terms of the GNU Lesser General Public
## License version 2.1 as published by the Free Software Foundation and
## appearing in the file LICENSE.LGPL included in the packaging of this
## file. Please review the following information to ensure the GNU Lesser
## General Public License version 2.1 requirements will be met:
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and Digia. For licensing terms and
## conditions see http://qt.digia.com/licensing. For further information
## use the contact form at http://qt.digia.com/contact-us.
##
## In addition, as a special exception, Nokia gives you certain additional
## rights. These rights are described in the Nokia Qt LGPL Exception
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 2.1 requirements
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Digia gives you certain additional
## rights. These rights are described in the Digia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU General
## Public License version 3.0 as published by the Free Software Foundation
## and appearing in the file LICENSE.GPL included in the packaging of this
## file. Please review the following information to ensure the GNU General
## Public License version 3.0 requirements will be met:
## http://www.gnu.org/copyleft/gpl.html.
##
## Other Usage
## Alternatively, this file may be used in accordance with the terms and
## conditions contained in a signed written agreement between you and Nokia.
##
##
##
##
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3.0 as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL included in the
## packaging of this file. Please review the following information to
## ensure the GNU General Public License version 3.0 requirements will be
## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
##
#############################################################################
####################################################################################################
#
# Mother script for Qt Modularization
#
####################################################################################################
srcpath=`dirname $0`
srcpath=`(cd "$srcpath"; /bin/pwd)`
configure=$srcpath/qtbase/configure
if [ ! -e "$configure" ]; then
echo "$configure not found. Did you forget to run \"init-repository\"?" >&2
exit 1
fi
use strict;
use warnings;
mkdir -p qtbase || exit
use File::Basename;
use File::Path;
use Cwd;
use Cwd 'abs_path';
use Config;
echo "+ cd qtbase"
cd qtbase || exit
# Makes sure the arguments are directories, and creates them if not.
# Will die if there is an error.
sub ensureDir {
foreach (@_) {
if (-e $_) {
if (-d $_) {
next;
} else {
die ("$_ exists, but is not a directory");
}
}
File::Path::mkpath($_) or die("Could not create $_");
}
}
# `system', but also print the command
sub system_v
{
print "+ ";
print @_;
print "\n";
return system(@_);
}
my $relpath = dirname(abs_path($0));
$relpath =~ s,\\,/,g;
# the current directory is the "build tree" or "object tree"
my $outpath = getcwd();
if (! -e "$relpath/qtbase/configure") {
die("$relpath/qtbase/configure not found. Did you forget to run \"init-repository\"?");
}
ensureDir("$outpath/qtbase");
chdir("$outpath/qtbase");
if (-e ".qmake.cache") {
# Remove this so we can detect if configure finished properly
unlink ".qmake.cache";
}
my $ret = system_v("$relpath/qtbase/configure @ARGV");
exit ($ret>>8) unless ($ret == 0);
if (! -e ".qmake.cache") {
# Even though there was no error code, this file wasn't created
# so configure didn't finish properly. This is probably because
# the user passed -help
exit 0;
}
chdir("$outpath");
open QMAKE_CACHE, ">.qmake.cache" || die "Could not open .qmake.cache for writing!\n";
print QMAKE_CACHE "include(\$\$PWD/qtbase/.qmake.cache)\n";
close QMAKE_CACHE;
$ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro");
exit ($ret>>8);
echo "+ $configure -top-level $@"
exec "$configure" -top-level "$@"

View File

@@ -1,42 +1,61 @@
@echo off
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
:: Contact: http://www.qt-project.org/
:: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
:: Contact: http://www.qt-project.org/legal
::
:: This file is part of the tools applications of the Qt Toolkit.
::
:: $QT_BEGIN_LICENSE:LGPL$
:: GNU Lesser General Public License Usage
:: This file may be used under the terms of the GNU Lesser General Public
:: License version 2.1 as published by the Free Software Foundation and
:: appearing in the file LICENSE.LGPL included in the packaging of this
:: file. Please review the following information to ensure the GNU Lesser
:: General Public License version 2.1 requirements will be met:
:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
:: Commercial License Usage
:: Licensees holding valid commercial Qt licenses may use this file in
:: accordance with the commercial license agreement provided with the
:: Software or, alternatively, in accordance with the terms contained in
:: a written agreement between you and Digia. For licensing terms and
:: conditions see http://qt.digia.com/licensing. For further information
:: use the contact form at http://qt.digia.com/contact-us.
::
:: In addition, as a special exception, Nokia gives you certain additional
:: rights. These rights are described in the Nokia Qt LGPL Exception
:: GNU Lesser General Public License Usage
:: Alternatively, this file may be used under the terms of the GNU Lesser
:: General Public License version 2.1 as published by the Free Software
:: Foundation and appearing in the file LICENSE.LGPL included in the
:: packaging of this file. Please review the following information to
:: ensure the GNU Lesser General Public License version 2.1 requirements
:: will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
::
:: In addition, as a special exception, Digia gives you certain additional
:: rights. These rights are described in the Digia Qt LGPL Exception
:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
::
:: GNU General Public License Usage
:: Alternatively, this file may be used under the terms of the GNU General
:: Public License version 3.0 as published by the Free Software Foundation
:: and appearing in the file LICENSE.GPL included in the packaging of this
:: file. Please review the following information to ensure the GNU General
:: Public License version 3.0 requirements will be met:
:: http://www.gnu.org/copyleft/gpl.html.
::
:: Other Usage
:: Alternatively, this file may be used in accordance with the terms and
:: conditions contained in a signed written agreement between you and Nokia.
::
::
::
::
:: Alternatively, this file may be used under the terms of the GNU
:: General Public License version 3.0 as published by the Free Software
:: Foundation and appearing in the file LICENSE.GPL included in the
:: packaging of this file. Please review the following information to
:: ensure the GNU General Public License version 3.0 requirements will be
:: met: http://www.gnu.org/copyleft/gpl.html.
::
::
:: $QT_END_LICENSE$
::
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@rem ***** This assumes PERL is in the PATH *****
@perl.exe %~dp0configure %*
set "srcpath=%~dp0"
set "configure=%srcpath%qtbase\configure.bat"
if not exist "%configure%" (
echo %configure% not found. Did you forget to run "init-repository"? >&2
exit /b 1
)
if not exist qtbase mkdir qtbase || exit /b 1
echo + cd qtbase
cd qtbase || exit /b 1
echo + %configure% -top-level %*
call %configure% -top-level %*
set err=%errorlevel%
cd ..
exit /b %err%

9
gnuwin32/README Normal file
View File

@@ -0,0 +1,9 @@
This directory contains the Windows binaries of various tools such as bison
from the GnuWin32 project (http://gnuwin32.sourceforge.net/). We've put them
here for your convenience, as they are needed to build projects such as
QtWebKit.
Aside from GnuWin32 binaries this directory also contains a distribution of Win
flex-bison project (http://sourceforge.net/projects/winflexbison/), which provides
much newer ports of Flex and Bison than what GnuWin32 provides.

BIN
gnuwin32/bin/win_flex.exe Normal file

Binary file not shown.

View File

@@ -0,0 +1,47 @@
Index: flex/src/main.c
===================================================================
--- flex/src/main.c (revision 24)
+++ flex/src/main.c (working copy)
@@ -112,7 +112,7 @@
struct yytbl_writer tableswr;
int prev_stdout = 0;
-char *flex_temp_out_main="~flex_temp_out_main";
+char *flex_temp_out_main = 0;
/* Make sure program_name is initialized so we don't crash if writing
* out an error message before getting the program name from argv[0].
@@ -767,6 +767,8 @@
tblsiz);
}
+ free (flex_temp_out_main);
+ flex_temp_out_main = 0;
exit (exit_status);
}
@@ -779,8 +781,10 @@
{
int i, sawcmpflag, rv, optind;
char *arg;
+ char flex_temp_out_main_template[] = "~flex_temp_out_main_XXXXXX";
scanopt_t sopt;
+ flex_temp_out_main = _strdup(_mktemp(flex_temp_out_main_template));
printstats = syntaxerror = trace = spprdflt = false;
lex_compat = posix_compat = C_plus_plus = backing_up_report =
ddebug = fulltbl = false;
Index: flex/src/filter.c
===================================================================
--- flex/src/filter.c (revision 24)
+++ flex/src/filter.c (working copy)
@@ -86,7 +86,8 @@
/* Get some more or less random data. */
{
- static unsigned long long g_value = 827363;
+ static unsigned long long g_value;
+ g_value = _getpid();
g_value += 100;
random_time_bits = (((unsigned long long)234546 << 32)
| (unsigned long long)g_value);

View File

@@ -1,39 +1,39 @@
#!/usr/bin/env perl
#############################################################################
##
## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
## Contact: http://www.qt-project.org/
## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
## Contact: http://www.qt-project.org/legal
##
## This file is part of the utilities of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
## GNU Lesser General Public License Usage
## This file may be used under the terms of the GNU Lesser General Public
## License version 2.1 as published by the Free Software Foundation and
## appearing in the file LICENSE.LGPL included in the packaging of this
## file. Please review the following information to ensure the GNU Lesser
## General Public License version 2.1 requirements will be met:
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and Digia. For licensing terms and
## conditions see http://qt.digia.com/licensing. For further information
## use the contact form at http://qt.digia.com/contact-us.
##
## In addition, as a special exception, Nokia gives you certain additional
## rights. These rights are described in the Nokia Qt LGPL Exception
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 as published by the Free Software
## Foundation and appearing in the file LICENSE.LGPL included in the
## packaging of this file. Please review the following information to
## ensure the GNU Lesser General Public License version 2.1 requirements
## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Digia gives you certain additional
## rights. These rights are described in the Digia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU General
## Public License version 3.0 as published by the Free Software Foundation
## and appearing in the file LICENSE.GPL included in the packaging of this
## file. Please review the following information to ensure the GNU General
## Public License version 3.0 requirements will be met:
## http://www.gnu.org/copyleft/gpl.html.
##
## Other Usage
## Alternatively, this file may be used in accordance with the terms and
## conditions contained in a signed written agreement between you and Nokia.
##
##
##
##
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3.0 as published by the Free Software
## Foundation and appearing in the file LICENSE.GPL included in the
## packaging of this file. Please review the following information to
## ensure the GNU General Public License version 3.0 requirements will be
## met: http://www.gnu.org/copyleft/gpl.html.
##
##
## $QT_END_LICENSE$
@@ -70,6 +70,12 @@ B<Global options:>
Force initialization (even if the submodules are already checked out).
=item --force-hooks
Force initialization of hooks (even if there are already hooks in checked out
submodules).
=item --quiet, -q
Be quiet. Will exit cleanly if the repository is already initialized.
@@ -91,19 +97,26 @@ git repository.
Only initialize the specified subset of modules given as the argument. Specified
modules must already exist in .gitmodules.
The string "all" results in cloning all known modules. The default is the set of
maintained modules.
Module names may be prefixed with a dash to exclude them from a bigger set.
=item --no-update
Skip the `git submodule update' command.
=item --branch
Instead of checking out specific SHA1s, check out the submodule branches that
correspond with the current supermodule commit.
By default, this option will cause local commits in the submodules to be rebased.
With --no-update, the branches will be checked out, but their heads will not move.
=item --ignore-submodules
Set git config to ignore submodules by default when doing operations on the
qt5 repo, such as `pull', `fetch', `diff' etc.
This option is default for --nokia-developer/--brisbane.
After using this option, pass `--ignore-submodules=none' to git to override
it as needed.
@@ -114,38 +127,15 @@ B<Repository options:>
=over
=item --nokia-developer
Switch to internal Nokia URLs.
=item --brisbane
Switch to internal Nokia URLs and make use of the Brisbane git mirrors.
(Implies `--mirror' and `--mirror-webkit').
=item --berlin
Switch to internal Nokia URLs and make use of the Berlin git mirrors.
(Implies `--mirror' and `--mirror-webkit').
Switch to internal URLs and make use of the Berlin git mirrors.
(Implies `--mirror').
=item --oslo
=item --ssh
Use the SSH protocol for git operations. This may be useful if the git
protocol is blocked by a firewall. Note that this requires a user account
with an uploaded SSH key on all servers used. (Implies `--nokia-developer').
The `--ssh' option does not affect the gerrit remotes.
=item --http
Use the HTTP protocol for git operations. This may be useful if the git
protocol is blocked by a firewall. Note that this only works with the
external Gitorious server.
The `--http' option does not affect the gerrit remotes.
Switch to internal URLs and make use of the Oslo git mirrors.
(Implies `--mirror').
=item --codereview-username <Gerrit/JIRA username>
@@ -188,19 +178,15 @@ Uses <url-base> as the base URL for submodule git mirrors.
For example:
--mirror user@machine:/foo/bar
--mirror user@machine:/foo/bar/
...will use the following as a mirror for qtbase:
user@machine:/foo/bar/qtbase.git
user@machine:/foo/bar/qt/qtbase.git
The mirror is permitted to contain a subset of the submodules; any
missing modules will fall back to the canonical URLs.
=item --mirror-webkit <url>
Uses <url> as the URL for the webkit git mirror.
=back
=cut
@@ -211,60 +197,14 @@ use Getopt::Long qw( GetOptionsFromArray );
use Pod::Usage qw( pod2usage );
use Cwd qw( getcwd );
my %PROTOCOLS = (
'internal' => 'git://scm.dev.nokia.troll.no/' ,
'ssh' => 'git@scm.dev.nokia.troll.no:' ,
'http' => 'http://git.gitorious.org/' ,
);
my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qt3d
qt5
qlalr
qtactiveqt
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtdocgallery
qtfeedback
qtgraphicaleffects
qtimageformats
qtjsondb
qtjsbackend
qtlocation
qtmultimedia
qtphonon
qtpim
qtqa
qtquick1
qtrepotools
qtscript
qtsensors
qtsvg
qtsystems
qttools
qttranslations
qtwayland
qtwebkit-examples-and-demos
qtxmlpatterns
);
my $GERRIT_SSH_BASE
= 'ssh://@USER@codereview.qt-project.org@PORT@/';
my $BNE_MIRROR_URL_BASE
= 'git://bq-git.apac.nokia.com/qtsoftware/';
my $BNE_MIRROR_WEBKIT_URL
= 'git://bq-git.apac.nokia.com/qtsoftware/research/gitorious-org-webkit-qtwebkit-mirror.git';
my $BER_MIRROR_URL_BASE
= 'git://ber-git.europe.nokia.com/';
my $BER_MIRROR_WEBKIT_URL
= 'git://ber-git.europe.nokia.com/qtwebkit/qtwebkit.git';
= 'git://hegel/';
my $OSLO_MIRROR_URL_BASE
= 'git://qilin/';
sub new
{
@@ -299,71 +239,48 @@ sub parse_arguments
%{$self} = (%{$self},
'alternates' => "",
'branch' => 0,
'codereview-username' => "",
'detach-alternates' => 0 ,
'force' => 0 ,
'force-hooks' => 0 ,
'ignore-submodules' => 0 ,
'mirror-url' => "",
'mirror-webkit-url' => "",
'nokia-developer' => 0 ,
'protocol' => "",
'update' => 1 ,
'webkit' => 1 ,
'module-subset' => "",
'module-subset' => "default",
);
GetOptionsFromArray(\@args,
'alternates=s' => \$self->{qw{ alternates }},
'branch' => \$self->{qw{ branch }},
'codereview-username=s' => \$self->{qw{ codereview-username }},
'copy-objects' => \$self->{qw{ detach-alternates }},
'force' => \$self->{qw{ force }},
'force|f' => \$self->{qw{ force }},
'force-hooks' => \$self->{qw{ force-hooks }},
'ignore-submodules' => \$self->{qw{ ignore-submodules }},
'mirror-webkit=s' => \$self->{qw{ mirror-webkit-url }},
'mirror=s' => \$self->{qw{ mirror-url }},
'nokia-developer' => \$self->{qw{ nokia-developer }},
'quiet' => \$self->{qw{ quiet }},
'update!' => \$self->{qw{ update }},
'webkit!' => \$self->{qw{ webkit }},
'module-subset=s' => \$self->{qw{ module-subset }},
'help|?' => sub { pod2usage(1); },
'http' => sub { $self->{protocol} = 'http'; },
'ssh|ssh-protocol' => sub { $self->{protocol} = 'ssh'; },
'brisbane|brisbane-nokia-developer' => sub {
$self->{'nokia-developer'} = 1;
$self->{'protocol'} = 'internal';
$self->{'mirror-url'} = $BNE_MIRROR_URL_BASE;
$self->{'mirror-webkit-url'} = $BNE_MIRROR_WEBKIT_URL;
$self->{'ignore-submodules'} = 1;
},
'berlin|berlin-nokia-developer' => sub {
$self->{'nokia-developer'} = 1;
$self->{'protocol'} = 'internal';
'berlin' => sub {
$self->{'mirror-url'} = $BER_MIRROR_URL_BASE;
$self->{'mirror-webkit-url'} = $BER_MIRROR_WEBKIT_URL;
},
'nokia-developer' => sub {
$self->{'nokia-developer'} = 1;
$self->{'protocol'} = 'internal';
$self->{'ignore-submodules'} = 1;
'oslo' => sub {
$self->{'mirror-url'} = $OSLO_MIRROR_URL_BASE;
},
) || pod2usage(2);
if ($self->{'nokia-developer'} && $self->{'protocol'} eq 'http') {
print "*** Ignoring use of HTTP protocol, as it's only usable with external server\n";
$self->{'protocol'} = '';
}
# Replace any double trailing slashes from end of mirror
$self->{'mirror-url'} =~ s{//+$}{/};
if ($self->{'module-subset'}) {
$self->{'module-subset'} = {
map { $_ => 1 } split(qr{,}, $self->{'module-subset'})
};
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
if (!$self->{webkit}) {
push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
}
return;
@@ -375,16 +292,7 @@ sub check_if_already_initialized
# We consider the repo as `initialized' if submodule.qtbase.url is set
if (qx(git config --get submodule.qtbase.url)) {
if ($self->{force}) {
my @configresult = qx(git config -l);
foreach (@configresult) {
# Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git
if (/(submodule\.[^.=]+)\.url=.*/) {
$self->exe('git', 'config', '--remove-section', $1);
}
}
}
else {
if (!$self->{force}) {
exit 0 if ($self->{quiet});
print "Will not reinitialize already initialized repository (use -f to force)!\n";
exit 1;
@@ -396,11 +304,10 @@ sub check_if_already_initialized
sub git_submodule_init
{
my ($self) = @_;
my ($self, @init_args) = @_;
my @init_args;
if ($self->{quiet}) {
push @init_args, '--quiet';
unshift @init_args, '--quiet';
}
$self->exe('git', 'submodule', 'init', @init_args);
@@ -412,83 +319,101 @@ sub git_submodule_init
return;
}
sub git_disable_webkit_submodule
{
my ($self) = @_;
$self->exe('git', 'config', '--remove', 'submodule.qtwebkit');
$self->exe('git', 'config', '--remove', 'submodule.qtwebkit-examples-and-demos');
return;
}
sub git_prune_submodules
{
my ($self) = @_;
my @configresult = qx(git config -l);
foreach my $line (@configresult) {
if ($line =~ /submodule\.([^.=]+)\.url=/) {
my $module_name = $1;
if (!$self->{'module-subset'}{$module_name}) {
$self->exe('git', 'config', '--remove', "submodule.$module_name");
}
}
}
}
sub git_set_submodule_config
{
my ($self) = @_;
my @configresult = qx(git config -l);
my $protocol = $self->{protocol};
my $url_base_for_protocol = $PROTOCOLS{$protocol};
foreach my $line (@configresult) {
# Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git
next if ($line !~ /submodule\.([^.=]+)\.url=(.*)/);
my $key = $1;
my $value = $2;
if ($protocol) {
# WebKit is special, and has only external link.
if ($key ne 'qtwebkit') {
# qt-labs projects are still hosted under qt internally.
if ($protocol ne 'http') {
$value =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
}
# assume all other projects hosted under gitorious publicly.
$value =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
}
}
$self->exe('git', 'config', "submodule.$key.url", $value);
if ($self->{'ignore-submodules'}) {
$self->exe('git', 'config', "submodule.$key.ignore", 'all');
}
}
return;
}
sub git_clone_all_submodules
{
my ($self) = @_;
my ($self, $my_repo_base, $co_branch, @subset) = @_;
my %subdirs = ();
my %subbranches = ();
my %subbases = ();
my %subinits = ();
my @submodconfig = qx(git config -l -f .gitmodules);
foreach my $line (@submodconfig) {
# Example line: submodule.qtqa.url=../qtqa.git
next if ($line !~ /^submodule\.([^.=]+)\.([^.=]+)=(.*)$/);
if ($2 eq "path") {
$subdirs{$1} = $3;
} elsif ($2 eq "branch") {
$subbranches{$1} = $3;
} elsif ($2 eq "url") {
my ($mod, $base) = ($1, $3);
next if ($base !~ /^\.\.\//);
$base = $my_repo_base.'/'.$base;
while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
$subbases{$mod} = $base;
} elsif ($2 eq "update") {
push @subset, '-'.$1 if ($3 eq 'ignore');
} elsif ($2 eq "initrepo") {
$subinits{$1} = ($3 eq "yes" or $3 eq "true");
}
}
my %include = ();
foreach my $mod (@subset) {
if ($mod eq "all") {
map { $include{$_} = 1; } keys %subbases;
} elsif ($mod eq "default") {
map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases;
} elsif ($mod =~ s/^-//) {
delete $include{$mod};
} else {
$include{$mod} = 1;
}
}
my @modules = sort keys %include;
$self->git_submodule_init(map { $subdirs{$_} } @modules);
# manually clone each repo here, so we can easily use reference repos, mirrors etc
my @configresult = qx(git config -l);
foreach my $line (@configresult) {
if ($line =~ /submodule\.([^.=]+)\.url=(.*)/) {
$self->git_clone_one_submodule($1, $2);
# Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git
next if ($line !~ /submodule\.([^.=]+)\.url=/);
my $module = $1;
if (!defined($include{$module})) {
$self->exe('git', 'config', '--remove-section', "submodule.$module");
next;
}
if ($self->{'ignore-submodules'}) {
$self->exe('git', 'config', "submodule.$module.ignore", 'all');
}
}
foreach my $module (@modules) {
$self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module});
}
if ($co_branch) {
foreach my $module (@modules) {
my $branch = $subbranches{$module};
die("No branch defined for submodule $module.\n") if (!defined($branch));
my $orig_cwd = getcwd();
chdir($module) or confess "chdir $module: $OS_ERROR";
my $br = qx(git rev-parse -q --verify $branch);
if (!$br) {
$self->exe('git', 'checkout', '-b', $branch, "origin/$branch");
} else {
$self->exe('git', 'checkout', $branch);
}
chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
}
}
if ($self->{update}) {
$self->exe('git', 'submodule', 'update', '--recursive');
my @cmd = ('git', 'submodule', 'update', '--no-fetch');
push @cmd, '--remote', '--rebase' if ($co_branch);
$self->exe(@cmd);
foreach my $module (@modules) {
if (-f $module.'/.gitmodules') {
my $orig_cwd = getcwd();
chdir($module) or confess "chdir $module: $OS_ERROR";
$self->git_clone_all_submodules($subbases{$module}, 0, "all");
chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
}
}
}
return;
@@ -496,39 +421,29 @@ sub git_clone_all_submodules
sub git_add_remotes
{
my ($self, $repo_basename) = @_;
my ($self, $gerrit_repo_basename) = @_;
my $gerrit_repo_basename = $GERRIT_REPOS{$repo_basename};
if ($gerrit_repo_basename) {
my $gerrit_repo_url;
# If given a username, make a "verbose" remote.
# Otherwise, rely on proper SSH configuration.
if ($self->{'codereview-username'}) {
$gerrit_repo_url = $GERRIT_SSH_BASE;
$gerrit_repo_url =~ s,\@USER\@,$self->{'codereview-username'}\@,;
$gerrit_repo_url =~ s,\@PORT\@,:29418,;
}
else {
$gerrit_repo_url = $GERRIT_SSH_BASE;
$gerrit_repo_url =~ s,\@[^\@]+\@,,g;
}
$gerrit_repo_url .= $gerrit_repo_basename;
$self->exe('git', 'config', 'remote.gerrit.url', $gerrit_repo_url);
$self->exe('git', 'config', 'remote.gerrit.fetch', '+refs/heads/*:refs/remotes/gerrit/*');
my $gerrit_repo_url = $GERRIT_SSH_BASE;
# If given a username, make a "verbose" remote.
# Otherwise, rely on proper SSH configuration.
if ($self->{'codereview-username'}) {
$gerrit_repo_url =~ s,\@USER\@,$self->{'codereview-username'}\@,;
$gerrit_repo_url =~ s,\@PORT\@,:29418,;
} else {
$gerrit_repo_url =~ s,\@[^\@]+\@,,g;
}
return;
$gerrit_repo_url .= $gerrit_repo_basename;
$self->exe('git', 'config', 'remote.gerrit.url', $gerrit_repo_url);
$self->exe('git', 'config', 'remote.gerrit.fetch', '+refs/heads/*:refs/remotes/gerrit/*', '/heads/');
}
sub git_clone_one_submodule
{
my ($self, $submodule, $url) = @_;
my ($self, $submodule, $repo_basename, $branch) = @_;
my $alternates = $self->{ 'alternates' };
my $mirror_url = $self->{ 'mirror-url' };
my $mirror_webkit_url = $self->{ 'mirror-webkit-url' };
my $protocol = $self->{ 'protocol' };
# `--reference FOO' args for the clone, if any.
@@ -536,7 +451,7 @@ sub git_clone_one_submodule
if ($alternates) {
# alternates is a qt5 repo, so the submodule will be under that.
if (-d "$alternates/$submodule") {
if (-e "$alternates/$submodule/.git") {
@reference_args = ('--reference', "$alternates/$submodule");
}
else {
@@ -544,13 +459,10 @@ sub git_clone_one_submodule
}
}
my $url = $self->{'base-url'}.$repo_basename;
my $mirror;
if ($mirror_url && ($submodule ne 'qtwebkit')) {
$mirror = $mirror_url."qt/$submodule";
$mirror .= ".git" unless (-d $mirror); # Support local disk mirror
}
elsif ($mirror_webkit_url && ($submodule eq 'qtwebkit')) {
$mirror = $mirror_webkit_url;
if ($mirror_url) {
$mirror = $mirror_url.$repo_basename;
}
if ($mirror) {
@@ -562,21 +474,33 @@ sub git_clone_one_submodule
}
}
my $do_clone = (! -d "$submodule/.git");
my $do_clone = (! -e "$submodule/.git");
if ($do_clone) {
$self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule);
push @reference_args, '--branch', $branch if ($branch);
$self->exe('git', 'clone', @reference_args,
($mirror ? $mirror : $url), $submodule);
}
my $orig_cwd = getcwd();
chdir($submodule) or confess "chdir $submodule: $OS_ERROR";
$self->exe('git', 'config', 'remote.origin.url', $url);
if ($mirror) {
# This is only for the user's convenience - we make no use of it.
$self->exe('git', 'config', 'remote.mirror.url', $mirror);
$self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*');
}
if (!$do_clone) {
$self->exe('git', 'fetch', ($mirror ? $mirror : $url));
if (!$do_clone && $self->{update}) {
# If we didn't clone, fetch from the right location. We always update
# the origin remote, so that submodule update --remote works.
$self->exe('git', 'config', 'remote.origin.url', ($mirror ? $mirror : $url));
$self->exe('git', 'fetch', 'origin');
}
if (!($do_clone || $self->{update}) || $mirror) {
# Leave the origin configured to the canonical URL. It's already correct
# if we cloned/fetched without a mirror; otherwise it may be anything.
$self->exe('git', 'config', 'remote.origin.url', $url);
}
my $template = getcwd()."/../.commit-template";
@@ -584,7 +508,7 @@ sub git_clone_one_submodule
$self->exe('git', 'config', 'commit.template', $template);
}
$self->git_add_remotes($submodule);
$self->git_add_remotes($repo_basename);
if ($self->{'detach-alternates'}) {
$self->exe('git', 'repack', '-a');
@@ -595,31 +519,62 @@ sub git_clone_one_submodule
}
}
chdir("..") or confess "cd ..: $OS_ERROR";
chdir($orig_cwd) or confess "cd $orig_cwd: $OS_ERROR";
return;
}
sub ensure_link
{
my ($self, $src, $tgt) = @_;
return if (!$self->{'force-hooks'} and -f $tgt);
unlink($tgt); # In case we have a dead symlink or pre-existing hook
print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet});
return if eval { symlink($src, $tgt) };
# Windows doesn't do (proper) symlinks. As the post_commit script needs
# them to locate itself, we write a forwarding script instead.
open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n";
print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
close SCRIPT;
}
sub git_install_hooks
{
my ($self) = @_;
return if (!-d 'qtrepotools/git-hooks');
# Force C locale as git submodule returns the localized string "Entering"
local $ENV{LC_ALL} = 'C';
chomp(my @modules = `git submodule foreach :`);
push @modules, "";
for my $module (@modules) {
$module =~ s,^Entering \'([^\']+)\'$,$1/,;
my $rel = $module;
$rel =~ s,[^/]+,..,g;
$rel .= "../../qtrepotools/git-hooks/";
$self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg');
$self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit');
}
}
sub run
{
my ($self) = @_;
$self->check_if_already_initialized;
$self->git_submodule_init;
if (!$self->{webkit}) {
$self->git_disable_webkit_submodule;
}
chomp(my $url = `git config remote.origin.url`);
die("Have no origin remote.\n") if (!$url);
$url =~ s,\.git$,,;
$url =~ s,qt/qt5$,,;
$self->{'base-url'} = $url;
if ($self->{'module-subset'}) {
$self->git_prune_submodules;
}
$self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}});
$self->git_set_submodule_config;
$self->git_add_remotes('qt/qt5');
$self->git_clone_all_submodules;
$self->git_add_remotes('qt5');
$self->git_install_hooks;
return;
}

246
qt.pro
View File

@@ -1,178 +1,94 @@
# Create the super cache so modules will add themselves to it.
cache(, super)
CONFIG += build_pass # hack to disable the .qmake.super auto-add
load(qt_build_config)
CONFIG -= build_pass # unhack, as it confuses Qt Creator
TEMPLATE = subdirs
module_qtbase.subdir = $$IN_PWD/qtbase
module_qtbase.target = module-qtbase
defineReplace(moduleName) {
return(module_$$replace(1, -, _))
}
module_qtsvg.subdir = $$IN_PWD/qtsvg
module_qtsvg.target = module-qtsvg
module_qtsvg.depends = module_qtbase
# Arguments: module name, [mandatory deps], [optional deps], [project file]
defineTest(addModule) {
contains(QT_SKIP_MODULES, $$1): return(false)
mod = $$moduleName($$1)
module_qtphonon.subdir = $$IN_PWD/qtphonon
module_qtphonon.target = module-qtphonon
module_qtphonon.depends = module_qtbase
isEmpty(4) {
!exists($$1/$${1}.pro): return(false)
$${mod}.subdir = $$1
export($${mod}.subdir)
} else {
!exists($$1/$${4}): return(false)
$${mod}.file = $$1/$$4
$${mod}.makefile = Makefile
export($${mod}.file)
export($${mod}.makefile)
}
module_qtxmlpatterns.subdir = $$IN_PWD/qtxmlpatterns
module_qtxmlpatterns.target = module-qtxmlpatterns
module_qtxmlpatterns.depends = module_qtbase
for(d, 2) {
dn = $$moduleName($$d)
!contains(SUBDIRS, $$dn): \
return(false)
$${mod}.depends += $$dn
}
for(d, 3) {
dn = $$moduleName($$d)
contains(SUBDIRS, $$dn): \
$${mod}.depends += $$dn
}
!isEmpty($${mod}.depends): \
export($${mod}.depends)
module_qtscript.subdir = $$IN_PWD/qtscript
module_qtscript.target = module-qtscript
module_qtscript.depends = module_qtbase
$${mod}.target = module-$$1
export($${mod}.target)
module_qtjsbackend.subdir = $$IN_PWD/qtjsbackend
module_qtjsbackend.target = module-qtjsbackend
module_qtjsbackend.depends = module_qtbase
module_qtdeclarative.subdir = $$IN_PWD/qtdeclarative
module_qtdeclarative.target = module-qtdeclarative
module_qtdeclarative.depends = module_qtbase module_qtxmlpatterns module_qtjsbackend
module_qtwebkit.file = qtwebkit.pri
module_qtwebkit.makefile = Makefile.qtwebkit
module_qtwebkit.depends = module_qtbase module_qtscript module_qtdeclarative module_qtquick1
# The qtwebkit subdir does not follow the "module-*" scheme, so make our own target that does.
module_qtwebkit_target.target = module-qtwebkit
module_qtwebkit_target.commands =
module_qtwebkit_target.depends = sub-qtwebkit-pri
QMAKE_EXTRA_TARGETS += module_qtwebkit_target
module_qtwebkit_examples_and_demos.subdir = $$IN_PWD/qtwebkit-examples-and-demos
module_qtwebkit_examples_and_demos.target = module-qtwebkit-examples-and-demos
module_qtwebkit_examples_and_demos.depends = module_qtwebkit
module_qttools.subdir = $$IN_PWD/qttools
module_qttools.target = module-qttools
module_qttools.depends = module_qtbase module_qtscript module_qtquick1 module_qtdeclarative
module_qttranslations.subdir = $$IN_PWD/qttranslations
module_qttranslations.target = module-qttranslations
module_qttranslations.depends = module_qttools
module_qtdoc.subdir = $$IN_PWD/qtdoc
module_qtdoc.target = module-qtdoc
module_qtdoc.depends = module_qtbase module_qtdeclarative
module_qtactiveqt.subdir = $$IN_PWD/qtactiveqt
module_qtactiveqt.target = module-qtactiveqt
module_qtactiveqt.depends = module_qtbase
module_qlalr.subdir = $$IN_PWD/qlalr
module_qlalr.target = module-qlalr
module_qlalr.depends = module_qtbase
module_qtqa.subdir = $$IN_PWD/qtqa
module_qtqa.target = module-qtqa
module_qtqa.depends = module_qtbase
module_qtlocation.subdir = $$IN_PWD/qtlocation
module_qtlocation.target = module-qtlocation
module_qtlocation.depends = module_qtbase module_qtdeclarative module_qt3d module_qtjsondb
module_qtsensors.subdir = $$IN_PWD/qtsensors
module_qtsensors.target = module-qtsensors
module_qtsensors.depends = module_qtbase module_qtdeclarative
module_qtsystems.subdir = $$IN_PWD/qtsystems
module_qtsystems.target = module-qtsystems
module_qtsystems.depends = module_qtbase module_qtdeclarative
module_qtmultimedia.subdir = $$IN_PWD/qtmultimedia
module_qtmultimedia.target = module-qtmultimedia
module_qtmultimedia.depends = module_qtbase module_qtdeclarative
module_qtfeedback.subdir = $$IN_PWD/qtfeedback
module_qtfeedback.target = module-qtfeedback
module_qtfeedback.depends = module_qtbase module_qtmultimedia module_qtdeclarative
module_qt3d.subdir = $$IN_PWD/qt3d
module_qt3d.target = module-qt3d
module_qt3d.depends = module_qtbase module_qtdeclarative
module_qtdocgallery.subdir = $$IN_PWD/qtdocgallery
module_qtdocgallery.target = module-qtdocgallery
module_qtdocgallery.depends = module_qtbase module_qtscript module_qtdeclarative
module_qtpim.subdir = $$IN_PWD/qtpim
module_qtpim.target = module-qtpim
module_qtpim.depends = module_qtdeclarative
module_qtconnectivity.subdir = $$IN_PWD/qtconnectivity
module_qtconnectivity.target = module-qtconnectivity
module_qtconnectivity.depends = module_qtsystems
module_qtwayland.subdir = $$IN_PWD/qtwayland
module_qtwayland.target = module-qtwayland
module_qtwayland.depends = module_qtbase module_qtdeclarative
# not yet enabled by default
module_qtwayland.CONFIG = no_default_target no_default_install
module_qtjsondb.subdir = $$IN_PWD/qtjsondb
module_qtjsondb.target = module-qtjsondb
module_qtjsondb.depends = module_qtbase module_qtdeclarative module_qtxmlpatterns
module_qtimageformats.subdir = $$IN_PWD/qtimageformats
module_qtimageformats.target = module-qtimageformats
module_qtimageformats.depends = module_qtbase
module_qtquick1.subdir = $$IN_PWD/qtquick1
module_qtquick1.target = module-qtquick1
module_qtquick1.depends = module_qtbase module_qtscript module_qtxmlpatterns
module_qtgraphicaleffects.subdir = $$IN_PWD/qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative module_qtsvg module_qtxmlpatterns
# not yet enabled by default
module_qtgraphicaleffects.CONFIG = no_default_target no_default_install
SUBDIRS += $$mod
export(SUBDIRS)
return(true)
}
# only qtbase is required to exist. The others may not - but it is the
# users responsibility to ensure that all needed dependencies exist, or
# it may not build.
SUBDIRS = module_qtbase
ANDROID_EXTRAS =
android: ANDROID_EXTRAS = qtandroidextras
exists(qtsvg/qtsvg.pro) {
SUBDIRS += module_qtsvg
# These modules do not require qtsvg, but can use it if it is available
module_qtdeclarative.depends += module_qtsvg
module_qtquick1.depends += module_qtsvg
}
exists(qtphonon/qtphonon.pro): SUBDIRS += module_qtphonon
exists(qtxmlpatterns/qtxmlpatterns.pro): SUBDIRS += module_qtxmlpatterns
exists(qtscript/qtscript.pro): SUBDIRS += module_qtscript
exists(qtdeclarative/qtdeclarative.pro): SUBDIRS += module_qtdeclarative
exists(qttools/qttools.pro): SUBDIRS += module_qttools
exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
exists(qtlocation/qtlocation.pro): SUBDIRS += module_qtlocation
exists(qtactiveqt/qtactiveqt.pro) {
SUBDIRS += module_qtactiveqt
module_qttools.depends += module_qtactiveqt
}
exists(qtsensors/qtsensors.pro): SUBDIRS += module_qtsensors
exists(qtsystems/qtsystems.pro): SUBDIRS += module_qtsystems
exists(qtmultimedia/qtmultimedia.pro): SUBDIRS += module_qtmultimedia
exists(qtfeedback/qtfeedback.pro): SUBDIRS += module_qtfeedback
exists(qt3d/qt3d.pro): SUBDIRS += module_qt3d
exists(qtdocgallery/qtdocgallery.pro): SUBDIRS += module_qtdocgallery
exists(qtpim/qtpim.pro): SUBDIRS += module_qtpim
exists(qtconnectivity/qtconnectivity.pro): SUBDIRS += module_qtconnectivity
!win32:!mac:exists(qtwayland/qtwayland.pro): SUBDIRS += module_qtwayland
exists(qtjsondb/qtjsondb.pro) {
SUBDIRS += module_qtjsondb
# These modules do not require qtjsondb, but can use it if it is available
module_qtpim.depends += module_qtjsondb
module_qtdocgallery.depends += module_qtjsondb
module_qtsystems.depends += module_qtjsondb
}
exists(qtjsbackend/qtjsbackend.pro): SUBDIRS += module_qtjsbackend
exists(qtimageformats/qtimageformats.pro): SUBDIRS += module_qtimageformats
exists(qtquick1/qtquick1.pro): SUBDIRS += module_qtquick1
exists(qtgraphicaleffects/qtgraphicaleffects.pro): SUBDIRS += module_qtgraphicaleffects
exists(qtwebkit/Tools/Scripts/build-webkit) {
SUBDIRS += module_qtwebkit \
module_qtwebkit_examples_and_demos
module_qttools.depends += module_qtwebkit
}
addModule(qtbase)
addModule(qtandroidextras, qtbase)
addModule(qtmacextras, qtbase)
addModule(qtx11extras, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtbase, qtdeclarative)
addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
addModule(qt3d, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative)
addModule(qtwebsockets, qtbase, qtdeclarative)
addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors qtwebchannel, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase, qttools)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
addModule(qtdocgallery, qtdeclarative)
linux:!android: addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
addModule(qtwebengine, qtquickcontrols, qtwebkit)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)

2
qt3d

Submodule qt3d updated: 4b2cffa47a...bdb98baf82

1
qtactiveqt Submodule

Submodule qtactiveqt added at f0a39bbfe1

1
qtandroidextras Submodule

Submodule qtandroidextras added at 42b878b161

2
qtbase

Submodule qtbase updated: ca572c0b80...d82d5b1c43

1
qtconnectivity Submodule

Submodule qtconnectivity added at ed8de4eb35

2
qtdoc

Submodule qtdoc updated: 09bb2d974a...a390b74a20

1
qtdocgallery Submodule

Submodule qtdocgallery added at aa1d1e75ea

1
qtenginio Submodule

Submodule qtenginio added at 134dc76b7f

1
qtfeedback Submodule

Submodule qtfeedback added at dea0da7265

Submodule qtjsbackend deleted from afefa8cbe7

1
qtmacextras Submodule

Submodule qtmacextras added at 3a3a7d799b

1
qtpim Submodule

Submodule qtpim added at 7a2b179ff1

1
qtqa Submodule

Submodule qtqa added at 31235fa2d0

1
qtquickcontrols Submodule

Submodule qtquickcontrols added at dd490a7fe2

1
qtrepotools Submodule

Submodule qtrepotools added at 590f651476

1
qtserialport Submodule

Submodule qtserialport added at e257bdc9aa

2
qtsvg

Submodule qtsvg updated: 794a97bfd9...ccae23961e

Submodule qttools updated: ef2557d7df...b73a47aa17

1
qttranslations Submodule

Submodule qttranslations added at f76e5c98b0

1
qtwebchannel Submodule

Submodule qtwebchannel added at 7b5da1d3dd

1
qtwebengine Submodule

Submodule qtwebengine added at 6c0d77396f

1
qtwebkit-examples Submodule

Submodule qtwebkit-examples added at 9f20ed0b48

View File

@@ -1,102 +0,0 @@
# Wrapper profile for QtWebkit.
#
# This is needed because webkit builds via a script.
# Technically this script is a .pro file, but we name it .pri to avoid clashing
# with qt.pro.
isEmpty(vcproj) {
QMAKE_LINK = @: IGNORE THIS LINE
OBJECTS_DIR =
win32:CONFIG -= embed_manifest_exe
} else {
CONFIG += console
PHONY_DEPS = .
phony_src.input = PHONY_DEPS
phony_src.output = phony.c
phony_src.variable_out = GENERATED_SOURCES
phony_src.commands = echo int main() { return 0; } > phony.c
phony_src.name = CREATE phony.c
phony_src.CONFIG += combine
QMAKE_EXTRA_COMPILERS += phony_src
}
DS = $$QMAKE_DIR_SEP
contains(DS, /) {
env_export = export
OPTI=+
SBC=$$quote($$QMAKE_CHK_DIR_EXISTS qtwebkit || mkdir qtwebkit &&)
} else {
env_export = set
GNUTOOLS = $$quote("set \"PATH=$$PWD/gnuwin32/bin;%PATH%\" &&")
}
# Any configuration making use of QMAKE_POST_LINK will not work for this project,
# since the building is done by webkit's own build script and qmake at this level
# does not know the real TARGET. Disable them here.
CONFIG -= separate_debug_info
exists($$PWD/qtwebkit/WebKitTools):qtwebkit_tools_dir = WebKitTools
else:qtwebkit_tools_dir = Tools
QTWEBKIT_BUILD_CONFIG =
contains(CONFIG, release):!contains(CONFIG, debug_and_release): {QTWEBKIT_BUILD_CONFIG = --release}
# npapi does not work for qpa, as of qtwebkit 81b8dac16049715b94dc36256bd9f433f7dfacc5 .
# This should be reverted once npapi either works, or gracefully disables itself, for qpa.
qpa:QTWEBKIT_BUILD_CONFIG += --no-netscape-plugin
# WebKit2 is not yet supported on Windows, so avoid trying to build it
win32:QTWEBKIT_BUILD_CONFIG += --no-webkit2
# The '+' is to make parallel "make" work across the script boundary.
module_qtwebkit.commands = $${OPTI}$${SBC}cd qtwebkit && \
$$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
--qt \
--qmake=$(QMAKE) \
--install-libs=$$[QT_INSTALL_LIBS] \
$$QTWEBKIT_BUILD_CONFIG
# "--makeargs=\"-$(MAKEFLAGS)\""
# Trick to force dependency on this rule.
#module_qtwebkit.commands += $$escape_expand(\\n)make_default: module-qtwebkit
module_qtwebkit.target = module-qtwebkit
# The '+' is to make parallel "make" work across the script boundary.
module_qtwebkit_clean.commands = $${OPTI}$${SBC}cd qtwebkit && \
$$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
--qt \
--qmake=$(QMAKE) \
--install-libs=$$[QT_INSTALL_LIBS] \
$$QTWEBKIT_BUILD_CONFIG \
"--makeargs=\"$(MAKEFLAGS)\"" \
--clean
# Trick to force dependency on this rule.
module_qtwebkit_clean.commands += $$escape_expand(\\n)clean: module-qtwebkit-clean
module_qtwebkit_clean.target = module-qtwebkit-clean
module_qtwebkit_install.commands = $${OPTI}$${SBC}cd qtwebkit && \
$$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
--qt \
--qmake=$(QMAKE) \
--install-libs=$$[QT_INSTALL_LIBS] \
"--makeargs=\"install\""
# Trick to force dependency on this rule.
module_qtwebkit_install.commands+= $$escape_expand(\\n)install: module-qtwebkit-install
module_qtwebkit_install.target = module-qtwebkit-install
module_qtwebkit_uninstall.commands = $${OPTI}$${SBC}cd qtwebkit && \
$$env_export \"WEBKITOUTPUTDIR=$$OUT_PWD/qtwebkit/WebKitBuild\" && $$GNUTOOLS \
perl $$PWD$${DS}qtwebkit$${DS}$${qtwebkit_tools_dir}$${DS}Scripts$${DS}build-webkit \
--qt \
--qmake=$(QMAKE) \
--install-libs=$$[QT_INSTALL_LIBS] \
"--makeargs=\"uninstall\""
# Trick to force dependency on this rule.
module_qtwebkit_uninstall.commands+= $$escape_expand(\\n)uninstall: module-qtwebkit-uninstall
module_qtwebkit_uninstall.target = module-qtwebkit-uninstall
# WebKit needs a nonstandard target because the build has to be initiated by the bundled script.
QMAKE_EXTRA_TARGETS += module_qtwebkit module_qtwebkit_clean module_qtwebkit_install module_qtwebkit_uninstall
PRE_TARGETDEPS += module-qtwebkit

1
qtwebsockets Submodule

Submodule qtwebsockets added at 02e0e2a977

1
qtwinextras Submodule

Submodule qtwinextras added at d82df56fb9

1
qtx11extras Submodule

Submodule qtx11extras added at 32b1ce9e1b