summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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-111-0/+0
| | | | | | | | | | | | | | | Change-Id: I8e11fdb9392d8fcff7b1b1b2673891ea77d6cf0e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-109-0/+0
| | | | | | | | | | | | | | | Change-Id: I9b68559f3cc82db32e93d4040fa2b17f8315397b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * leave makefile generation to the real configureOswald Buddenhagen2013-07-102-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call it with the "secret" -top-level option, which shifts the makefile generation one level up. this makes the configure call the last thing we do, thus also avoiding the problems we had with the -help switch (and the previous attempts at fixing it). Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-0910-0/+0
| | | | | | | | | | | | | | | Change-Id: I20ecf7efa58302efc96b80a1da136a19e4946f4b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-0512-0/+0
| | | | | | | | | | | | | | | Change-Id: I5ae49dac5a57f3a691713781a7f5390a44d6c8ec Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-07-027-0/+0
| | | | | | | | | | | | | | | Change-Id: I0e9f726baf60c4af7caa2ef403f087cb915b420b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-06-2912-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie9b62c8c6914428014c30be7e3cf0889372ee0b6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Add qtmacextras and qtwinextras to qt5.git#stableSergio Ahumada2013-06-265-0/+10
| | | | | | | | | | | | | | | Change-Id: I440e8ad733feaadb07e74fb91342434f66bae160 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | 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