lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-06 20:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
949 Commits 120 Branches 272 Tags
836f00a76e4f8c623f99bcb29cf1b3f0d101cc08
Commit Graph

949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Sergio Ahumada
0381f7bd54 Updated submodules. 
Change-Id: Ic95561b551e1b777dd164d5dfc865f6f02f1c0b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-13 01:27:30 +01:00
Qt Submodule Update Bot
a2d9fb7323 Updated submodules. 
Change-Id: I56d9eaba8f6699c6635f76277aedde7a2fbb992b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-12 07:14:30 +01:00
Qt Submodule Update Bot
56d9eaba8f Updated submodules. 
Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-11 18:58:49 +01:00
Qt Submodule Update Bot
1652b1e10a Updated submodules. 
Change-Id: If565e02bdbdf8d2e3f08f45db96224c20074f168
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-09 23:32:19 +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