summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix path to Qt 5 WebKit mirror for BrisbaneSimon Hausmann2012-09-211-1/+1
| | | | | | | | 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>
* Updated qtwebkit-examples-and-demos submoduleSergio Ahumada2012-09-211-0/+0
| | | | | Change-Id: I0860a4e43ee3fadb765835d22f51474b40b99c1a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* WebKit update with various build fixesSimon Hausmann2012-09-181-0/+0
| | | | | Change-Id: I47639d78003214f3eafc1499ae35408fb39b5df0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Updated submodules.Qt Submodule Update Bot2012-09-173-0/+0
| | | | | Change-Id: I2e1a8b49f437a68e8be5f44351116aa4d9638994 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-09-1512-0/+0
| | | | | | Change-Id: Ic1a3e0c2f2b9ecb16299a2e6d1f757e0c66fd1e7 Reviewed-by: Toby Tomkins <tjtomkins@gmail.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Don't include init-repository and .gitmodules in the package eitherThiago Macieira2012-09-141-0/+2
| | | | | | | | | 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>
* Update WebKitSimon Hausmann2012-09-144-116/+2
| | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-09-1319-0/+0
| | | | | Change-Id: I34904ca89dbda946e557121ad4f58ac0f9777d9b Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Add win_flex to the convenience GNU tools for the WebKit build on WindowsSimon Hausmann2012-09-122-0/+9
| | | | | | | | | | | | | 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>
* Another WebKit updateSimon Hausmann2012-09-121-0/+0
| | | | | | | | 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>
* WebKit update to catch up with latest source incompatible changes in qtbaseSimon Hausmann2012-09-101-0/+0
| | | | | Change-Id: Ic00da49b7947d29582fa76a4b1b375a962f92bc4 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Cut some build dependenciesCorentin Jabot2012-09-082-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-09-078-0/+0
| | | | | Change-Id: I36e84c61a13aa5cf7d40ced02b46879822fc4b6e Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Update the git-archive export optionsThiago Macieira2012-09-052-0/+5
| | | | | | | | | | | | | | 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>
* Updated submodules.Qt Submodule Update Bot2012-09-0521-0/+0
| | | | | Change-Id: Ibd1716005ac279cf0d8416e20aace26025fa503d Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Updated submodules.Qt Submodule Update Bot2012-09-0314-0/+0
| | | | | Change-Id: Ied65966d5d176f5d354b17a8fa1f50fead14ccaa Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Splitting up the README filesChristian Strømme2012-09-032-45/+78
| | | | | | | | 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>
* README: Fix "Building Qt 5 from Git" linkKai Koehne2012-08-311-1/+1
| | | | | | | Building_Qt_5_from_Git is a redirect to the version with '-' nowadays. Change-Id: I48e7919c54af4adfb478ea64c93c844b107fbc4e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Updated submodules.Qt Submodule Update Bot2012-08-292-0/+0
| | | | | Change-Id: I5a109341ca30e1914732304a15c11a04f61d380f Reviewed-by: Toby Tomkins <tjtomkins@gmail.com>
* Fix make install with WebKitv5.0.0-beta1Simon Hausmann2012-08-281-7/+1
| | | | | | | | | | | | | | 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>
* Updated submodules.Lars Knoll2012-08-2810-0/+0
| | | | | Change-Id: I8e407c602cda9c30eda458b0aacb7465787f22c4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove qtjsondb from qt5.gitLars Knoll2012-08-285-19/+3
| | | | | | | | | | | | | | 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>
* Disable WebKit2 for the Qt 5 betaSimon Hausmann2012-08-271-1/+2
| | | | | | | 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>