lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-07 23:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,508 Commits 117 Branches 268 Tags
dev
Commit Graph

6508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergio Ahumada
ae18e8f479 init-repository: replace gerrit remotes with the new domain name 
All Qt5 modules are now moved to a new host.

Change-Id: Id6d7962e26608cd7cd3a8876cabbddb92c65ea17
Reviewed-on: http://codereview.qt-project.org/4369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-09-07 17:12:03 +02:00
Qt Submodule Update Bot
14ca106b0f Updated submodules. 
Change-Id: I757562f7bdbc144035d16c240814f836f1e50d27
Reviewed-on: http://codereview.qt.nokia.com/4114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-06 03:24:36 +02:00
Michael Goddard
1b5490797b Remove QtMultimedia (obsoleted by QtMultimediaKit). 
Change-Id: I6fbdde1d28f3156aee0bf9caaae7a1e3b3a4392a
Reviewed-on: http://codereview.qt.nokia.com/4105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2011-09-02 05:21:55 +02:00
Qt Submodule Update Bot
757562f7bd Updated submodules. 
Change-Id: I444aa72df8d126aa7841c163e8204a6f7ee80254
Reviewed-on: http://codereview.qt.nokia.com/3847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-01 23:47:58 +02:00
Rohan McGovern
5fcb9e1857 Updated submodules. 
qtfeedback db25fcb9fafa7d269ed846aaa25c8ec48c18cea4
"Enable the mmk plugin" triggers a build failure related to
debug-and-release, so this module has been held back.

Change-Id: Ie4732119be176263b04ec084ea3452b8f9f1efe2
Reviewed-on: http://codereview.qt.nokia.com/4014
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-01 00:41:14 +02:00
Rohan McGovern
2279fd904b Added missing dependency for qtfeedback. 
qtfeedback uses qtmultimediakit (in src/plugins/feedback/mmk), but
qt.pro was missing the dependency.

Change-Id: I1f54cc31cc9ac8bab2583f5afe4f9d7a13545844
Reviewed-on: http://codereview.qt.nokia.com/3900
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
 2011-08-31 12:46:39 +02:00
Qt Submodule Update Bot
444aa72df8 Updated submodules. 
Change-Id: Id157754304d41f761503d2444c74227ee36ebbb6
Reviewed-on: http://codereview.qt.nokia.com/3824
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-08-30 00:15:32 +02:00
Qt Submodule Update Bot
d157754304 Updated submodules. 
Change-Id: I14bdd5fea17356a839b36a073e02d22740310d31
Reviewed-on: http://codereview.qt.nokia.com/3679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-08-29 03:21:33 +02:00
Rohan McGovern
bd3db149e6 Enabled compilation of qtpim by default. 
Change-Id: I19e8fb731c22f50d27b1ca45e36b9884f33ca1f1
Reviewed-on: http://codereview.qt.nokia.com/3428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-08-27 03:49:45 +02:00
Qt Submodule Update Bot
14bdd5fea1 Updated submodules. 
Change-Id: If7e435713bffafdfce6766023b2b078a0afc3410
Reviewed-on: http://codereview.qt.nokia.com/3633
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-08-27 00:47:40 +02:00
Liang Qi
c011de1862 Not add remote for external developers 
Gerrit is still for internal at the time.

Task-number: QTBUG-21139
Change-Id: Idc282e4db06246dc173f745e11234647d302edd4
Reviewed-by: Sergio Ahumada
Reviewed-on: http://codereview.qt.nokia.com/3669
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
 2011-08-26 13:52:39 +02:00
Qt Submodule Update Bot
f7e435713b 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>
 2011-08-26 00:48:05 +02:00
Qt Submodule Update Bot
d77d2b472f 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>
 2011-08-25 06:13:40 +02:00
Kent Hansen
571e52ea92 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>
 2011-08-24 09:50:58 +02:00
Rohan McGovern
8c89a335b4 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>
 2011-08-24 09:50:58 +02:00
Rohan McGovern
ae61bc2d1f 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>
 2011-08-24 09:50:58 +02:00
Jason McDonald
0606fafb5e 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>
 2011-08-24 05:33:16 +02:00
Qt Submodule Update Bot
633e03bab2 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>
 2011-08-23 01:03:09 +02:00
Qt Submodule Update Bot
af51a8800d 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>
 2011-08-20 04:01:27 +02:00
Qt Submodule Update Bot
96beaeb941 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>
 2011-08-17 07:19:04 +02:00
Rohan McGovern
cebe2c3005 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>
 2011-08-16 08:02:11 +02:00
Qt Submodule Update Bot
f9b4829ad1 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>
 2011-08-16 00:24:10 +02:00
Qt Submodule Update Bot
8b3f083684 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>
 2011-08-12 23:52:35 +02:00
Qt Submodule Update Bot
6a9b333b64 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>
 2011-08-11 12:51:11 +02:00
Rohan McGovern
38e02c6434 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>
 2011-08-11 12:51:11 +02:00
Rohan McGovern
874e0ca4b7 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>
 2011-08-11 07:38:45 +02:00
Qt Submodule Update Bot
5566d5532f 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>
 2011-08-11 01:00:33 +02:00
Rohan McGovern
59e8e7914f 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>
 2011-08-10 05:47:15 +02:00
Qt Submodule Update Bot
f74d833e00 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>
 2011-08-10 01:05:31 +02:00
Qt Submodule Update Bot
cce8840e67 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>
 2011-08-09 08:53:47 +02:00
Qt Submodule Update Bot
08652275b4 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>
 2011-08-07 02:00:07 +02:00
Qt Submodule Update Bot
04e2a51f39 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>
 2011-08-05 00:26:38 +02:00
Qt Submodule Update Bot
187b66aec2 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>
 2011-08-03 03:08:59 +02:00
Rohan McGovern
61da1d00df 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>
 2011-08-02 04:07:05 +02:00
Qt Submodule Update Bot
6721de9afc 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>
 2011-08-02 00:37:01 +02:00
Qt Submodule Update Bot
bd8f2da15a Updated submodules. 
Change-Id: I83184ac282f8f3eb2a41cf24e4db5ea70c45abc2
Reviewed-on: http://codereview.qt.nokia.com/2377
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-08-01 00:19:23 +02:00
Qt Submodule Update Bot
83184ac282 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>
 2011-07-29 00:00:43 +02:00
Qt Submodule Update Bot
dbb6eaa9d3 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>
 2011-07-28 00:16:00 +02:00
Qt Submodule Update Bot
251efdef5f 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>
 2011-07-26 22:26:14 +02:00
Sergio Ahumada
00a8f05159 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>
 2011-07-26 16:37:37 +02:00
Rohan McGovern
bf8a934d95 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>
 2011-07-22 05:41:28 +02:00
Sarah Smith
228ee3f0e7 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>
 2011-07-18 08:15:15 +02:00
Michael Goddard
dfd4be11b5 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>
 2011-07-18 03:40:32 +02:00
Alan Alpert
e8fd62c386 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>
 2011-07-12 11:54:13 +02:00
Jyri Tahtela
8e349b9378 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>
 2011-07-08 16:34:39 +02:00
Rohan McGovern
1ef87b6c07 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>
 2011-07-08 09:24:12 +02:00
Alan Alpert
435a7c7739 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>
 2011-07-07 13:55:34 +02:00
Rohan McGovern
3be6eb3042 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>
 2011-07-07 09:03:16 +02:00
Jonas Rabbe
aef0d33e30 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>
 2011-07-07 03:06:29 +02:00
Qt Continuous Integration System
25f4329e0b 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.
 2011-07-06 15:02:50 +10:00