lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-08-12 23:49:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,986 Commits 123 Branches 280 Tags
e8a94de2ea4675fb30c48c448ad829532f69bf2f
Commit Graph

5986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Bot f81bf2b5ee Updated submodules. 
Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-19 19:38:01 +02:00
Tor Arne Vestbø 0e1169ca2d Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit' 
Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-10-19 19:37:52 +02:00
Qt Submodule Update Bot 0e169c8e8b Updated submodules. 
Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-15 15:19:50 +02:00
Qt Submodule Update Bot 34f1dbc74a Updated submodules. 
Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-15 03:06:59 +02:00
Qt Submodule Update Bot 21f9eaf60e Updated submodules. 
Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-14 08:11:21 +02:00
Qt Submodule Update Bot da8730bf21 Updated submodules. 
Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-13 23:51:35 +02:00
Qt Submodule Update Bot 749b83f337 Updated submodules. 
Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-10-02 21:13:38 +02:00
Qt Submodule Update Bot 508072fb03 Updated submodules. 
Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-02 02:04:22 +02:00
Qt Submodule Update Bot cd3a4676c8 Updated submodules. 
Change-Id: I008fb07a0f735a1416e6594737505becc671de39
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-10-01 14:52:13 +02:00
Qt Submodule Update Bot 008fb07a0f Updated submodules. 
Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
 2012-09-30 02:35:49 +02:00
Qt Submodule Update Bot d3a55bf0aa Updated submodules. 
Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-29 08:15:48 +02:00
Jonathan Liu 600b295f2c Revert "Check for a non-error, non-continue case." 
This reverts commit 6bd52260c8.
Running configure -help should not break builds by removing
.qmake.cache.

Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2012-09-28 18:19:12 +02:00
Qt Submodule Update Bot 58acd59fa6 Updated submodules. 
Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-28 13:01:26 +02:00
Qt Submodule Update Bot 8f9fcfdcb5 Updated submodules. 
Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-27 21:02:49 +02:00
Simon Hausmann e4d841490b Introduce dependency: QtQuick1 needs QtWebKit 
The QML1 WebKit integration is moved to the QtQuick1 module, so this
dependency needs to be expressed in qt.pro.

It is technically an optional dependency, because the module can be built
without, but if WebKit is available then it should be built before QtQuick1.

Change-Id: Iae69339827afe6449a7af8fd6ae7de62632f30ed
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2012-09-26 15:30:47 +02:00
Simon Hausmann a2d6af491e WebKit update for MinGW build fix 
Change-Id: I5b541d144a91a8bebece62a6f3abd4108848ca39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-25 20:53:47 +02:00
Iikka Eklund 4e87fe89ce Change copyrights from Nokia to Digia 
Change copyrights and license headers from Nokia to Digia

Change-Id: Ieac8fb85896427cd5e3c6d91698c455a0dc9e495
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2012-09-25 14:31:30 +02:00
Qt Submodule Update Bot 4865835418 Updated submodules. 
Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2012-09-24 20:48:32 +02:00
Simon Hausmann 58178a8a0e New WebKit snapshot with build fixes for latest qtbase 
Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-24 13:08:58 +02:00
Qt Submodule Update Bot bf4c64ada0 Updated submodules. 
Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
 2012-09-24 13:08:53 +02:00