aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Updated submodules.Qt Submodule Update Bot2013-11-019-0/+0
| | | | | | | | | | Change-Id: I08e6aa58fbddc3b18407593ef1fd6886b20370a0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-10-318-0/+0
| | | | | | | | | | Change-Id: I8b4022260b5b1d1016979086d0fe7eeba44f8883 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-10-3118-0/+0
| | | | | | | | | | Change-Id: Ic1160960655acf260a4ab47d9caea3b271a09bf6 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Refine qt-module dependencies for massively parallel buildsAllan Sandfeld Jensen2013-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | QtWebKit should be build after QtMultimedia for multimedia support on Mac and Windows. QtScript should be build after QtTools because an example uses UiTools. Change-Id: Id92efac72d8c2c2237f21fad1ab823c1c1ac95dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Updated submodules.v5.2.0-beta1Qt Submodule Update Bot2013-10-2211-0/+0
| | | | | | | | | | Change-Id: I7e2e8cad6636584f1d3fc9d213363e5fc6243ef2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-10-169-0/+0
| | | | | | | | | | Change-Id: Icb2d850b479fed9fed3c4a9fea698f924be942ef Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Updated submodules.Qt Submodule Update Bot2013-10-1510-0/+0
| | | | | | | | | | Change-Id: If9a5d1941655bd5cceaa7ded5893fea3206c5bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | 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.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-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>
| * | | Remove qtjsbackend as dependency for qtdeclarativeSimon Hausmann2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first step. The next step is to remove it from qtdeclarative's sync.profile after this integrates. Change-Id: Ice1424f3d01d8eb4082200900498bbb19392492b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-08-1232-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I51c0a11ff3a3914cac1baf2a4fa6ef826089860f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-2910-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id06469a62635d263631c308ffa2d16a794a6b75f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-242-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I292fa5832ffb6890479a220ee07c7020f313537c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-2411-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If5e182de18267e8d54919b7e20d650582ff3f467 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-211-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0927a9a0f8b0cedac8027eec865d3e2118078054 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-199-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If350c3bb5172d5de13a162e9e5ba2720eb890c14 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Updated submodules.Qt Submodule Update Bot2013-07-143-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia289ec8a0390ff4c0b957cd7f4d7c8cd726e2d1d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-07-147-17/+14
| |\ \ \
| | * \ \ Merge branch 'stable' into devSergio Ahumada2013-07-119-17/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtbase qtdeclarative qtdoc qtgraphicaleffects qtjsbackend qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtxmlpatterns Change-Id: I5ca751a71375fba0c154db187e89bac6f3fa7ad1
| * | | | | Updated submodules.Qt Submodule Update Bot2013-07-1327-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | Merge branch 'stable' into devSergio Ahumada2013-06-2410-57/+2354
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtbase qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtjsbackend qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtx11extras qtxmlpatterns Change-Id: Ie3f5321de50ec76a7b3f5a0e2d2be1835abce527
| * | | | | Updated submodules.Qt Submodule Update Bot2013-06-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7124fb036a5cdbc24eb8f818493deb2d13d1fe2d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | | Updated submodules.Qt Submodule Update Bot2013-06-2111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If828e05a91be62763bb1872ba828f71012c96b06 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | | Remove JsonDB from QtSystems and QtLocation dependency listAlex Blasche2013-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no optional jsondb build anymore Change-Id: I902464dec14555794e80dde9eb81ca2dad2baeda Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 02:31:53 +0000