mirror/qt/qt5.git
7 years agoskip modules whose mandatory dependencies are missing stable_1366308582
Oswald Buddenhagen [Wed, 17 Apr 2013 09:25:38 +0000 (11:25 +0200)]
skip modules whose mandatory dependencies are missing

so that for example "-skip webkit" will also skip qtwebkit-examples.

Task-number: QTBUG-30307
Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
7 years agoUpdated submodules. stable_1366281907
Qt Submodule Update Bot [Thu, 18 Apr 2013 08:38:21 +0000 (11:38 +0300)]
Updated submodules.

Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366216827
Qt Submodule Update Bot [Wed, 17 Apr 2013 16:38:24 +0000 (19:38 +0300)]
Updated submodules.

Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1366200346
Qt Submodule Update Bot [Wed, 17 Apr 2013 08:41:01 +0000 (11:41 +0300)]
Updated submodules.

Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1365181747
Qt Submodule Update Bot [Fri, 5 Apr 2013 16:36:14 +0000 (19:36 +0300)]
Updated submodules.

Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd new modules (qtquickcontrols, qtserialport and qtx11extras) stable_1365089245 v5.1.0-alpha1
Sergio Ahumada [Thu, 4 Apr 2013 05:37:42 +0000 (07:37 +0200)]
Add new modules (qtquickcontrols, qtserialport and qtx11extras)

Also adding qtsensors as part of the default modules and updating
its sha1.

Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da
Reviewed-by: David Faure (KDE) <faure@kde.org>
7 years agore-add a bunch of modules stable_1365014934
Oswald Buddenhagen [Mon, 3 Dec 2012 13:07:32 +0000 (14:07 +0100)]
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
41c3f2cb5f633f0e540482ca01b2c2caa2475e57,
725a51b1d83626e16989804707356baa909c339f and
1117d4da2caf1989f63ca0a8073a799df80428bc.

Change-Id: Iabc750642fc1c163f3ebc96cf6edaa9b04378094
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoclone only a specific subset of repositories by default
Oswald Buddenhagen [Fri, 2 Nov 2012 19:59:30 +0000 (20:59 +0100)]
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>
7 years agoUpdated submodules. stable_1364398466
Qt Submodule Update Bot [Wed, 27 Mar 2013 14:51:02 +0000 (16:51 +0200)]
Updated submodules.

Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1361990777
Qt Submodule Update Bot [Wed, 27 Feb 2013 17:36:29 +0000 (19:36 +0200)]
Updated submodules.

Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9
Reviewed-by: Liang Qi <liang.qi@digia.com>
7 years agoREADME: Update with the reference platforms and remove the mingw entry stable_1361582189
Laszlo Papp [Fri, 22 Feb 2013 07:51:57 +0000 (07:51 +0000)]
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>
7 years agomake it possible to explicitly exclude particular modules stable_1361399706
Oswald Buddenhagen [Wed, 20 Feb 2013 09:36:36 +0000 (10:36 +0100)]
make it possible to explicitly exclude particular modules

Task-number: QTBUG-26697
Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
7 years agosemi-automate adding submodules
Oswald Buddenhagen [Wed, 20 Feb 2013 09:33:49 +0000 (10:33 +0100)]
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>
7 years agodon't make webkit build conditional on ICU
Oswald Buddenhagen [Wed, 20 Feb 2013 09:39:57 +0000 (10:39 +0100)]
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>
7 years agoUpdated submodules. stable_1358854567
Qt Submodule Update Bot [Tue, 22 Jan 2013 01:41:21 +0000 (03:41 +0200)]
Updated submodules.

Change-Id: Id7ca18632a1fe4ef542e131aafd3ebb9e854b363
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1358360171
Qt Submodule Update Bot [Wed, 16 Jan 2013 17:40:28 +0000 (19:40 +0200)]
Updated submodules.

Change-Id: I9e7460525d8ca86a4578e602d7ce8f71c103ecb3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1358186275
Qt Submodule Update Bot [Mon, 14 Jan 2013 17:34:53 +0000 (19:34 +0200)]
Updated submodules.

Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoAdd ruby to the list of new dependencies for Qt 5 on Windows stable_1358091412
Jan Arve Saether [Thu, 13 Dec 2012 11:19:56 +0000 (12:19 +0100)]
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>
7 years agoUpdated submodules. stable_1358067285
Qt Submodule Update Bot [Sat, 12 Jan 2013 01:40:20 +0000 (03:40 +0200)]
Updated submodules.

Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdate win_flex.exe from sourceforge release_1355911897
David Faure [Tue, 18 Dec 2012 16:26:55 +0000 (11:26 -0500)]
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>
7 years agoUpdated submodules. stable_1355345694
Sergio Ahumada [Wed, 12 Dec 2012 20:49:27 +0000 (21:49 +0100)]
Updated submodules.

Change-Id: Ifd3ee8634a28f7e769ac6b59c4b7738091210c39
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1355325092
Sergio Ahumada [Wed, 12 Dec 2012 15:08:35 +0000 (16:08 +0100)]
Updated submodules.

Change-Id: I56e6962ad7de00811c1d45484666b86829e75600
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1355175968
Sergio Ahumada [Mon, 10 Dec 2012 21:32:46 +0000 (22:32 +0100)]
Updated submodules.

Change-Id: Ie653efe17d14880969d4089e0cdf89ea5b3825a1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1355151933
Sergio Ahumada [Mon, 10 Dec 2012 14:30:14 +0000 (15:30 +0100)]
Updated submodules.

Change-Id: If0efc5c5cc5c3942409a347e826b60108bfea1cc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1354795638
Sergio Ahumada [Thu, 6 Dec 2012 12:04:26 +0000 (13:04 +0100)]
Updated submodules.

Change-Id: I238c0f5ce080825f5d82a883c0b39d0cf04ea720
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules. stable_1354777143
Sergio Ahumada [Thu, 6 Dec 2012 06:11:50 +0000 (07:11 +0100)]
Updated submodules.

Change-Id: I8d77ff1ef2422259dd6baed5cae9815260e5bee2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules (stable) stable_1354632930
Sergio Ahumada [Tue, 4 Dec 2012 10:54:27 +0000 (11:54 +0100)]
Updated submodules (stable)

Change-Id: I5a3bcda566072f6c78968eecafdfd904f7986fc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years ago(re-)add top-level 'check' target
Oswald Buddenhagen [Tue, 4 Dec 2012 14:01:52 +0000 (15:01 +0100)]
(re-)add top-level 'check' target

Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
7 years agoUpdated submodules (stable) stable_1354456081
Sergio Ahumada [Sat, 1 Dec 2012 20:18:17 +0000 (21:18 +0100)]
Updated submodules (stable)

Change-Id: Ibf84cdee0f17a0d295a34fcb3b2b4155fb16face
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>