qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
656 Commits 115 Branches 262 Tags 18 MiB
Commit Graph

656 Commits

Author SHA1 Message Date
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
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
Qt Submodule Update Bot e605d1675e Updated submodules. 
Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-07 17:40:11 +01:00
Sergio Ahumada 7a9722d3ab Updated submodules 
Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-07 11:46:40 +01:00
Simon Hausmann 76d59a3fa4 Manual update of qtbase from master for qt5.git 
Change-Id: I6649832b9a395cda862a032b910ed69479964895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-06 15:55:11 +01:00
Qt Submodule Update Bot a6254526d8 Updated submodules. 
Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-11-06 10:53:06 +01:00
Qt Submodule Update Bot 01b8ffb28f Updated submodules. 
Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-05 20:09:22 +01:00
Qt Submodule Update Bot 2b92b3ea1f Updated submodules. 
Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-11-01 12:30:27 +01:00
Sergio Ahumada 0125076d12 Updated submodules. 
Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
 2012-10-30 16:21:37 +01:00
Stephen Kelly 41c3f2cb5f Remove submodules which are not part of Qt 5.0. 
Task-number: QTBUG-27736
Change-Id: I737515d2cfe687448a03b67ce9f2c14d108f2a1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-10-30 16:21:34 +01:00
Qt Submodule Update Bot a1f4d9db15 Updated submodules. 
Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-26 18:44:56 +02:00
Simon Hausmann 71c071399a Minor WebKit update to fix 64-bit Windows build 
Just three patches on top that should fix the 64-bit build that uses
C-Loop LLInt for JSC.

Change-Id: I9dc87416dbf0ee3e3b47b46d6529dd951e5c15e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-25 16:08:34 +02:00
Tor Arne Vestbø c72a240108 Add prepare_docs to CONFIG as preparation to two-pass doc builds 
Won't have any effect until the corresponding patch lands in qtbase.

Change-Id: I807ca48d3e2ab671f0d56eea27f72455304d367b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
 2012-10-25 12:19:13 +02:00
Qt Submodule Update Bot c0772fa7a5 Updated submodules. 
Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-25 11:41:03 +02:00
Simon Hausmann 98a605eb6b Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changes 
Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-23 03:46:47 +02:00