aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2014-02-1014-0/+0
| | | | | Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devFriedemann Kleint2014-02-065-6/+13
|\
| * Merge branch 'stable' into devFrederik Gladhorn2014-01-295-6/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtandroidextras qtbase qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwinextras qtx11extras qtxmlpatterns Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
| | * don't unnecessarily confuse qt creatorOswald Buddenhagen2014-01-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our CONFIG+=build_pass hack has the side effect that qmake does not emit the calling command line to the makefile, which makes creator unable to detect the build. so revert the hack as soon as it did its deed. Task-number: QTBUG-34788 Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-204-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-206-0/+0
| | | | | | | | | | | | | | | Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-1725-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-107-0/+0
| | | | | | | | | | | | | | | Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd Reviewed-by: Matti Paaso <matti.paaso@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-0911-0/+0
| | | | | | | | | | | | | | | Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2014-01-0210-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-12-208-0/+0
| | | | | | | | | | | | | | | Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-12-1626-0/+0
| | | | | | | | | | | | | | | Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * try to make the ChangeLog template more invitingOswald Buddenhagen2013-11-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move it even futher up and encourage integrating it into the rest of the commit message. Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829 Reviewed-by: Sergio Ahumada <sahumada@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Updated submodules.Qt Submodule Update Bot2013-11-1021-0/+0
| | | | | | | | | | | | | | | Change-Id: I749bc264b23ead54af325301479320766afce090 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-11-066-0/+0
| | | | | | | | | | | | | | | Change-Id: I234dcbfcba1e934b05ed0da921f69700ca480ddf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-11-055-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib742f171c913b182d699270890599e3628d5df10 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-11-049-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibabbfd7ae348a5b96999eb09820c1abe7094bcf6 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-11-048-0/+0
| | | | | | | | | | | | | | | Change-Id: I5987a236d059243d05d411cdc9f0193448a006ab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
| | * Add qtenginio as submoduleFrederik Gladhorn2013-11-014-0/+5
| | | | | | | | | | | | | | | Change-Id: Ida65ce0162fa65c37413ce6716eb6382e1593338 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * 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 Bot2014-02-0529-0/+0
|/ / | | | | | | | | Change-Id: If37564a74908846d69141b95c7edd938f4fc2379 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | Add QtAndroidExtras to dependency list of QtConnectivityAlex Blasche2014-01-141-1/+4
| | | | | | | | | | | | | | | | | | | | We only need it for Android builds though. Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2014-01-1116-0/+0
| | | | | | | | | | Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Updated submodules.Qt Submodule Update Bot2014-01-0922-0/+0
| | | | | | | | | | Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 21:26:15 +0000