Compare commits

...

80 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
17e103bb5d Updated submodules.
Change-Id: Icbb3e6068e906ca3cc08056833895a615bcad01b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-30 12:36:50 +01:00
Qt Submodule Update Bot
cbb3e6068e Updated submodules.
Change-Id: Ia4f6e14fc205dfcf15a8df7f275a1cfefdc41c1a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-28 13:50:13 +01:00
Qt Submodule Update Bot
a4f6e14fc2 Updated submodules.
Change-Id: Ie259fdadce42cfe9e740f99e5b3d4a39473b775c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-27 12:43:12 +01:00
Qt Submodule Update Bot
e259fdadce Updated submodules.
Change-Id: I44e7f5d2e3896dde44822517e0b51f62922645f0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-26 13:05:04 +01:00
Qt Submodule Update Bot
44e7f5d2e3 Updated submodules.
Change-Id: I9710c4f2d2a79e0cdc6af17569914b9f3fa96aa4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-25 17:45:45 +01:00
Qt Submodule Update Bot
9710c4f2d2 Updated submodules.
Change-Id: I1d94d5ec03ccdf4272c6d4bd3e0eefd282464896
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-23 07:47:10 +01:00
Qt Submodule Update Bot
1d94d5ec03 Updated submodules.
Change-Id: I7f329372759e1ea21f5812df08b5eb218d09079e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-21 20:12:33 +01:00
Qt Submodule Update Bot
7f32937275 Updated submodules.
Change-Id: If92227236c0b68580bd936c5f9a8cc5ca1f714e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-19 17:42:41 +01:00
Qt Submodule Update Bot
f92227236c Updated submodules.
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-17 20:34:05 +01:00
Oswald Buddenhagen
563b32ee25 Merge remote-tracking branch 'gerrit/stable' into release
Conflicts:
	qtwebkit-examples

Change-Id: Ifa8735dd8f7ddf3aa74474c983327b94ea2737c5
2014-01-16 14:31:57 +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
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
ec0c8697aa Updated submodules.
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-16 11:26:06 +01:00
Qt Submodule Update Bot
02353a4b3e Updated submodules.
Change-Id: Ib5594043bc3bcf735aedfaa1871de2c116bbe715
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-12-08 11:14:18 +01:00
Qt Submodule Update Bot
b5594043bc Updated submodules.
Change-Id: I323825a1dbd75c630644f3b11349c6c3fe6e2e29
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-06 07:13:17 +01:00
Qt Submodule Update Bot
323825a1db Updated submodules.
Change-Id: Id8f6092efde7a94457986da66e9cd05243ba7e84
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-05 12:33:11 +01:00
Qt Submodule Update Bot
d8f6092efd Updated submodules.
Change-Id: Ie2d566a72dcdf9cb8e7b8ec3f7050103d08f6261
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-04 14:29:05 +01:00
Qt Submodule Update Bot
e2d566a72d Updated submodules.
Change-Id: I0ea66cab6e5d390492b80b61e33d9ad3f607e006
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2013-12-03 14:26:42 +01:00
Qt Submodule Update Bot
0ea66cab6e Updated submodules.
Change-Id: I100c98b9fcbd54f001eed4b7cda91bb9e1fab531
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-01 15:12:03 +01:00
Qt Submodule Update Bot
100c98b9fc Updated submodules.
Change-Id: I27f8dc93ae7917913c42e6e42f12bc706468fc54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-30 21:19:09 +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
27f8dc93ae Updated submodules.
Change-Id: If62385a213d41b12483a95ac0769a82b66897529
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-30 10:27:04 +01:00
Qt Submodule Update Bot
f62385a213 Updated submodules.
Change-Id: I948ce9ed9e12459be045ec3c1264b19822ba1494
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-11-26 14:43:56 +01:00
Qt Submodule Update Bot
948ce9ed9e Updated submodules.
Change-Id: I284765a1be816913b0d126e863583759adb160b3
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
2013-11-25 19:49:39 +01:00
Qt Submodule Update Bot
284765a1be Updated submodules.
Change-Id: Ieda3b9c308665e0379cfa5fa0e1bc65d8208ec64
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-24 21:59:51 +01:00
Qt Submodule Update Bot
eda3b9c308 Updated submodules.
Change-Id: If3f634ae660e77effac660bc624b9a6f986cc398
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-11-22 21:02:25 +01:00
Qt Submodule Update Bot
f3f634ae66 Updated submodules.
Change-Id: Ifbb4041031123eeb5a834c4f465d5e45d73ec9da
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-22 11:42:53 +01:00
Qt Submodule Update Bot
fbb4041031 Updated submodules.
Change-Id: Ib7081d3f13d00144b11a56271eb39eb5e480c90b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-20 21:00:30 +01:00
Qt Submodule Update Bot
b7081d3f13 Updated submodules.
Change-Id: I52a93121007cf19def97b313e34a87ecf5d73c09
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-20 14:04:14 +01:00
Qt Submodule Update Bot
52a9312100 Updated submodules.
Change-Id: Ifc6f18a589d54f4dc7a4f75131e61e29b8e8cb31
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-19 16:50:54 +01:00
Qt Submodule Update Bot
fc6f18a589 Updated submodules.
Change-Id: I83768ab76810afa1533e18d4f0e4c1ed56d2fbd5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-11-19 07:16:15 +01:00
Qt Submodule Update Bot
83768ab768 Updated submodules.
Change-Id: Ie137a789a90bbf3568404ff53d06d536319685d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-14 18:07:58 +01:00
Qt Submodule Update Bot
e137a789a9 Updated submodules.
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-11-13 11:36:43 +01:00
Oswald Buddenhagen
0533da6bc1 Merge branch 'stable' into release
this is done with -s ours, throwing away the sha1 updates in this
branch.
2013-11-11 16:29:21 +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
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
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
Qt Submodule Update Bot
d5cc1add47 Updated submodules.
Change-Id: I33606f80b5eef964e188220d8330c14369af93a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-24 06:47:24 +02:00
Qt Submodule Update Bot
33606f80b5 Updated submodules.
Change-Id: I056329bd5cea3d9fbe160bc177823d16576d4b83
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-20 14:43:01 +02:00
Qt Submodule Update Bot
056329bd5c Updated submodules.
Change-Id: Ic4605dfbf0f061b0388705f1bdb3b23e46a10248
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-19 21:34:26 +02:00
Qt Submodule Update Bot
c4605dfbf0 Updated submodules.
Change-Id: I000a215563281c85323a7eb9b2c5ba62f64893a5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-17 10:14:06 +02:00
Qt Submodule Update Bot
000a215563 Updated submodules.
Change-Id: I7b5e4f67b7e5c6701be8827384098401b4e66e57
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-15 21:34:30 +02:00
Qt Submodule Update Bot
7b5e4f67b7 Updated submodules.
Change-Id: Ib9a6f134d8e8186af858d148fa1941ce85ae1166
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-14 10:07:56 +02:00
Qt Submodule Update Bot
b9a6f134d8 Updated submodules.
Change-Id: I8ec5f763832e10a2a33f598113261a715c873bb2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-12 08:24:27 +02:00
Qt Submodule Update Bot
8ec5f76383 Updated submodules.
Change-Id: I8abcedd5bd3e82aa2b4acc0271e7fba402b8efab
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-09 21:13:34 +02:00
Qt Submodule Update Bot
8abcedd5bd Updated submodules.
Change-Id: Ief7a92580221b4c3fe6521abea165f5181d800fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-09 08:18:36 +02:00
Qt Submodule Update Bot
ef7a925802 Updated submodules.
Change-Id: I36ed7ab38d3b61a01fe2b0989c2cb404e72afc9b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-08 08:56:35 +02:00
Qt Submodule Update Bot
36ed7ab38d Updated submodules.
Change-Id: Ia44fe424bc986bcc308194d4068e9d79d73f1167
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-06 14:50:31 +02:00
Qt Submodule Update Bot
a44fe424bc Updated submodules.
Change-Id: Ie1325f4c4c9b1b9b560ccee63171f7adf008df2c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-02 21:36:35 +02:00
Qt Submodule Update Bot
e1325f4c4c Updated submodules.
Change-Id: If243edd33f2018ff92cd27ac1eabfa75ae52f11b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-31 19:52:57 +02:00
Qt Submodule Update Bot
f243edd33f Updated submodules.
Change-Id: Idf81b47f57cdc5b00cbd7d159bec6eabc95f4ac1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-30 18:37:24 +02:00
Qt Submodule Update Bot
df81b47f57 Updated submodules.
Change-Id: I5d1f1f2817d32b93432caf639d508d56a59d9430
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-27 21:36:48 +02:00
Qt Submodule Update Bot
5d1f1f2817 Updated submodules.
Change-Id: I1421f888a7be71b786df796772064f8d1b2f0157
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-27 11:46:00 +02:00
Qt Submodule Update Bot
1421f888a7 Updated submodules.
Change-Id: I3d55ee3e80b0d03479a88d0272c079bd8c32a890
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-26 08:07:43 +02:00
Qt Submodule Update Bot
3d55ee3e80 Updated submodules.
Change-Id: I02567c71ad64d474848263fc6636b243ab5d2665
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-25 17:44:21 +02:00
Qt Submodule Update Bot
02567c71ad Updated submodules.
Change-Id: Id6f8db264e59d8b6c5d4f81e030c0943bcfeade3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-24 14:13:14 +02:00
Qt Submodule Update Bot
d6f8db264e Updated submodules.
Change-Id: Iad03e256c0e0ab29e2759579caf7ad93b0a4416e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-07-22 22:30:31 +02:00
Sergio Ahumada
c21bee55a5 Updated submodules.
Change-Id: I2523a9d712571ec411dde0e547c4a5ad0c17e977
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-07-01 20:11:45 +02:00
Qt Submodule Update Bot
ad03e256c0 Updated submodules.
Change-Id: I441527d16813cb8c5483f251a2586946f2939c55
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-28 19:07:46 +02:00
Qt Submodule Update Bot
441527d168 Updated submodules.
Change-Id: I62187932bef0dc3b8c88e85ae4fcad4628ac3b46
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-27 10:09:12 +02:00
Qt Submodule Update Bot
62187932be Updated submodules.
Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-25 00:58:27 +02:00
32 changed files with 43 additions and 35 deletions

View File

@@ -4,6 +4,9 @@
# ==[ 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.
@@ -12,9 +15,6 @@
# Solicit reviewers. They still need to use the Gerrit frontend.
#Reviewed-by:
#
# Change log entry (see below for instructions).
#[ChangeLog][][]
#
# ==[ Please wrap at 72 characters ]===================================|
#
# Remember to read http://wiki.qt-project.org/Commit_Policy
@@ -22,7 +22,8 @@
# 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.
# 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],

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
Makefile
.qmake.cache
.qmake.super

3
.gitmodules vendored
View File

@@ -100,3 +100,6 @@
[submodule "qtandroidextras"]
path = qtandroidextras
url = ../qtandroidextras.git
[submodule "qtenginio"]
path = qtenginio
url = ../qtenginio.git

View File

@@ -208,6 +208,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtdeclarative
qtdoc
qtdocgallery
qtenginio
qtfeedback
qtgraphicaleffects
qtimageformats

11
qt.pro
View File

@@ -61,28 +61,29 @@ addModule(qlalr, qtbase)
addModule(qtsvg, qtbase)
addModule(qtxmlpatterns, qtbase)
addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
addModule(qtwinextras, qtbase, qtdeclarative)
addModule(qtquickcontrols, qtdeclarative)
addModule(qtmultimedia, qtdeclarative)
addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
addModule(qtactiveqt, qtbase)
addModule(qt3d, qtdeclarative)
addModule(qtjsondb, qtdeclarative)
addModule(qtsystems, qtbase, qtdeclarative)
addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
addModule(qtsensors, qtbase, qtdeclarative)
addModule(qtconnectivity, qtsystems)
addModule(qtconnectivity, qtbase, qtdeclarative)
addModule(qtfeedback, qtdeclarative, qtmultimedia)
addModule(qtpim, qtdeclarative, qtjsondb)
addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
addModule(qtwebkit-examples, qtwebkit qttools)
addModule(qtimageformats, qtbase)
addModule(qtgraphicaleffects, qtdeclarative)
addModule(qtscript, qtbase)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
addModule(qtscript, qtbase, qttools)
addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
addModule(qtdocgallery, qtdeclarative, qtjsondb)
!win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
addModule(qtserialport, qtbase)
addModule(qtenginio, qtdeclarative)
addModule(qttranslations, qttools)
addModule(qtdoc, qtdeclarative)
addModule(qtqa, qtbase)

2
qtbase

Submodule qtbase updated: f04b46f34e...62feb088a3

2
qtdoc

Submodule qtdoc updated: dd3ce034d6...f308fb8a19

1
qtenginio Submodule

Submodule qtenginio added at 136ee0aa5d

2
qtqa

Submodule qtqa updated: 556c9ffeeb...afafbfafd9

2
qtsvg

Submodule qtsvg updated: 6a4cc0bc63...62c8144782

Submodule qttools updated: 99526b03f5...cc253a0469