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

894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
v5.2.0 		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
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>
v5.2.0-rc1 		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>
v5.2.0-beta1 		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
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>
v5.2.0-alpha1 		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