lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
903 Commits 120 Branches 274 Tags
7f329372759e1ea21f5812df08b5eb218d09079e
Commit Graph

903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d5cc1add47 Updated submodules. 
Change-Id: I33606f80b5eef964e188220d8330c14369af93a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
v5.1.1 		2013-08-24 06:47:24 +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
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
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
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
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
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
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
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
dd9853b3cb Updated submodules. 
Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-08-07 10:33:43 +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
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
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
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
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