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
694 Commits 118 Branches 270 Tags
c28bacd49f3d4568f31c3a3379e328bd19a63fbb
Commit Graph

694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Sergio Ahumada
da69011610 Updated submodules. 
Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-05-25 20:22:21 +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
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
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
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
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
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
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
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
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
9e7460525d Updated submodules. 
Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-14 18:56:22 +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
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