lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-20 21:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
669 Commits 120 Branches 272 Tags
8e64df07565880795d9b79c38183d4708d6c13d6
Commit Graph

669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Qt Submodule Update Bot
8cb6c9373f Updated submodules. 
Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-30 11:14:46 +01:00
Oswald Buddenhagen
c409a85bb8 re-instate a top-level docs target 
now that it's not in default_post any more, each concerned repo needs to
request it explicitly. as this is not a regular qt module, it happens a
bit differently than elsewhere.

Change-Id: I47f741e09add302fb4b1146be73da2f26a67a5af
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
 2012-11-30 00:17:42 +01:00
Qt Submodule Update Bot
5e8c47946a Updated submodules. 
Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-29 08:57:37 +01:00
Qt Submodule Update Bot
c18c2a76ef Updated submodules. 
Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-28 12:29:41 +01:00
Qt Submodule Update Bot
a41ce6cb4f Updated submodules. 
Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-27 03:54:51 +01:00
Qt Submodule Update Bot
97d477d4ff Updated submodules. 
Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-26 16:44:08 +01:00
Simon Hausmann
af96eba3e7 WebKit update 
A new snapshot bringing in new bug fixes :)

Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-23 22:03:54 +01:00
Sergio Ahumada
bf8311f879 Updated submodules. 
Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-22 21:27:42 +01:00
Joerg Bornemann
9eefa9fb9a Fix parallel builds in WebKit 
The parallel builds aborts because parallel execution of flex breaks
due to the usage of the same temporary file names. This stems from
using a hard coded temp file name "~flex_temp_out_main" and
"random numbers" based on constants in mkstempFILE.

Fixing those issues by embedding the current PID into the temp file
names. Patch is in gnuwin32/patches/win_flex.patch

Change-Id: I6c0cd499b3c9c35128280ec0fee5e450a9ca097f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-22 14:58:19 +01:00
Qt Submodule Update Bot
471842d8f4 Updated submodules. 
Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-21 23:50:45 +01:00
Qt Submodule Update Bot
b335981ca0 Updated submodules. 
Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-21 13:53:56 +01:00
Samuel Rødal
24031b2120 Merge remote-tracking branch 'gerrit/newdocs' into HEAD 
Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
 2012-11-20 11:00:40 +01:00
Qt Submodule Update Bot
b1c03b4497 Updated submodules. 
Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-20 03:46:39 +01:00
Qt Submodule Update Bot
a9e3e72b2e Updated submodules. 
Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-17 12:13:19 +01:00
Qt Submodule Update Bot
b9f3ea418a Updated submodules. 
Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-17 02:27:40 +01:00
Qt Submodule Update Bot
766ed50650 Updated submodules. 
Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-14 12:48:25 +01:00
Qt Submodule Update Bot
0f16101977 Updated submodules. 
Change-Id: I2ad41f3ba71831b1a2634a616f7985de27af89cf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-11-14 05:52:00 +01:00
Oswald Buddenhagen
db59699011 brisbane is no more 
the berlin mirror is currently dysfunct as well, but i'm leaving the
code in in the expectation that it will finally re-surface (under a
different url).

Change-Id: Ifee885a6ba17c5ef3502b6547ffd850bc5f742a5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2012-11-14 05:51:47 +01:00
Oswald Buddenhagen
b9b8db0745 fix argument quoting when invoking "proper" configure 
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-11-14 05:51:43 +01:00
Qt Submodule Update Bot
2ad41f3ba7 Updated submodules. 
Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-12 22:02:41 +01:00
Qt Submodule Update Bot
371ae019fc Updated submodules. 
Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-11 11:41:03 +01:00
Qt Submodule Update Bot
cb530cbe80 Updated submodules. 
Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-10 19:40:52 +01:00
Qt Submodule Update Bot
8dfa5d43e1 Updated submodules. 
Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-10 11:20:22 +01:00
Qt Submodule Update Bot
4ec68bcba5 Updated submodules. 
Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-09 06:22:14 +01:00
Qt Submodule Update Bot
7319eb06fd Updated submodules. 
Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-08 17:18:07 +01:00