aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add license files mandated by (L)GPL.Sergio Ahumada2013-05-305-0/+2288
| | | | | Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Updated submodules.Qt Submodule Update Bot2013-05-297-0/+0
| | | | | Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Sergio Ahumada2013-05-2821-0/+0
| | | | | Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Merge branch 'stable' into releaseSergio Ahumada2013-05-2321-144/+177
|\ | | | | | | | | | | | | | | Conflicts: README qtwebkit-examples-and-demos Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
| * Updated submodules.Qt Submodule Update Bot2013-05-233-0/+0
| | | | | | | | | | Change-Id: I38dc5b49f6ba2b0c7053856ee815d58d7e2decd2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-05-2218-0/+0
| | | | | | | | | | Change-Id: Ie78aad71e6d584fc4b8f0a831ed74370d85201ba Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated qtquickcontrols submodule.v5.1.0-beta1Sergio Ahumada2013-05-111-0/+0
| | | | | | | | | | Change-Id: If52b3428957e1e4ce8163696eb818f5cac1c4d3a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-05-0916-0/+0
| | | | | | | | | | Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * use relative submodule specsOswald Buddenhagen2013-05-011-32/+32
| | | | | | | | | | | | | | | | | | | | this saves various trouble. this syntax is supported since git 1.7.0. Change-Id: I5bbc31c2ba01e7ec0129bf45b9f704c380bf11a3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * renamed qtwebkit-examples-and-demos => qtwebkit-examplesOswald Buddenhagen2013-05-014-7/+7
| | | | | | | | | | | | Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-2917-0/+0
| | | | | | | | | | Change-Id: I18aaac18064518a3bf03ac624ff0295817fc9418 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-214-0/+0
| | | | | | | | | | Change-Id: I09c3d8537e5dc8a7457cd7d7a0b284a0acf51069 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-209-0/+0
| | | | | | | | | | Change-Id: Icfbfb612338958b30f0abe2d00c919de693f10c9 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * skip modules whose mandatory dependencies are missingOswald Buddenhagen2013-04-181-2/+6
| | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2013-04-184-0/+0
| | | | | | | | | | Change-Id: I6d08e322c7e5f8d32b4a951e47b4288c2654c64c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-177-0/+0
| | | | | | | | | | Change-Id: Ifced9b8199a57c0e29fc2029a5705d01f023f673 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-1719-0/+0
| | | | | | | | | | Change-Id: I3e26038d5c8cf10900e30dee4b3780ea2dce5f68 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-04-0517-0/+0
| | | | | | | | | | Change-Id: I2f8a096c9cf722978f7995097fd2807445898f58 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Add new modules (qtquickcontrols, qtserialport and qtx11extras)v5.1.0-alpha1Sergio Ahumada2013-04-047-0/+19
| | | | | | | | | | | | | | | | Also adding qtsensors as part of the default modules and updating its sha1. Change-Id: I39f89f2d26725575d791d185aa452bc1f420a8da Reviewed-by: David Faure (KDE) <faure@kde.org>
| * re-add a bunch of modulesOswald Buddenhagen2013-04-0314-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * clone only a specific subset of repositories by defaultOswald Buddenhagen2013-04-031-2/+27
| | | | | | | | | | | | | | | | | | 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>
| * Updated submodules.Qt Submodule Update Bot2013-03-2718-0/+0
| | | | | | | | | | Change-Id: Id3d46ac7b315145cfce399450e5f99a2c16dd41b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Updated submodules.Qt Submodule Update Bot2013-02-2718-0/+0
| | | | | | | | | | Change-Id: I3d960ec9a9f11da295f603ca6fbfe80ee3681ae9 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * README: Update with the reference platforms and remove the mingw entryLaszlo Papp2013-02-231-3/+1
| | | | | | | | | | | | Change-Id: I1e43a52dc31c1103c91f61e423c6850697bc3540 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * make it possible to explicitly exclude particular modulesOswald Buddenhagen2013-02-201-2/+4
| | | | | | | | | | | | Task-number: QTBUG-26697 Change-Id: Id3f091be5803d922e129e6c3b5d9dfcdd297d18f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * semi-automate adding submodulesOswald Buddenhagen2013-02-201-109/+50
| | | | | | | | | | | | | | this way adding a module actually becomes a one-liner Change-Id: Ie31039d36e948094c3ec241758eaab330304b194 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * don't make webkit build conditional on ICUOswald Buddenhagen2013-02-201-9/+5
| | | | | | | | | | | | | | webkit now contains its own configure magic to disable itself. Change-Id: Ibb962fac8ea6275400879c15f24d21f0f8dee855 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * 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>
* | Updated submodules.Qt Submodule Update Bot2013-04-093-0/+0
| | | | | | | | | | Change-Id: If618a97229d55cf58fb668fbeaa4a7b0b47f3b14 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-04-043-0/+0
| | | | | | | | | | Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-307-0/+0
| | | | | | | | | | Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-261-0/+0
| | | | | | | | | | Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-253-0/+0
| | | | | | | | | | Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-257-0/+0
| | | | | | | | | | Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-2215-0/+0
| | | | | | | | | | Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-194-0/+0
| | | | | | | | | | Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-03-0518-0/+0
| | | | | | | | | | Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-302-0/+0
| | | | | | | | | | Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-287-0/+0
| | | | | | | | | | Change-Id: I347949e258d3c75ad506aefa2a28712266007c15 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-271-0/+0
| | | | | | | | | | Change-Id: I79193d2b4d9b58e1b4928857156e1523ea970b74 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-263-0/+0
| | | | | | | | | | Change-Id: I2f43917c1d4b3648615c52d4fe012d44561e5d0c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: Added information about the documentation in qt5/README file.Jerome Pasion2013-01-251-0/+19
| | | | | | | | | | | | | | | | | | -added basic information and links to wiki and qtbase/doc/README file. Task-number: QTBUG-29057 Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-2512-0/+0
| | | | | | | | | | Change-Id: I371d08eb4a1e748e042c09a872af9bcb6e03b405 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-225-0/+0
| | | | | | | | | | Change-Id: I319b198bbf22c551bc05a308211cb1666f520d89 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-191-0/+0
| | | | | | | | | | Change-Id: I3f1cc2e9387ac936ad9d02cff409798da9cd9835 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-01-172-0/+0
| | | | | | | | | | Change-Id: Ia0270c339333b78457e2397709353c86483ce8ae Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>