aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'release' into stableSergio Ahumada2013-06-241-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtbase qtdeclarative qtmultimedia qtquick1 qtquickcontrols qtsensors qttools Change-Id: I7b101efc32108484a4237b2fbf9908c9b92fa267
| | * configure: Fix srcpath when you run configure in the top-level dirSergio Ahumada2013-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the absolute path to configure, otherwise you get: [user@locahost qt5]$ ./configure -minimal + cd qtbase + ./qtbase/configure -minimal ./configure: line 58: ./qtbase/configure: No such file or directory Change-Id: Ic7568cc571aaa52c56bcd28fa1b6bde8abb32c8e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Updated submodules.Qt Submodule Update Bot2013-06-228-0/+0
| | | | | | | | | | | | | | | Change-Id: I375328584b6361cd9f364be05b29afa5f33ac318 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Merge "Merge branch 'release' into stable" into refs/staging/stableFrederik Gladhorn2013-06-239-56/+2352
| |\ \
| | * | Merge branch 'release' into stableSergio Ahumada2013-06-209-56/+2352
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtactiveqt qtbase qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtjsbackend qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtx11extras qtxmlpatterns Change-Id: I3abc0b033809366c993b0c358575e120c4f5953b
| | | * rewrite top-level configures without perlOswald Buddenhagen2013-06-202-56/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise the whole no-syncqt-and-thus-perl-needed stunt in qtbase would be fairly useless for top-level builds. Task-number: QTBUG-31786 Change-Id: I9f9b38091155a2d50ffec169267e0363fc24d3c0 Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | * Don't include README.git in source packagesSergio Ahumada2013-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make sense for non-git content anyways. Change-Id: I9064de54657ab50caa526dab2830ee0d16054a9e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-174-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I35350e9779e2cc0507d1e1dd749ce2d22d011205 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Update LICENSE.PREVIEW.COMMERCIAL licenseSergio Ahumada2013-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-169-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I111d8165f6f30a93014fa8a5d34d0171df3eb286 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.v5.1.0-rc1Sergio Ahumada2013-06-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If458a1b0946562ac8fea9f863a09862bba15527c Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-136-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3918311aeb73f39e267beb8dd377c5822ae93536 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-116-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a19225d751896cb5748cd20084a93bc62340cb8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-092-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If1d7bdd44443aaf5b60a61667d84adf6df98aaf5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-084-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7d1e12cc1e24ab3e4b2de27b8974071691a7d7a1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-068-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icfdf021c18de12f80907bbd366ae1e03a362c61c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-058-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I641bab7bdec259a9aed5be4d5f643828254e1ac4 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-06-046-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia11c7ef6709a97ea1352d2f3c10512da31700a2e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-05-318-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iad91faa3bdb0faa8c2d5b23b00addaf6af01989d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Add license files mandated by (L)GPL.Sergio Ahumada2013-05-305-0/+2288
| | | | | | | | | | | | | | | | | | | | Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| | | * Updated submodules.Qt Submodule Update Bot2013-05-297-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I292a7a74309c378c8164dba7de4264fe4ad341de Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * Updated submodules.Sergio Ahumada2013-05-2821-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If89dd01d1987cdbf3de9927227d7345f2a43bdf5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | * Merge branch 'stable' into releaseSergio Ahumada2013-05-2321-144/+177
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README qtwebkit-examples-and-demos Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
| | | * | Updated submodules.Qt Submodule Update Bot2013-04-093-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If618a97229d55cf58fb668fbeaa4a7b0b47f3b14 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-04-043-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I696ab3466b90a23906ec5d609bb504f073eef21f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-307-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I231887b543d339740f1d1d49f96fc2f07f173030 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-261-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib47a94b9fbb092770db220b59f13e6d64d0007c3 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-253-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a3420b02efdbc26843a5b84f81399d059ed84a6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-257-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c752f164a19a781b4afb66a9fe4f0b4d7bd7a70 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-2215-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib99b4bc0701257d213af7d1a02d03c047bacd46e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-194-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice407c128354a3c45d3894f852b8977c78ffe96b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-03-0518-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I585c525fd1d770cee6967f1c722e78fd5a0976c5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-302-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3ef11f427b3e47b9e725c66a60f64acb532aced Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-287-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I347949e258d3c75ad506aefa2a28712266007c15 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I79193d2b4d9b58e1b4928857156e1523ea970b74 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-263-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f43917c1d4b3648615c52d4fe012d44561e5d0c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Doc: Added information about the documentation in qt5/README file.Jerome Pasion2013-01-251-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -added basic information and links to wiki and qtbase/doc/README file. Task-number: QTBUG-29057 Change-Id: I21d4dbaf7c1d03b63949af1fa303cb6fcbee8949 Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-2512-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I371d08eb4a1e748e042c09a872af9bcb6e03b405 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-225-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I319b198bbf22c551bc05a308211cb1666f520d89 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f1cc2e9387ac936ad9d02cff409798da9cd9835 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0270c339333b78457e2397709353c86483ce8ae Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-165-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafb0caec7665e3d3f7b0c8e8c00ed4616734f163 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-153-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7514c6e0f62ccd168c0081f83c9e4c0248e7e130 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2d9fb7323ba08ccd1cf08752073efd212012da4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Sergio Ahumada2013-01-1314-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic95561b551e1b777dd164d5dfc865f6f02f1c0b4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-122-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56d9eaba8f6699c6635f76277aedde7a2fbb992b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-117-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8cb6c9373f70ee9c52a32bdfb03a9e012db67030 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | | * | Updated submodules.Qt Submodule Update Bot2013-01-0918-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If565e02bdbdf8d2e3f08f45db96224c20074f168 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | Updated submodules.Qt Submodule Update Bot2013-06-223-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6670595185ea486237fe71c156e081ffe8bb40cc Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | fix Berlin's mirror URLJoerg Bornemann2013-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3aaaa943370bece428a37dd8a1d89034fadeffd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>