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
709 Commits 118 Branches 270 Tags
f89dd01d1987cdbf3de9927227d7345f2a43bdf5
Commit Graph

709 Commits

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