aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2013-04-122-0/+0
| | | | | Change-Id: Iec1a2c155705e9448566b9c543384a6e422e26fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2013-04-1219-0/+0
| | | | | Change-Id: Icd769b2d31fb4f3703352b01316ba3c697a579cd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-203-4/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Updated submodules.Qt Submodule Update Bot2013-01-228-0/+0
| | | | | | | | | | Change-Id: Id7ca18632a1fe4ef542e131aafd3ebb9e854b363 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-01-169-0/+0
| | | | | | | | | | Change-Id: I9e7460525d8ca86a4578e602d7ce8f71c103ecb3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-01-148-0/+0
| | | | | | | | | | Change-Id: Id2b2b92d49eae167d99879306523ab1e9ccde7cb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Add ruby to the list of new dependencies for Qt 5 on WindowsJan Arve Saether2013-01-131-3/+5
| | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2013-01-1318-0/+0
| | | | | | | | | | Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Update win_flex.exe from sourceforgeDavid Faure2012-12-191-0/+0
| | | | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Sergio Ahumada2012-12-127-0/+0
| | | | | | | | | | Change-Id: Ifd3ee8634a28f7e769ac6b59c4b7738091210c39 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Sergio Ahumada2012-12-1212-0/+0
| | | | | | | | | | Change-Id: I56e6962ad7de00811c1d45484666b86829e75600 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Sergio Ahumada2012-12-1011-0/+0
| | | | | | | | | | Change-Id: Ie653efe17d14880969d4089e0cdf89ea5b3825a1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Sergio Ahumada2012-12-1014-0/+0
| | | | | | | | | | Change-Id: If0efc5c5cc5c3942409a347e826b60108bfea1cc Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Sergio Ahumada2012-12-066-0/+0
| | | | | | | | | | Change-Id: I238c0f5ce080825f5d82a883c0b39d0cf04ea720 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Sergio Ahumada2012-12-0617-0/+0
| | | | | | | | | | Change-Id: I8d77ff1ef2422259dd6baed5cae9815260e5bee2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules (stable)Sergio Ahumada2012-12-0411-0/+0
| | | | | | | | | | Change-Id: I5a3bcda566072f6c78968eecafdfd904f7986fc0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * (re-)add top-level 'check' targetOswald Buddenhagen2012-12-041-1/+1
| | | | | | | | | | Change-Id: I61316db0575bccf168525c7ff9230f675e7db78c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules (stable)Sergio Ahumada2012-12-0210-0/+0
| | | | | | | | | | Change-Id: Ibf84cdee0f17a0d295a34fcb3b2b4155fb16face Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Add module qtx11extras to qt5.gitDavid Faure2013-02-084-0/+9
| | | | | | | | | | | | | | 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>
* | Updated submodules.Qt Submodule Update Bot2013-01-3113-0/+0
| | | | | | | | | | Change-Id: I6207f23126d98141aefe4523cc785ca88fb6d0ff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-256-0/+0
| | | | | | | | | | Change-Id: I6ff7fbc6859f27ffebb0289fed485ed13d2aef79 Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Updated submodules.Qt Submodule Update Bot2013-01-213-0/+0
| | | | | | | | | | Change-Id: I713cc7fcc2e6d636117200f7df4a845af4ec06e9 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-1817-0/+0
| | | | | | | | | | Change-Id: I79f9d60b77248a97d6ec999566d3aa8ce7058926 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-0118-0/+0
|/ | | | | Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* remove special handling of qtwebkitOswald Buddenhagen2012-11-302-23/+6
| | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-11-3012-0/+0
| | | | | Change-Id: I5e8c47946af5049d4e66fab451941b2e0dbb6100 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* re-instate a top-level docs targetOswald Buddenhagen2012-11-301-1/+1
| | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-11-2912-0/+0
| | | | | Change-Id: Ic18c2a76ef0fb08f53052b2c7ecea1004cfe508e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-11-2813-0/+0
| | | | | Change-Id: Ia41ce6cb4f8b4210b01677e524026a91935ab99e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-11-278-0/+0
| | | | | Change-Id: I97d477d4ffa52107e5fb35ad50a9f09197b71bef Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-11-2610-0/+0
| | | | | Change-Id: I471842d8f4cd096ce426723dac19c293421ae61a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* WebKit updateSimon Hausmann2012-11-231-0/+0
| | | | | | | A new snapshot bringing in new bug fixes :) Change-Id: Ia15c388a3f9190102c8de41aec53911c493830e5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Sergio Ahumada2012-11-228-0/+0
| | | | | Change-Id: Ia5e0c2d4327fee6c375dc515b8150cce9679b7e3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix parallel builds in WebKitJoerg Bornemann2012-11-222-0/+47
| | | | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-11-219-0/+0
| | | | | Change-Id: Ib335981ca0a5a59be4bd6ac26dff44621b915ae3 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-11-2112-0/+0
| | | | | Change-Id: Ib1c03b44976747909ffd3236385ba1e8b14a5ef9 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Merge remote-tracking branch 'gerrit/newdocs' into HEADSamuel Rødal2012-11-201-0/+2
|\ | | | | | | Change-Id: I1eeb68710f8129660f8d83dae924b23eda1401a5
| * Add prepare_docs to CONFIG as preparation to two-pass doc buildsTor Arne Vestbø2012-10-251-0/+2
| | | | | | | | | | | | | | Won't have any effect until the corresponding patch lands in qtbase. Change-Id: I807ca48d3e2ab671f0d56eea27f72455304d367b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-206-0/+0
| | | | | | | | | | Change-Id: Ia9e3e72b2ee5ede0ca3ea04912d437230861d8c5 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-171-0/+0
| | | | | | | | | | Change-Id: Ib9f3ea418aaac3bccbb3c0086da96315c10d3cc2 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-174-0/+0
| | | | | | | | | | Change-Id: I766ed506501759259b123a11e66bcf52fc2ef123 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-141-0/+0
| | | | | | | | | | Change-Id: I0f161019779eb76fd26d5119a9ea6b1601862fcf Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-146-0/+0
| | | | | | | | | | Change-Id: I2ad41f3ba71831b1a2634a616f7985de27af89cf Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | brisbane is no moreOswald Buddenhagen2012-11-141-20/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | fix argument quoting when invoking "proper" configureOswald Buddenhagen2012-11-141-5/+3
| | | | | | | | | | Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-123-0/+0
| | | | | | | | | | Change-Id: I371ae019fce042b40715196f7744cea1c525dbf6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-111-0/+0
| | | | | | | | | | Change-Id: Icb530cbe807c4d973493034072e4a09988f3a676 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-101-0/+0
| | | | | | | | | | Change-Id: I8dfa5d43e1347ae5a884310145cb9b0c838bc42a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-106-0/+0
| | | | | | | | | | Change-Id: I4ec68bcba5d8e93510407100220b8d5d54caae94 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-094-0/+0
| | | | | | | | | | Change-Id: I7319eb06fd842b08a53e357b2ffe9a8af8569312 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>