summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2013-06-1630-0/+0
| | | | | Change-Id: I3a55bb51ac59f7e66b8a75f574e494a8da0a2754 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Sergio Ahumada2013-05-297-0/+0
| | | | | | | | | | | | | | | This manually updates qt3d qtconnectivity qtdocgallery qtfeedback qtjsondb qtpim qtsystems Change-Id: I9e496ae3c108aa11bb9806d925200e0c5beac16b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update submodule qtlocation, to fix compilation errorDavid Faure2013-05-281-0/+0
| | | | | | | (module version wasn't set) Change-Id: I16ce30bf97b8e3e6613ac73fe0f3d5e7d8358ca7 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2013-05-272-0/+0
| | | | | Change-Id: If9fc16a5b48771a056b8156e6ebeb5a17ac09a45 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2013-05-272-0/+0
| | | | | Change-Id: Ifbd69b7602a9b8fd114d9c20583adc47fad27124 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Qt Submodule Update Bot2013-05-269-0/+0
| | | | | Change-Id: Ib25fcb31a7e0b315ea7090e2d4c45fd684313439 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated submodules.Sergio Ahumada2013-05-2512-0/+0
| | | | | Change-Id: I80c8ed3c219e7e3526eb0c134b01ce2a0c2d8b26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge branch 'stable' into devOswald Buddenhagen2013-05-0218-147/+169
|\ | | | | | | | | | | | | | | | | | | | | | | the sha1s of existing modules were skipped (the update bot will handle them as usual). all newly appeared modules got their sha1s forward-merged. Conflicts: .gitmodules qt.pro <plenty of submodules> Change-Id: I724998c2011f274c3aea5996a7fdbe303d246551
| * 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-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>