aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* | Updated submodules.Qt Submodule Update Bot2012-11-083-0/+0
| | | | | | | | | | Change-Id: Ie605d1675e403023c9e5e7ec3ba51f6fb42a1a9e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-073-0/+0
| | | | | | | | | | Change-Id: Ia6254526d84f43ad810e364fb3af1837c30f3da1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodulesSergio Ahumada2012-11-074-0/+0
| | | | | | | | | | Change-Id: Ic85275847cf5005ee4e3394c1ceced66ba80895c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Manual update of qtbase from master for qt5.gitSimon Hausmann2012-11-061-0/+0
| | | | | | | | | | Change-Id: I6649832b9a395cda862a032b910ed69479964895 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-061-0/+0
| | | | | | | | | | Change-Id: I01b8ffb28fe160d3b5ac47605a31534366dfd79f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-0512-0/+0
| | | | | | | | | | Change-Id: I2b92b3ea1f9c2f7abd0a2e55513597a5d3b3886f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-11-0112-0/+0
| | | | | | | | | | Change-Id: Ia1f4d9db151183d2ec37a5f9d4bcf0edc21839e6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Sergio Ahumada2012-10-304-0/+0
| | | | | | | | | | Change-Id: Ib672f1a1fa973d87b0c23c881f195ef2b4c6869a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Remove submodules which are not part of Qt 5.0.Stephen Kelly2012-10-3011-99/+1
| | | | | | | | | | | | | | | | 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>
* | Updated submodules.Qt Submodule Update Bot2012-10-268-0/+0
| | | | | | | | | | Change-Id: Ic0772fa7a5f5904ced225960897a512053d23a1b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Minor WebKit update to fix 64-bit Windows buildSimon Hausmann2012-10-251-0/+0
| | | | | | | | | | | | | | | | 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>
* | Updated submodules.Qt Submodule Update Bot2012-10-2519-0/+0
| | | | | | | | | | Change-Id: If81bf2b5ee9af76fd053392d1504dbbbeea3e4e9 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Single update of QtWebKit/QtQuick1 module to include WebKitWidgets changesSimon Hausmann2012-10-232-0/+0
| | | | | | | | | | Change-Id: I6f6f74c68127ee552bfd008c9afd2f61b8305155 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-10-1917-0/+0
| | | | | | | | | | Change-Id: I0e169c8e8b8bc7c129bb1ef40a33c8345a2ca536 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Tweak name of Makefile for QtWebKit to just 'Makefile', not 'Makefile.WebKit'Tor Arne Vestbø2012-10-191-0/+1
| | | | | | | | | | Change-Id: I8399f640d5e5f14b4453a97b543db602859d6278 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-10-155-0/+0
| | | | | | | | | | Change-Id: I34f1dbc74a893db80786a7723c6a90ff2cf7d7b7 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-10-151-0/+0
| | | | | | | | | | Change-Id: I21f9eaf60e83dd3b8376129c1d96bcdad943c4c9 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* | Updated submodules.Qt Submodule Update Bot2012-10-142-0/+0
| | | | | | | | | | Change-Id: Ida8730bf218cde1186e8f8e3307c82b26fed1609 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2012-10-1319-0/+0
|/ | | | | Change-Id: I749b83f337ec82eff305ed8ac85473ad984c84fa Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-10-025-0/+0
| | | | | Change-Id: I508072fb031ffb6beea94c77d41b29bfedf3874f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-10-024-0/+0
| | | | | Change-Id: Icd3a4676c81eb1096b3dbea9129bebf45e527b38 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-10-014-0/+0
| | | | | Change-Id: I008fb07a0f735a1416e6594737505becc671de39 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-09-303-0/+0
| | | | | Change-Id: Id3a55bf0aa240a26cedd2e8415f81849d6d65fc1 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-09-297-0/+0
| | | | | Change-Id: I58acd59fa661739b4bd3a39d85841f7bea61caa8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Revert "Check for a non-error, non-continue case."Jonathan Liu2012-09-281-10/+0
| | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-09-283-0/+0
| | | | | Change-Id: I8f9fcfdcb58075a211d1fb0de2fece6d5cb74dbd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-09-2724-0/+0
| | | | | Change-Id: I4865835418f8faaf3ab7635e07b790bc3b4d9cbd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Introduce dependency: QtQuick1 needs QtWebKitSimon Hausmann2012-09-261-0/+1
| | | | | | | | | | | | 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>
* WebKit update for MinGW build fixSimon Hausmann2012-09-251-0/+0
| | | | | | Change-Id: I5b541d144a91a8bebece62a6f3abd4108848ca39 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-253-73/+73
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-09-246-0/+0
| | | | | Change-Id: Ibf4c64ada0a1afe7bc8fdaf076b076c0e9b40fb0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* New WebKit snapshot with build fixes for latest qtbaseSimon Hausmann2012-09-241-0/+0
| | | | | Change-Id: Id44a58e47a0a715bf65b51c6a8d2e73ebb4a6766 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-09-2426-0/+0
| | | | | Change-Id: I8fbf48fd93fb696b5255f6835872a9e83df5d706 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* WebKit updateSimon Hausmann2012-09-212-4/+9
| | | | | | | | | | | | 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>
* don't tell people to add qtbase/bin to PATHOswald Buddenhagen2012-09-211-2/+0
| | | | | | | | 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>
* delete build scriptOswald Buddenhagen2012-09-213-608/+5
| | | | | | | | | | 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>
* remove traces of webkit build being claimed to be specialOswald Buddenhagen2012-09-212-26/+0
| | | | | | | 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>
* remove outdated blurb about shadow builds being 2nd class citizensOswald Buddenhagen2012-09-211-3/+0
| | | | | | Change-Id: Iee86330dd182d346673b9b21f408d944709f2ce5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>