mirror/qt/qt5.git
7 years agoAdd module qtx11extras to qt5.git dev_1360335411
David Faure [Fri, 4 Jan 2013 16:09:29 +0000 (17:09 +0100)]
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>
7 years agoUpdated submodules. dev_1359632433
Qt Submodule Update Bot [Thu, 31 Jan 2013 11:43:09 +0000 (13:43 +0200)]
Updated submodules.

Change-Id: I6207f23126d98141aefe4523cc785ca88fb6d0ff
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. dev_1359124718
Qt Submodule Update Bot [Fri, 25 Jan 2013 11:35:47 +0000 (13:35 +0200)]
Updated submodules.

Change-Id: I6ff7fbc6859f27ffebb0289fed485ed13d2aef79
Reviewed-by: David Faure (KDE) <faure@kde.org>
7 years agoUpdated submodules. dev_1358762269
Qt Submodule Update Bot [Mon, 21 Jan 2013 03:34:38 +0000 (05:34 +0200)]
Updated submodules.

Change-Id: I713cc7fcc2e6d636117200f7df4a845af4ec06e9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1358492568
Qt Submodule Update Bot [Fri, 18 Jan 2013 03:35:07 +0000 (05:35 +0200)]
Updated submodules.

Change-Id: I79f9d60b77248a97d6ec999566d3aa8ce7058926
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. dev_1357071691
Qt Submodule Update Bot [Tue, 1 Jan 2013 19:35:10 +0000 (21:35 +0200)]
Updated submodules.

Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoremove special handling of qtwebkit master_1354270586 master
Oswald Buddenhagen [Mon, 19 Nov 2012 13:17:50 +0000 (14:17 +0100)]
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>
7 years agoUpdated submodules.
Qt Submodule Update Bot [Fri, 30 Nov 2012 10:13:11 +0000 (12:13 +0200)]
Updated submodules.

Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agore-instate a top-level docs target master_1354231155
Oswald Buddenhagen [Thu, 29 Nov 2012 10:30:28 +0000 (11:30 +0100)]
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>
7 years agoUpdated submodules. master_1354175951
Qt Submodule Update Bot [Thu, 29 Nov 2012 02:33:36 +0000 (04:33 +0200)]
Updated submodules.

Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1354102276
Qt Submodule Update Bot [Wed, 28 Nov 2012 02:33:43 +0000 (04:33 +0200)]
Updated submodules.

Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1353984985
Qt Submodule Update Bot [Tue, 27 Nov 2012 02:35:33 +0000 (04:35 +0200)]
Updated submodules.

Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1353944742
Qt Submodule Update Bot [Mon, 26 Nov 2012 12:34:07 +0000 (14:34 +0200)]
Updated submodules.

Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoWebKit update master_1353704725
Simon Hausmann [Fri, 23 Nov 2012 14:14:50 +0000 (15:14 +0100)]
WebKit update

A new snapshot bringing in new bug fixes :)

Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_1353616155
Sergio Ahumada [Thu, 22 Nov 2012 16:25:13 +0000 (17:25 +0100)]
Updated submodules.

Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoFix parallel builds in WebKit master_1353598132
Joerg Bornemann [Thu, 22 Nov 2012 13:10:43 +0000 (14:10 +0100)]
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>
7 years agoUpdated submodules. master_1353538338
Qt Submodule Update Bot [Wed, 21 Nov 2012 18:33:01 +0000 (20:33 +0200)]
Updated submodules.

Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1353502530
Qt Submodule Update Bot [Wed, 21 Nov 2012 10:33:37 +0000 (12:33 +0200)]
Updated submodules.

Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoMerge remote-tracking branch 'gerrit/newdocs' into HEAD master_1353405889 master_1353421254 master_1353447035 master_1353484898 69/40069/1
Samuel Rødal [Tue, 20 Nov 2012 10:00:21 +0000 (11:00 +0100)]
Merge remote-tracking branch 'gerrit/newdocs' into HEAD

Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5

7 years agoUpdated submodules. master_1353379691
Qt Submodule Update Bot [Tue, 20 Nov 2012 02:34:12 +0000 (04:34 +0200)]
Updated submodules.

Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1353150892
Qt Submodule Update Bot [Sat, 17 Nov 2012 10:36:11 +0000 (12:36 +0200)]
Updated submodules.

Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1353115753
Qt Submodule Update Bot [Fri, 16 Nov 2012 18:33:53 +0000 (20:33 +0200)]
Updated submodules.

Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1352893798
Qt Submodule Update Bot [Wed, 14 Nov 2012 10:33:51 +0000 (12:33 +0200)]
Updated submodules.

Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1352868812
Qt Submodule Update Bot [Wed, 14 Nov 2012 02:33:45 +0000 (04:33 +0200)]
Updated submodules.

Change-Id: I2ad41f3ba71831b1a2634a616f7985de27af89cf
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agobrisbane is no more
Oswald Buddenhagen [Fri, 2 Nov 2012 19:43:27 +0000 (20:43 +0100)]
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>
7 years agofix argument quoting when invoking "proper" configure
Oswald Buddenhagen [Thu, 8 Nov 2012 13:56:39 +0000 (14:56 +0100)]
fix argument quoting when invoking "proper" configure

Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
7 years agoUpdated submodules. master_1352754254
Qt Submodule Update Bot [Mon, 12 Nov 2012 18:33:37 +0000 (20:33 +0200)]
Updated submodules.

Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352630555
Qt Submodule Update Bot [Sun, 11 Nov 2012 10:34:00 +0000 (12:34 +0200)]
Updated submodules.

Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352572946
Qt Submodule Update Bot [Sat, 10 Nov 2012 18:34:46 +0000 (20:34 +0200)]
Updated submodules.

Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352542915
Qt Submodule Update Bot [Fri, 9 Nov 2012 18:34:20 +0000 (20:34 +0200)]
Updated submodules.

Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352438627
Qt Submodule Update Bot [Fri, 9 Nov 2012 02:35:34 +0000 (04:35 +0200)]
Updated submodules.

Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352391580
Qt Submodule Update Bot [Thu, 8 Nov 2012 10:34:41 +0000 (12:34 +0200)]
Updated submodules.

Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1352306504
Qt Submodule Update Bot [Wed, 7 Nov 2012 16:36:53 +0000 (17:36 +0100)]
Updated submodules.

Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules master_1352285293
Sergio Ahumada [Wed, 7 Nov 2012 07:55:28 +0000 (08:55 +0100)]
Updated submodules

Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoManual update of qtbase from master for qt5.git master_1352213804
Simon Hausmann [Tue, 6 Nov 2012 14:49:18 +0000 (15:49 +0100)]
Manual update of qtbase from master for qt5.git

Change-Id: I6649832b9a395cda862a032b910ed69479964895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_1352195679
Qt Submodule Update Bot [Tue, 6 Nov 2012 02:34:20 +0000 (04:34 +0200)]
Updated submodules.

Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_1352142657
Qt Submodule Update Bot [Mon, 5 Nov 2012 18:34:26 +0000 (20:34 +0200)]
Updated submodules.

Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1351769521
Qt Submodule Update Bot [Thu, 1 Nov 2012 10:34:00 +0000 (12:34 +0200)]
Updated submodules.

Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1351610591
Sergio Ahumada [Tue, 30 Oct 2012 11:11:49 +0000 (12:11 +0100)]
Updated submodules.

Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
7 years agoRemove submodules which are not part of Qt 5.0.
Stephen Kelly [Mon, 29 Oct 2012 15:05:29 +0000 (16:05 +0100)]
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>
7 years agoUpdated submodules. master_1351269989
Qt Submodule Update Bot [Fri, 26 Oct 2012 16:34:14 +0000 (18:34 +0200)]
Updated submodules.

Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoMinor WebKit update to fix 64-bit Windows build master_1351174208
Simon Hausmann [Thu, 25 Oct 2012 14:07:38 +0000 (16:07 +0200)]
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>
7 years agoAdd prepare_docs to CONFIG as preparation to two-pass doc builds newdocs
Tor Arne Vestbø [Tue, 23 Oct 2012 09:49:48 +0000 (11:49 +0200)]
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>
7 years agoUpdated submodules. master_1351158156
Qt Submodule Update Bot [Thu, 25 Oct 2012 09:33:56 +0000 (12:33 +0300)]
Updated submodules.

Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoSingle update of QtWebKit/QtQuick1 module to include WebKitWidgets changes master_1350956997
Simon Hausmann [Mon, 22 Oct 2012 08:15:32 +0000 (10:15 +0200)]
Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changes

Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_1350668381
Qt Submodule Update Bot [Fri, 19 Oct 2012 17:33:48 +0000 (20:33 +0300)]
Updated submodules.

Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoTweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'
Tor Arne Vestbø [Fri, 19 Oct 2012 11:29:23 +0000 (13:29 +0200)]
Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'

Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_1350307284
Qt Submodule Update Bot [Mon, 15 Oct 2012 12:57:52 +0000 (22:57 +1000)]
Updated submodules.

Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1350263313
Qt Submodule Update Bot [Sun, 14 Oct 2012 20:54:57 +0000 (06:54 +1000)]
Updated submodules.

Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_1350195175
Qt Submodule Update Bot [Sun, 14 Oct 2012 04:54:21 +0000 (14:54 +1000)]
Updated submodules.

Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_1350167025
Qt Submodule Update Bot [Sat, 13 Oct 2012 20:54:46 +0000 (06:54 +1000)]
Updated submodules.

Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_201210030520
Qt Submodule Update Bot [Tue, 2 Oct 2012 19:08:29 +0000 (05:08 +1000)]
Updated submodules.

Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_201210021012
Qt Submodule Update Bot [Mon, 1 Oct 2012 18:58:53 +0000 (04:58 +1000)]
Updated submodules.

Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_201210012259
Qt Submodule Update Bot [Mon, 1 Oct 2012 10:59:45 +0000 (20:59 +1000)]
Updated submodules.

Change-Id: I008fb07a0f735a1416e6594737505becc671de39
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_201209301043
Qt Submodule Update Bot [Sat, 29 Sep 2012 18:48:03 +0000 (04:48 +1000)]
Updated submodules.

Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_201209291623
Qt Submodule Update Bot [Sat, 29 Sep 2012 02:47:39 +0000 (12:47 +1000)]
Updated submodules.

Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoRevert "Check for a non-error, non-continue case." master_201209290226
Jonathan Liu [Sun, 23 Sep 2012 04:51:37 +0000 (14:51 +1000)]
Revert "Check for a non-error, non-continue case."

This reverts commit 6bd52260c811d7ad9eb74bde0db02f178bd40b47.
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>
7 years agoUpdated submodules. master_201209282108
Qt Submodule Update Bot [Fri, 28 Sep 2012 10:56:45 +0000 (20:56 +1000)]
Updated submodules.

Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. master_201209280510
Qt Submodule Update Bot [Thu, 27 Sep 2012 18:57:05 +0000 (04:57 +1000)]
Updated submodules.

Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoIntroduce dependency: QtQuick1 needs QtWebKit master_201209262337
Simon Hausmann [Tue, 25 Sep 2012 08:55:33 +0000 (10:55 +0200)]
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>
7 years agoWebKit update for MinGW build fix master_201209260500
Simon Hausmann [Tue, 25 Sep 2012 11:05:08 +0000 (13:05 +0200)]
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>
7 years agoChange copyrights from Nokia to Digia master_201209252238
Iikka Eklund [Thu, 20 Sep 2012 06:14:12 +0000 (09:14 +0300)]
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>
7 years agoUpdated submodules. master_201209250455
Qt Submodule Update Bot [Mon, 24 Sep 2012 18:47:26 +0000 (04:47 +1000)]
Updated submodules.

Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoNew WebKit snapshot with build fixes for latest qtbase master_201209242116
Simon Hausmann [Mon, 24 Sep 2012 11:10:52 +0000 (13:10 +0200)]
New WebKit snapshot with build fixes for latest qtbase

Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules.
Qt Submodule Update Bot [Mon, 24 Sep 2012 10:54:17 +0000 (20:54 +1000)]
Updated submodules.

Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoWebKit update master_201209220055
Simon Hausmann [Thu, 20 Sep 2012 12:02:45 +0000 (14:02 +0200)]
WebKit update

This should fix the build errors that "looked" like errors from Qt3D
but were triggered through an incorrect QtWebKit module master header file,
as well as the supposed linking errors related to WebKit2.

Also disable the WebKit build if ICU is not available instead of breaking
the build when reaching WebKit.

Change-Id: I109b4152c081250c8950ef62dd7278129b716f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agodon't tell people to add qtbase/bin to PATH
Oswald Buddenhagen [Wed, 19 Sep 2012 06:34:56 +0000 (08:34 +0200)]
don't tell people to add qtbase/bin to PATH

there is no reason whatsoever to do this (any more).

Change-Id: Ib68c60ef137db0d68100f51a4efcaa27dd3c72e3
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agodelete build script
Oswald Buddenhagen [Tue, 18 Sep 2012 19:02:32 +0000 (21:02 +0200)]
delete build script

the modularized build system is now good enough

Change-Id: Idcc3fb2b6d6201ad7ecbb8e91bd257530797762b
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
7 years agoremove traces of webkit build being claimed to be special
Oswald Buddenhagen [Tue, 18 Sep 2012 19:02:02 +0000 (21:02 +0200)]
remove traces of webkit build being claimed to be special

Change-Id: I72a36c7aedf7f364a3bd53755af17b803c532cf2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoremove outdated blurb about shadow builds being 2nd class citizens
Oswald Buddenhagen [Tue, 18 Sep 2012 19:01:11 +0000 (21:01 +0200)]
remove outdated blurb about shadow builds being 2nd class citizens

Change-Id: Iee86330dd182d346673b9b21f408d944709f2ce5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
7 years agoFix path to Qt 5 WebKit mirror for Brisbane
Simon Hausmann [Wed, 19 Sep 2012 11:40:43 +0000 (13:40 +0200)]
Fix path to Qt 5 WebKit mirror for Brisbane

Point to the small module that contains snapshots of WebKit instead of
of to the repo that contains several gigabytes of history.

Change-Id: I96df293c8c6de76ea6e56836a0d6018c25f6bb0a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated qtwebkit-examples-and-demos submodule
Sergio Ahumada [Thu, 20 Sep 2012 09:27:33 +0000 (11:27 +0200)]
Updated qtwebkit-examples-and-demos submodule

Change-Id: I0860a4e43ee3fadb765835d22f51474b40b99c1a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoWebKit update with various build fixes master_201209190437
Simon Hausmann [Tue, 18 Sep 2012 14:23:57 +0000 (16:23 +0200)]
WebKit update with various build fixes

Change-Id: I47639d78003214f3eafc1499ae35408fb39b5df0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agoUpdated submodules. master_201209172154
Qt Submodule Update Bot [Mon, 17 Sep 2012 11:11:21 +0000 (21:11 +1000)]
Updated submodules.

Change-Id: I2e1a8b49f437a68e8be5f44351116aa4d9638994
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
7 years agoUpdated submodules. master_201209160732
Qt Submodule Update Bot [Sat, 15 Sep 2012 12:41:25 +0000 (22:41 +1000)]
Updated submodules.

Change-Id: Ic1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
7 years agoDon't include init-repository and .gitmodules in the package either master_201209150138
Thiago Macieira [Wed, 12 Sep 2012 13:12:59 +0000 (15:12 +0200)]
Don't include init-repository and .gitmodules in the package either

Even though qt5.git will not be packaged either.

Change-Id: I9bc02170dde1262aeb839741722d275bdb9e4b46
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoUpdate WebKit
Simon Hausmann [Fri, 14 Sep 2012 15:27:00 +0000 (17:27 +0200)]
Update WebKit

This updates WebKit to the latest snapshot that enables the build of WebKit2
on Windows and also drastically simplifies the build of WebKit within Qt
to be built the same way as the other modules, i.e. using qmake && make

Change-Id: I6e82e75ae0c3b62aff879f4339fcdce39e7f6954
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
7 years agoUpdated submodules. master_201209130911
Qt Submodule Update Bot [Wed, 12 Sep 2012 19:55:30 +0000 (05:55 +1000)]
Updated submodules.

Change-Id: I34904ca89dbda946e557121ad4f58ac0f9777d9b
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoAdd win_flex to the convenience GNU tools for the WebKit build on Windows master_201209122343
Simon Hausmann [Tue, 11 Sep 2012 09:01:55 +0000 (11:01 +0200)]
Add win_flex to the convenience GNU tools for the WebKit build on Windows

The latest builds of ANGLE in WebKit require a version of flex that is newer
than what GnuWin32 can provide. The only distribution I've found that doesn't
pull in all of CygWin is winflexbison.

This patch adds the binary of it along with a README explaining the purpose
of this gnuwin32 directory altogether.

Change-Id: Ia00fa5d628891c9d4c30586f42274c7c602362ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoAnother WebKit update master_201209121505
Simon Hausmann [Tue, 11 Sep 2012 18:04:12 +0000 (20:04 +0200)]
Another WebKit update

This one should fix the qtquick2 detection and prepare for the removal
of qtwebkit.pri in favour of qmake && make as way of building WebKit

Change-Id: Ie78a4c68c2e58343cf9e2c603e8f126a65a124b3
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
7 years agoWebKit update to catch up with latest source incompatible changes in qtbase master_201209110358
Simon Hausmann [Mon, 10 Sep 2012 17:52:09 +0000 (19:52 +0200)]
WebKit update to catch up with latest source incompatible changes in qtbase

Change-Id: Ic00da49b7947d29582fa76a4b1b375a962f92bc4
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
7 years agoCut some build dependencies master_201209090725
Corentin Jabot [Mon, 30 Jul 2012 09:36:21 +0000 (11:36 +0200)]
Cut some build dependencies

A lot of modules had a hard depency on qtdeclarative
(for extra qml components or qml examples).

Now, these modules can be build without the need of qtdeclarative.
These modules are:
qttools (since 3b9ac2dc08310aa13b121274afea130fa4f7c6f8 )
qtmultimedia (since 02f144ba6f50bb7d404e2808b9bb4fa32a206aea )
qtsystems (since 12408d021af8b9f8e0afad7ae67f389974ed0607 )
qtlocation (since fa404bfb7a83ecb01deb4df16d5ac72a8c5ab066 )
qtsensors ( since 3c069e5e4a720582f37f0b2d053d19632f6ddfe2 )

Also, useless dependencies are cut, and the dependencies declared
in build.dependencis mirror more accurately what is done is qt.pro

Those modifications allow an easier and faster build for people who
do not use qml.

Note that qtdelarative will still be needed to build the tests
of each of the modules listed above

Change-Id: Icf7711c07d041b8ef836f213fadeebb9328877d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoUpdated submodules. master_201209071140
Qt Submodule Update Bot [Thu, 6 Sep 2012 19:48:00 +0000 (05:48 +1000)]
Updated submodules.

Change-Id: I36e84c61a13aa5cf7d40ced02b46879822fc4b6e
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdate the git-archive export options master_201209052240
Thiago Macieira [Wed, 29 Aug 2012 14:11:43 +0000 (16:11 +0200)]
Update the git-archive export options

The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: Ib70cba174211ff75d69ec6ba30b680e0757ab369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoUpdated submodules. master_201209051635
Qt Submodule Update Bot [Wed, 5 Sep 2012 03:36:34 +0000 (13:36 +1000)]
Updated submodules.

Change-Id: Ibd1716005ac279cf0d8416e20aace26025fa503d
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_201209040534
Qt Submodule Update Bot [Mon, 3 Sep 2012 11:32:29 +0000 (21:32 +1000)]
Updated submodules.

Change-Id: Ied65966d5d176f5d354b17a8fa1f50fead14ccaa
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoSplitting up the README files master_201209031639
Christian Strømme [Fri, 24 Aug 2012 15:21:36 +0000 (17:21 +0200)]
Splitting up the README files

Moved git related information over to README.git,
and polished the README file slightly.

Change-Id: I863e2c2ef9c2020964185e96ddb87a05d82c30a6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
7 years agoREADME: Fix "Building Qt 5 from Git" link master_201208312202
Kai Koehne [Fri, 31 Aug 2012 07:10:41 +0000 (09:10 +0200)]
README: Fix "Building Qt 5 from Git" link

Building_Qt_5_from_Git is a redirect to the version with '-' nowadays.

Change-Id: I48e7919c54af4adfb478ea64c93c844b107fbc4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
7 years agoUpdated submodules. master_201208291021
Qt Submodule Update Bot [Tue, 28 Aug 2012 19:23:10 +0000 (05:23 +1000)]
Updated submodules.

Change-Id: I5a109341ca30e1914732304a15c11a04f61d380f
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoFix make install with WebKit master_201208282108 v5.0.0-beta1
Simon Hausmann [Mon, 27 Aug 2012 11:02:18 +0000 (13:02 +0200)]
Fix make install with WebKit

Avoid running "make install" through build-webkit and therefore risk
accidentally rebuilding the lot. We call build-webkit either with --release
or without, but we never pass --debug. Therefore the build directory is
always WebKitBuild/Release.

This is a stop-gap for the Qt 5 beta. After the release we'll get rid of
qtwebkit.pri altogether and WebKit will be built with just qmake and make.

Change-Id: I21ff7ef8420b67cf466d5bca5efd7a1245bf4131
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoUpdated submodules.
Lars Knoll [Mon, 27 Aug 2012 14:31:34 +0000 (16:31 +0200)]
Updated submodules.

Change-Id: I8e407c602cda9c30eda458b0aacb7465787f22c4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoRemove qtjsondb from qt5.git master_201208281632
Lars Knoll [Fri, 24 Aug 2012 18:48:25 +0000 (20:48 +0200)]
Remove qtjsondb from qt5.git

The jsondb module has been ongoing research work. But it won't be done
in time for Qt 5.0, and is currently also less relevant. It's also
currently not being actively worked on. So let's remove it
from the list of modules compiled with qt5.git and keep it as
research.

The module can still be compiled stand-alone on top of the Qt essentials.

Change-Id: I6fd4524cae43b803a842788ff22a7525dc7bc0e6
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
7 years agoDisable WebKit2 for the Qt 5 beta master_201208272019
Simon Hausmann [Mon, 27 Aug 2012 08:48:35 +0000 (10:48 +0200)]
Disable WebKit2 for the Qt 5 beta

Disable all of WebKit2 until https://bugs.webkit.org/show_bug.cgi?id=94914 is fixed.

Change-Id: Iffc11efdba7c2c6ad4fe92437c28c77fd5d5a2bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoUpdated submodules. master_201208270859
Qt Submodule Update Bot [Sun, 26 Aug 2012 19:17:13 +0000 (05:17 +1000)]
Updated submodules.

Change-Id: Id20cb51b5d6b7aa239becf2dda1e49f89c0b5c24
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdate qtbase submodule. master_201208261705
Lars Knoll [Sat, 25 Aug 2012 19:47:43 +0000 (21:47 +0200)]
Update qtbase submodule.

Change-Id: Ifdadb7a8a25c6845cc775aea3f3f4d1af516f2a1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoUpdated submodules. master_201208260124
Qt Submodule Update Bot [Sat, 25 Aug 2012 11:33:09 +0000 (21:33 +1000)]
Updated submodules.

Change-Id: Ic0036e77b2b6700a6f177e4dbf07feec4d6b7167
Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
7 years agoUpdated submodules. master_201208250502
Lars Knoll [Fri, 24 Aug 2012 18:41:01 +0000 (20:41 +0200)]
Updated submodules.

Change-Id: I077d126ef7a7b6490a625c971f72357614aeeb3f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoUpdated submodules. master_201208241352
Qt Submodule Update Bot [Fri, 24 Aug 2012 01:57:18 +0000 (11:57 +1000)]
Updated submodules.

Change-Id: I1fdd777ae919214aac4f3f4951439739eb65644c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
7 years agoUpdated submodules. master_201208240610
Lars Knoll [Thu, 23 Aug 2012 20:04:10 +0000 (22:04 +0200)]
Updated submodules.

Change-Id: I36e3af2d6a1b8727754e705e470f4d541cb110a0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
7 years agoNew WebKit snapshot with various build fixes master_201208240120
Simon Hausmann [Thu, 23 Aug 2012 15:15:27 +0000 (17:15 +0200)]
New WebKit snapshot with various build fixes

Include make install on Windows (prospective), build on OS X 10.6 and
without QML2

Change-Id: I4e0448287af203d6a391c17b73ad1ba45dd7a164
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>