summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2013-12-1631-0/+0
| | | | | Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-10-166-5/+13
|\
| * Merge branch 'stable' into devSergio Ahumada2013-10-156-5/+13
| |\ | | | | | | | | | Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
| | * Updated submodules.Qt Submodule Update Bot2013-10-1215-0/+0
| | | | | | | | | | | | | | | Change-Id: I7f523a7aa3a00d2190cbe7ca4c52a9a30cb67ea0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Ignore auto-generated file .qmake.superMandeep Sandhu2013-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added rule in .gitignore for .qmake.super. This file is generated when building Qt from the root dir. Task-number: QTBUG-33439 Change-Id: Ic15b10e9c7cb175f2ff102f75d08110acf13a0cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * move changelog entry before the real footersOswald Buddenhagen2013-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the change-id will be added at the end, which will look just plain stupid if the other "real" footers come above the changelog. also, a smart log author would integrate the changelog entry into the flow of the message, so further up in the template is more natural. Change-Id: I053840a81ea62f2e0ad1bd133f2e7a2692a6f2d6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * qt.pro: Fix dependencies for qtconnectivitySergio Ahumada2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the hard dependency on qtsystems and changing it with a hard dependency on qtbase and a optional dependency on qtdeclarative instead. Change-Id: I96a4d3b38df588489e5ff4a704ea1e4fcbdb620c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-10-089-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie937791dcbe07d65728ab2cea1d590ab1eec8922 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Mark qtmultimedia as an optional dependency for qtwinextrasJ-P Nurmi2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QtWinExtras Music Player example uses QtMultimedia. Change-Id: Ib720710a8563d6bfa39aec8b82e9a87517b7e015 Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-10-0720-0/+0
| | | | | | | | | | | | | | | Change-Id: I2f20faa052b66b7e85802368cd42447f09d8e321 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Add new qtandroidextras repositoryv5.2.0-alpha1Sergio Ahumada2013-09-274-0/+6
| | | | | | | | | | | | | | | | | | | | | Also adding it as part of the default modules. Change-Id: I899ba6eec9ba6ab7103ecc6dba5245da16e01a32 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * Add qtmacextras#stable as part of the default modulesSergio Ahumada2013-09-272-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also updating the sha1 to the latest one that has passed the CI already. Change-Id: I88d803a738be59c377ef4c2315a855d2675331d4 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-09-2618-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie39f4e8b4be5da3d549c740ba396576bff7f952d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Merge branch 'dev' into stableSergio Ahumada2013-09-2323-9/+6
| | |\ | | | | | | | | | | | | | | | | Conflicts: qtjsbackend
| | * | Updated submodules.Qt Submodule Update Bot2013-09-1615-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I770893c71b179aa87c1bf2d83318ba62c8c2aa96 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | | Updated submodules.Qt Submodule Update Bot2013-10-158-0/+0
|/ / / | | | | | | | | | | | | Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2013-10-1428-0/+0
| |/ |/| | | | | | | Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Sergio Ahumada2013-09-208-0/+0
| | | | | | | | | | Change-Id: Iaaf1ec8b87ff1558d0cd5025bd4faf39a1b21e77 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Add qtlocation#dev as part of the default modulesSergio Ahumada2013-09-201-0/+1
| | | | | | | | | | Change-Id: I6f684aa4b3a1fbefbaa89d8452035d9e93cd2b04 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Updated qtlocation submoduleSergio Ahumada2013-09-191-0/+0
| | | | | | | | | | Change-Id: I40d980381231ed8a5103200b82570f284915e121 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-09-136-0/+0
| | | | | | | | | | Change-Id: I3840892d83b4c825c0a19a4326f5f392a2352585 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-09-124-45/+32
|\ \
| * \ Merge branch 'stable' into devSergio Ahumada2013-09-114-45/+32
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: qt.pro Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
| | * Updated submodules.Qt Submodule Update Bot2013-08-3115-0/+0
| | | | | | | | | | | | | | | Change-Id: Idd9853b3cb6c7f8d1f015b82a06283b3942bf9bf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Add ChangeLog template.Frederik Gladhorn2013-08-261-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0dfc0180634b630ac1359298f3d251b3d23e0a7 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Add --oslo option to init-repositoryAlex Blasche2013-08-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Oslo devs can use a local git mirror. Change-Id: Id6f919ff65ddf0c0b5839316014f51d2293008fd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Cleanup of init-repositoryAlex Blasche2013-08-201-42/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old Nokia URLs and options associated with Nokia infrastructure Change-Id: Id5a28d7ed14fe069ceff6afbe372aa69dda80475 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-08-0713-0/+0
| | | | | | | | | | | | | | | Change-Id: I35fe76d9c343f98ec55c7cacd8c402e90d91ef38 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Doc: specified how to install documentationNico Vertriest2013-08-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added command "make install_docs" Task-number: QTBUG-32212 Change-Id: Ic5bfd76bf7233565616b8c248ce3ccdeb05f8803 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * qtwinextras: add qtdeclarative as an optional dependencyJ-P Nurmi2013-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | qtwinextras contains optional QML types, so qtdeclarative must be listed as an optional dependency to avoid build breaks. Change-Id: I7d7f3bfca73c6599699a1da9c8795e6ac9ca4a74 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-3021-0/+0
| | | | | | | | | | | | | | | Change-Id: I23c300afd1395538d8702d0f188ca7031fbcf9d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-234-0/+0
| | | | | | | | | | | | | | | Change-Id: I6d1d35416f07bb6dc4e4a43296ff5028e96495a3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-211-0/+0
| | | | | | | | | | | | | | | Change-Id: I6493c3d8137a4659814949f96465d374dbad1781 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-202-0/+0
| | | | | | | | | | | | | | | Change-Id: I7b8a659ecc931702210ad0b10afa8b283f758632 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-209-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic3532a18c95b80d06c1e7d7875698ffc8b816140 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-183-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic57a761615178f0337f1609653798e268c1b7df1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-174-0/+0
| | | | | | | | | | | | | | | Change-Id: I8c4e0a4a952655b623dbff0ddf1a75d4a1d772f2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-136-0/+0
| | | | | | | | | | | | | | | Change-Id: I0b24bc3851237425f0738df422a20ade09095681 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-117-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie16cdebb775c1a7c3f35f7ea68e017c38ce3fd36 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Updated submodules.Qt Submodule Update Bot2013-09-1210-0/+0
|/ / | | | | | | | | Change-Id: Iea9702923e86fc3decadbc831e31b349bd40ac44 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-09-108-0/+0
| | | | | | | | | | Change-Id: I70c2051332bb3404f4a63ec3ddc16e22bde13bd9 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Add qtconnectivity#dev as part of the default modulesSergio Ahumada2013-09-101-0/+1
| | | | | | | | | | Change-Id: I5c3885e411a1e097da7aa161ef678d85fc606191 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-09-0912-0/+0
| | | | | | | | | | Change-Id: I85d30ddaa31fc6067d5741286c056981eec1a7e3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-09-0616-0/+0
| | | | | | | | | | Change-Id: I6ca2fbea871d34e2dcd8f616599c34da7fe6f8dc Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Add qtwinextras#dev as part of the default modulesSergio Ahumada2013-08-291-0/+1
| | | | | | | | | | | | Change-Id: Ic0f6d569576186abdf4f81f3b2f19d6805cba579 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-08-2915-0/+0
| | | | | | | | | | Change-Id: Ib6faaac71302be0c47b9904be5481c4b281e9008 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-08-2113-0/+0
| | | | | | | | | | Change-Id: Ifb2020a44f9cddd7b969e038c611bf7cbadfeac8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | purge qtjsbackendOswald Buddenhagen2013-08-174-6/+0
| | | | | | | | | | | | Change-Id: Ic761324c7b7afdfd509bea1db0d75ba259f8fb94 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-08-1512-0/+0
| | | | | | | | | | Change-Id: Ie3de6338ce0362c3d85ebb06e7b304521b27a1bd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-08-1310-0/+0
| | | | | | | | | | Change-Id: Iad241de71b1302fedbe37c20fad2da71632ec46f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>