aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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