mirror/qt/qt5.git
9 years agoUpdated submodules. master_201108260856
Qt Submodule Update Bot [Thu, 25 Aug 2011 21:39:02 +0000 (07:39 +1000)]
Updated submodules.

Change-Id: Id77d2b472fd0d708a31f79d8b35292000309c291
Reviewed-on: http://codereview.qt.nokia.com/3614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108251421
Qt Submodule Update Bot [Wed, 24 Aug 2011 21:38:54 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I633e03bab2de28a05c945cfddacff8104b609a9e
Reviewed-on: http://codereview.qt.nokia.com/3386
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoPrepare init-repository script for moving v8 submodule master_201108241759
Kent Hansen [Mon, 22 Aug 2011 09:51:22 +0000 (11:51 +0200)]
Prepare init-repository script for moving v8 submodule

Transitional step needed while v8 is moved from qtdeclarative
to qtbase.
Before the transition is completely in place, init-repository
must be able to cope with both qtbase and qtdeclarative having
a v8 submodule.
This change causes git submodule init/update to be called for
both repositories, even though one of them doesn't have any
submodules. But in that case it's a no-op.

Change-Id: Ia1af01308c808e62eb85431764edd8c12bdc3325
Reviewed-on: http://codereview.qt.nokia.com/3303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoAdded new module, qtconnectivity.
Rohan McGovern [Wed, 24 Aug 2011 06:05:34 +0000 (16:05 +1000)]
Added new module, qtconnectivity.

Not yet enabled by default.

Change-Id: I89a8cb8cc6da9aeeba217e3ab3c10459082a21ed
Reviewed-on: http://codereview.qt.nokia.com/3447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
9 years agoAdded new module, qtpim.
Rohan McGovern [Wed, 24 Aug 2011 00:57:25 +0000 (10:57 +1000)]
Added new module, qtpim.

Not yet enabled by default.

Change-Id: I7db1f9a782442876139306a25847e6f23194f672
Reviewed-on: http://codereview.qt.nokia.com/3427
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
9 years agoRemove obsolete testlib files from .gitignore master_201108241353
Jason McDonald [Tue, 23 Aug 2011 08:43:20 +0000 (18:43 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: Ica80f49426aeb640f3f79af30930d5c5a944ada8
Reviewed-on: http://codereview.qt.nokia.com/3391
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108230910
Qt Submodule Update Bot [Mon, 22 Aug 2011 21:37:58 +0000 (07:37 +1000)]
Updated submodules.

Change-Id: Iaf51a8800d4c61e63185e9e00f14e24ca425d091
Reviewed-on: http://codereview.qt.nokia.com/3278
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108201209
Qt Submodule Update Bot [Sat, 20 Aug 2011 01:43:00 +0000 (11:43 +1000)]
Updated submodules.

Change-Id: I96beaeb94169e41cca426b7deeb422d828dafa32
Reviewed-on: http://codereview.qt.nokia.com/3115
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108171526
Qt Submodule Update Bot [Wed, 17 Aug 2011 05:18:19 +0000 (15:18 +1000)]
Updated submodules.

Change-Id: If9b4829ad190f4cdf343f38b6a8f420a71cc3d34
Reviewed-on: http://codereview.qt.nokia.com/2988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoEnabled qtfeedback, qtquick3d, qtdocgallery by default master_201108161609
Rohan McGovern [Tue, 16 Aug 2011 05:03:21 +0000 (15:03 +1000)]
Enabled qtfeedback, qtquick3d, qtdocgallery by default

These modules are working and maintained, so they should be enabled by
default.  Otherwise problems may go undetected for longer than
necessary.

Change-Id: Id1c79e4c323a31533bf8a0c593431974048a3106
Reviewed-on: http://codereview.qt.nokia.com/2986
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
9 years agoUpdated submodules. master_201108160830
Qt Submodule Update Bot [Mon, 15 Aug 2011 21:38:21 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I8b3f083684cb5d551de9c0016fbdd812f25e0274
Reviewed-on: http://codereview.qt.nokia.com/2919
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108130759
Qt Submodule Update Bot [Fri, 12 Aug 2011 21:38:26 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I6a9b333b64929f6deaeca1174d57a2d608d8b0ae
Reviewed-on: http://codereview.qt.nokia.com/2873
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108112058
Qt Submodule Update Bot [Thu, 11 Aug 2011 09:23:35 +0000 (19:23 +1000)]
Updated submodules.

Change-Id: I5566d5532f181852c66c7d5beb7cf0bffa285843
Reviewed-on: http://codereview.qt.nokia.com/2842
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoinit-repository: let `--http' option also work for v8
Rohan McGovern [Thu, 11 Aug 2011 00:30:41 +0000 (10:30 +1000)]
init-repository: let `--http' option also work for v8

Useful for people behind restrictive firewalls.

Task-number: QTBUG-20837
Change-Id: I1c6845ceb3b9ba17a0e36c97838a73ed94aa11f2
Reviewed-on: http://codereview.qt.nokia.com/2831
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
9 years agoAdded missing qtscript dependency for qtdocgallery master_201108111545
Rohan McGovern [Thu, 11 Aug 2011 00:38:43 +0000 (10:38 +1000)]
Added missing qtscript dependency for qtdocgallery

Change-Id: I4ed767710d36fbe1de08c425a6ad3fa43ed99252
Reviewed-on: http://codereview.qt.nokia.com/2832
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
9 years agoUpdated submodules. master_201108110906
Qt Submodule Update Bot [Wed, 10 Aug 2011 21:38:03 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: If74d833e0018657c9b1c722aa79e7a41c06d2548
Reviewed-on: http://codereview.qt.nokia.com/2809
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoAdded new module `qtdocgallery' master_201108101354
Rohan McGovern [Tue, 9 Aug 2011 23:37:37 +0000 (09:37 +1000)]
Added new module `qtdocgallery'

Change-Id: I9086b41be63b95144dbbd5e5511099baf4068253
Reviewed-on: http://codereview.qt.nokia.com/2793
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
9 years agoUpdated submodules. master_201108100912
Qt Submodule Update Bot [Tue, 9 Aug 2011 21:37:53 +0000 (07:37 +1000)]
Updated submodules.

Change-Id: Icce8840e6714471e303650319c7da6dd38138c1d
Reviewed-on: http://codereview.qt.nokia.com/2792
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108091700
Qt Submodule Update Bot [Tue, 9 Aug 2011 06:39:48 +0000 (16:39 +1000)]
Updated submodules.

Change-Id: I08652275b4c8f413618f5a31245b63befb800cb0
Reviewed-on: http://codereview.qt.nokia.com/2729
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108071006
Qt Submodule Update Bot [Fri, 5 Aug 2011 21:38:17 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I04e2a51f39b0c3762943ec81943c37f6ee9abaef
Reviewed-on: http://codereview.qt.nokia.com/2668
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108050832
Qt Submodule Update Bot [Thu, 4 Aug 2011 21:37:57 +0000 (07:37 +1000)]
Updated submodules.

Change-Id: I187b66aec258d17dcad0afa6fe0bf3c0f0f0af55
Reviewed-on: http://codereview.qt.nokia.com/2542
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108031114
Qt Submodule Update Bot [Tue, 2 Aug 2011 21:38:13 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I6721de9afc86f558ac747fecec35299db3d03a40
Reviewed-on: http://codereview.qt.nokia.com/2489
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoRemove qtdeclarative's dependency on qtscript master_201108021213
Rohan McGovern [Sun, 31 Jul 2011 23:19:53 +0000 (09:19 +1000)]
Remove qtdeclarative's dependency on qtscript

Since d410ad364ec0b8877797145c68a4d7c3c98ce1c0 in qtdeclarative,
qtscript is no longer required to build qtdeclarative.  Remove the
dependency.

Change-Id: Ia1af0121ed05735c8dbec545b8dda30d3d37aa99
Reviewed-on: http://codereview.qt.nokia.com/2405
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
9 years agoUpdated submodules. master_201108020842
Qt Submodule Update Bot [Mon, 1 Aug 2011 21:37:52 +0000 (07:37 +1000)]
Updated submodules.

Change-Id: Ibd8f2da15a852e65ef0fb223324425964e6ab7a6
Reviewed-on: http://codereview.qt.nokia.com/2425
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201108010825
Qt Submodule Update Bot [Sun, 31 Jul 2011 06:38:08 +0000 (16:38 +1000)]
Updated submodules.

Change-Id: I83184ac282f8f3eb2a41cf24e4db5ea70c45abc2
Reviewed-on: http://codereview.qt.nokia.com/2377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201107290806
Qt Submodule Update Bot [Thu, 28 Jul 2011 21:37:33 +0000 (07:37 +1000)]
Updated submodules.

Change-Id: Idbb6eaa9d311db030bb7ea74d8799f7878975c7e
Reviewed-on: http://codereview.qt.nokia.com/2319
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201107280821
Qt Submodule Update Bot [Wed, 27 Jul 2011 21:38:22 +0000 (07:38 +1000)]
Updated submodules.

Change-Id: I251efdef5f99859d541117c05cc01c0c437ccd18
Reviewed-on: http://codereview.qt.nokia.com/2305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoUpdated submodules. master_201107270632
Qt Submodule Update Bot [Tue, 26 Jul 2011 11:22:25 +0000 (21:22 +1000)]
Updated submodules.

Change-Id: Iaf92b943c9c648f5e2e11590deb555c4037879da
Reviewed-on: http://codereview.qt.nokia.com/1787
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
9 years agoQtDoc only depends on QtBase master_201107270043
Sergio Ahumada [Tue, 26 Jul 2011 14:16:01 +0000 (16:16 +0200)]
QtDoc only depends on QtBase

Change-Id: Idff3e2edf6d94fa99147e3bc2754c7414d7fbdb4
Reviewed-on: http://codereview.qt.nokia.com/2202
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoUpdated submodules. master_201107221346
Rohan McGovern [Fri, 22 Jul 2011 03:07:34 +0000 (13:07 +1000)]
Updated submodules.

Some modules have been held back due to source compatibility breaks
which have not yet received fixes in all dependent modules.

Change-Id: Ibc01b70bf9509ccb79ef9cd56022b9a0d080e397
Reviewed-on: http://codereview.qt.nokia.com/2002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoAdd qtquick3d module. master_201107181619
Sarah Smith [Thu, 14 Jul 2011 09:13:54 +0000 (19:13 +1000)]
Add qtquick3d module.

Change-Id: Ib3219c64e0100a4f79023d0a23972590fe3bd9f4
Reviewed-on: http://codereview.qt.nokia.com/1723
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoDisable QtMultimedia, since QtMultimediaKit has replaced it. master_201107181145
Michael Goddard [Fri, 15 Jul 2011 00:55:13 +0000 (10:55 +1000)]
Disable QtMultimedia, since QtMultimediaKit has replaced it.

Change-Id: I41f543d9faa42e3951e6d5f0eb29dd1b867427ca
Reviewed-on: http://codereview.qt.nokia.com/1682
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
9 years agoAllow initial checkout of V8 with the Brisbane mirror master_201107121958
Alan Alpert [Mon, 11 Jul 2011 04:40:35 +0000 (14:40 +1000)]
Allow initial checkout of V8 with the Brisbane mirror

Change-Id: Iaaaa88884e0a793218e2e307bd9e56067760c514
Reviewed-on: http://codereview.qt.nokia.com/1393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
9 years agoUpdate licenseheader text in source files for qt5 repo master_201107090039
Jyri Tahtela [Fri, 8 Jul 2011 11:10:54 +0000 (14:10 +0300)]
Update licenseheader text in source files for qt5 repo

Replace old license header with correct one.

Change-Id: I85f5a152069bdd1433f41f41e766063ec0fdbe13
Reviewed-on: http://codereview.qt.nokia.com/1371
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
9 years agoqtwebkit: work around compile failure in npapi when using qpa master_201107081727
Rohan McGovern [Fri, 8 Jul 2011 02:52:07 +0000 (12:52 +1000)]
qtwebkit: work around compile failure in npapi when using qpa

The current version of qtwebkit used in qt5 does not work with Qt/QPA.
The problem is in the netscape plugin API's usage of QX11EmbedContainer.
Disable the netscape plugin API until qtwebkit in qt5 can be updated to
a fixed version.

Change-Id: I833bfff2f1b1059810206b4160494eb59734b5ea
Reviewed-on: http://codereview.qt.nokia.com/1337
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
9 years agoCan now tell init-repository to only use a subset of modules master_201107072200
Alan Alpert [Wed, 6 Jul 2011 07:53:58 +0000 (17:53 +1000)]
Can now tell init-repository to only use a subset of modules

Still useful to use init-repository because of all the other logic, such
as repository urls. More general than --no-webkit, although it is still
a valid convenience as the most common case.

Also makes qt.pro check for existence of modules, since it is no longer
certain that you'll have everything but webkit.

Change-Id: Iaaaa30e24e0a793218e2e307bdde56067760c513
Reviewed-on: http://codereview.qt.nokia.com/1258
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoinit-repository: replace obsolete staging remotes with gerrit remotes master_201107071707
Rohan McGovern [Thu, 7 Jul 2011 00:49:23 +0000 (10:49 +1000)]
init-repository: replace obsolete staging remotes with gerrit remotes

All Qt5 modules are now moved into gerrit.  The staging repositories are
obsolete.

Change-Id: Ibdde6234da97a4664e54dbcd4425ed1b022cf850
Reviewed-on: http://codereview.qt.nokia.com/1254
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoEnable building of Qt Multimedia Kit by default. master_201107071237
Jonas Rabbe [Thu, 7 Jul 2011 01:01:03 +0000 (11:01 +1000)]
Enable building of Qt Multimedia Kit by default.

Change-Id: I9a74a43c71371fcb95f8b24c007ff95907a270a4
Reviewed-on: http://codereview.qt.nokia.com/1255
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 6 Jul 2011 05:02:50 +0000 (15:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodules.

9 years agoUpdated submodules.
Qt Submodule Update Automaton [Wed, 6 Jul 2011 04:41:38 +0000 (14:41 +1000)]
Updated submodules.

Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 5 Jul 2011 01:46:45 +0000 (11:46 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  README: improve build instructions

9 years agoREADME: improve build instructions
Rohan McGovern [Tue, 5 Jul 2011 01:37:55 +0000 (11:37 +1000)]
README: improve build instructions

Explain the stable build process first, followed by the bleeding-edge
build process.  Previously, the README exclusively recommended only the
process for building bleeding-edge of all modules together, which
frequently results in build failures.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 4 Jul 2011 00:57:41 +0000 (10:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Added qtfeedback module.

9 years agoAdded qtfeedback module.
Rohan McGovern [Mon, 4 Jul 2011 00:05:37 +0000 (10:05 +1000)]
Added qtfeedback module.

Not yet compiled by default.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Sat, 2 Jul 2011 04:22:57 +0000 (14:22 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Update qttools (fix compile)
  qtwebkit: force separate_debug_info off
  Update qtwebkit (fix compile)
  Update submodule reference to the latest.
  Update the head for qtsystems submodule.
  Enable the build for QtSystems by default.

9 years agoUpdate qttools (fix compile)
Rohan McGovern [Sat, 2 Jul 2011 04:17:04 +0000 (14:17 +1000)]
Update qttools (fix compile)

9 years agoqtwebkit: force separate_debug_info off
Rohan McGovern [Fri, 1 Jul 2011 05:21:02 +0000 (15:21 +1000)]
qtwebkit: force separate_debug_info off

This feature does not currently work with webkit's custom build script,
so disable it.

9 years agoUpdate qtwebkit (fix compile)
Rohan McGovern [Fri, 1 Jul 2011 01:16:25 +0000 (11:16 +1000)]
Update qtwebkit (fix compile)

9 years agoUpdate submodule reference to the latest.
Xizhi Zhu [Wed, 29 Jun 2011 17:00:22 +0000 (20:00 +0300)]
Update submodule reference to the latest.

9 years agoUpdate the head for qtsystems submodule.
Xizhi Zhu [Wed, 29 Jun 2011 13:40:45 +0000 (16:40 +0300)]
Update the head for qtsystems submodule.

9 years agoEnable the build for QtSystems by default.
Xizhi Zhu [Wed, 29 Jun 2011 12:13:58 +0000 (15:13 +0300)]
Enable the build for QtSystems by default.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 29 Jun 2011 07:12:41 +0000 (17:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add the QtMultimediaKit module.  Currently not built.

9 years agoAdd the QtMultimediaKit module. Currently not built.
Michael Goddard [Wed, 29 Jun 2011 05:16:16 +0000 (15:16 +1000)]
Add the QtMultimediaKit module.  Currently not built.

Reviewed-by: Rohan McGovern
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 28 Jun 2011 18:03:13 +0000 (04:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  QtDeclarative and QtDoc has moved into Gerrit

9 years agoQtDeclarative and QtDoc has moved into Gerrit
Marius Storm-Olsen [Tue, 28 Jun 2011 17:56:39 +0000 (12:56 -0500)]
QtDeclarative and QtDoc has moved into Gerrit

So, ensure init-repository point their 'gerrit' remotes to the
right locations

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Thu, 23 Jun 2011 07:59:27 +0000 (17:59 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add the QtSystems module.

9 years agoAdd the QtSystems module.
Xizhi Zhu [Thu, 23 Jun 2011 07:37:45 +0000 (10:37 +0300)]
Add the QtSystems module.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 21 Jun 2011 15:23:17 +0000 (01:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Have init-repository init nested submodule in qtdeclarative
  Add --berlin to set up WebKit mirror accordingly.

9 years agoHave init-repository init nested submodule in qtdeclarative
Alan Alpert [Tue, 21 Jun 2011 06:54:22 +0000 (16:54 +1000)]
Have init-repository init nested submodule in qtdeclarative

qtdeclarative is expected to gain a nested submodule soon. This change
makes init-repository checkout that submodule as well.

Reviewed-by: Rohan McGovern
9 years agoAdd --berlin to set up WebKit mirror accordingly.
Friedemann Kleint [Tue, 21 Jun 2011 06:37:30 +0000 (08:37 +0200)]
Add --berlin to set up WebKit mirror accordingly.

Initial-patch-by: danimo <daniel.molkentin@nokia.com>
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 6 Jun 2011 07:24:30 +0000 (17:24 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Enable Sensors and Location API builds by default

9 years agoEnable Sensors and Location API builds by default
Alex [Mon, 6 Jun 2011 07:20:27 +0000 (17:20 +1000)]
Enable Sensors and Location API builds by default

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 1 Jun 2011 23:40:44 +0000 (09:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodule references to latest modules' content

9 years agoUpdated submodule references to latest modules' content
Rohan McGovern [Wed, 1 Jun 2011 23:37:59 +0000 (09:37 +1000)]
Updated submodule references to latest modules' content

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 1 Jun 2011 18:23:06 +0000 (04:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add option --codereview-user <username> to add Gerrit repos
  Add 'staging' remote to repos which don't have a staging area
  Remove silly "goto" usage in foreach loop
  Make all staging repos 'staging' remotes in submodules
  Default to --ignore-submodules for --nokia-developer/--brisbane
  qtbase-earth-staging is no longer used, so remove it

9 years agoAdd option --codereview-user <username> to add Gerrit repos
Marius Storm-Olsen [Wed, 1 Jun 2011 18:16:09 +0000 (13:16 -0500)]
Add option --codereview-user <username> to add Gerrit repos

By providing the username used for codereviews, the script will
add the proper URLs for the repos currently under Gerrit control.

For repos not under Gerrit control, 'gerrit' will simply refer
to the staging repo, or origin.

9 years agoAdd 'staging' remote to repos which don't have a staging area
Marius Storm-Olsen [Wed, 1 Jun 2011 17:17:41 +0000 (12:17 -0500)]
Add 'staging' remote to repos which don't have a staging area

This makes it simpler to do
    git submodule foreach
commands, since you don't need to worry about the repos without
any staging area.

9 years agoRemove silly "goto" usage in foreach loop
Marius Storm-Olsen [Wed, 1 Jun 2011 16:02:53 +0000 (11:02 -0500)]
Remove silly "goto" usage in foreach loop

9 years agoMake all staging repos 'staging' remotes in submodules
Marius Storm-Olsen [Wed, 1 Jun 2011 16:00:33 +0000 (11:00 -0500)]
Make all staging repos 'staging' remotes in submodules

This allows us to more easily use
    git submodule foreach
since you can just refer to staging for the repo, like
you would 'origin'.

9 years agoDefault to --ignore-submodules for --nokia-developer/--brisbane
Marius Storm-Olsen [Wed, 1 Jun 2011 15:52:29 +0000 (10:52 -0500)]
Default to --ignore-submodules for --nokia-developer/--brisbane

When you use either --nokia-developer or --brisbane, changes
are that you're going to be working on one of the submodules
anyways, in which case, having git commands in top-level repo
work on submodules too is an annoyance.

9 years agoqtbase-earth-staging is no longer used, so remove it
Marius Storm-Olsen [Wed, 1 Jun 2011 15:46:39 +0000 (10:46 -0500)]
qtbase-earth-staging is no longer used, so remove it

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 30 May 2011 13:32:57 +0000 (23:32 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Tells readers about qt5_tool

9 years agoTells readers about qt5_tool
mae [Mon, 30 May 2011 13:30:20 +0000 (15:30 +0200)]
Tells readers about qt5_tool

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 25 May 2011 13:49:54 +0000 (23:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Update to new SHA in the QtWebKit repository.

9 years agoUpdate to new SHA in the QtWebKit repository.
axis [Wed, 25 May 2011 13:43:12 +0000 (15:43 +0200)]
Update to new SHA in the QtWebKit repository.

There was a mistake when pushing the modularized QtWebKit branch,
which repushed the whole history of WebKit. This happened because the
branch was based on the wrong SVN mirror.

The proper SHA has been pushed to QtWebKit and this change reflects
that in qt5.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Sun, 22 May 2011 22:40:22 +0000 (08:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodule references to latest modules' content
  Add new QtSensors module

9 years agoUpdated submodule references to latest modules' content
Eckhart Koppen [Fri, 20 May 2011 07:22:31 +0000 (10:22 +0300)]
Updated submodule references to latest modules' content

Updated to the current tip of each modules' master branch

9 years agoAdd new QtSensors module
Alex [Fri, 20 May 2011 06:16:33 +0000 (16:16 +1000)]
Add new QtSensors module

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Thu, 19 May 2011 16:30:47 +0000 (02:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Correct missing module_activeqt -> module_qtactiveqt
  Fix --ignore-submodules in init-repository after refactoring

9 years agoCorrect missing module_activeqt -> module_qtactiveqt
Marius Storm-Olsen [Thu, 19 May 2011 16:23:27 +0000 (11:23 -0500)]
Correct missing module_activeqt -> module_qtactiveqt

9 years agoFix --ignore-submodules in init-repository after refactoring
Marius Storm-Olsen [Thu, 19 May 2011 16:22:25 +0000 (11:22 -0500)]
Fix --ignore-submodules in init-repository after refactoring

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 18 May 2011 22:54:29 +0000 (08:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Clean up inconsistent usage of `depends' in qt.pro
  The qtlocation module depends on declarative too

9 years agoClean up inconsistent usage of `depends' in qt.pro
Rohan McGovern [Wed, 18 May 2011 22:48:24 +0000 (08:48 +1000)]
Clean up inconsistent usage of `depends' in qt.pro

Some of the depends were referring to qmake targets and some of them
were referring to make targets.  That's unnecessarily confusing.  Make
them consistent.

9 years agoThe qtlocation module depends on declarative too
Alex [Tue, 17 May 2011 05:46:21 +0000 (15:46 +1000)]
The qtlocation module depends on declarative too

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 16 May 2011 00:02:34 +0000 (10:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  init-repository: mark as requiring perl 5.10
  init-repository: fixed `--help' with older Pod::Usage (OSX 10.6)

9 years agoinit-repository: mark as requiring perl 5.10
Rohan McGovern [Sun, 15 May 2011 23:54:36 +0000 (09:54 +1000)]
init-repository: mark as requiring perl 5.10

This script currently requires perl 5.10, so mark it as such.

9 years agoinit-repository: fixed `--help' with older Pod::Usage (OSX 10.6)
Rohan McGovern [Sun, 15 May 2011 23:52:17 +0000 (09:52 +1000)]
init-repository: fixed `--help' with older Pod::Usage (OSX 10.6)

Pod::Usage shipped on OSX 10.6 seems to stop printing the usage
message at the first `=headX'.  Refactor the documentation slightly to
take this into account.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Fri, 13 May 2011 02:11:11 +0000 (12:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Update to latest qtbase master.
  Remove platform-specific logic for qtactiveqt module.
  Updated to latest version of qtrepotools.
  update to the master branch in each submodules

9 years agoUpdate to latest qtbase master.
Rohan McGovern [Fri, 13 May 2011 02:04:56 +0000 (12:04 +1000)]
Update to latest qtbase master.

9 years agoRemove platform-specific logic for qtactiveqt module.
Rohan McGovern [Fri, 13 May 2011 00:13:24 +0000 (10:13 +1000)]
Remove platform-specific logic for qtactiveqt module.

For the sake of a uniform test procedure, it is cleaner to have
`make module-qtactiveqt' always working, but simply not building
anything on platforms where ActiveQt is not supported.

Without this, any test procedure for building Qt5 needs to be able
to know or determine that ActiveQt should only be built on Windows.

Reviewed-by: Jason McDonald
Change-Id: I3869bbacdc6598a764561a4b9f6042c49e6ffae8

9 years agoUpdated to latest version of qtrepotools.
axis [Thu, 12 May 2011 08:46:29 +0000 (10:46 +0200)]
Updated to latest version of qtrepotools.

It's necessary to make sure the git-qt-graft script works in a fresh
clone.

9 years agoupdate to the master branch in each submodules
Olivier Goffart [Wed, 11 May 2011 13:12:10 +0000 (15:12 +0200)]
update to the master branch in each submodules

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 11 May 2011 05:30:13 +0000 (15:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Add commit-template support

9 years agoAdd commit-template support
Alex [Wed, 11 May 2011 05:24:41 +0000 (15:24 +1000)]
Add commit-template support

Reviewed-by: Rohan McGovern
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 11 May 2011 02:39:23 +0000 (12:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  qtlocation: add to SUBDIRS, but do not (yet) compile it by default

9 years agoqtlocation: add to SUBDIRS, but do not (yet) compile it by default
Rohan McGovern [Tue, 10 May 2011 23:05:46 +0000 (09:05 +1000)]
qtlocation: add to SUBDIRS, but do not (yet) compile it by default

The previous method of adding qtlocation did not allow
`make module-qtlocation' to work.

Reviewed-by: Alex
Change-Id: I75caab75ddf8ed5800c75933097df297b0021c6c

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 22:53:48 +0000 (08:53 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  init-repository: whitespace fix

9 years agoinit-repository: whitespace fix
Rohan McGovern [Tue, 10 May 2011 22:48:55 +0000 (08:48 +1000)]
init-repository: whitespace fix

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 09:11:40 +0000 (19:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Document how to install the grafts

9 years agoMerge remote-tracking branch 'origin/master'
Olivier Goffart [Tue, 10 May 2011 09:04:50 +0000 (11:04 +0200)]
Merge remote-tracking branch 'origin/master'