lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
141 Commits 118 Branches 270 Tags
633e03bab2de28a05c945cfddacff8104b609a9e
Commit Graph

141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Automaton
1eb86ca9f2 Updated submodules. 
Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2
 2011-07-06 14:41:38 +10:00
Qt Continuous Integration System
104bf98bd6 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
 2011-07-05 11:46:45 +10:00
Rohan McGovern
4d0c303024 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.
 2011-07-05 11:37:55 +10:00
Qt Continuous Integration System
3e42e0076e 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.
 2011-07-04 10:57:41 +10:00
Rohan McGovern
1225ee9c51 Added qtfeedback module. 
Not yet compiled by default.
 2011-07-04 10:05:37 +10:00
Qt Continuous Integration System
2e0f534cc4 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.
 2011-07-02 14:22:57 +10:00
Rohan McGovern
0d814147eb Update qttools (fix compile) 2011-07-02 14:17:04 +10:00
Rohan McGovern
b397b26b58 qtwebkit: force separate_debug_info off 
This feature does not currently work with webkit's custom build script,
so disable it.
 2011-07-01 15:21:02 +10:00
Rohan McGovern
868c76dc4a Update qtwebkit (fix compile) 2011-07-01 11:16:25 +10:00
Xizhi Zhu
4df43a509b Update submodule reference to the latest. 2011-06-29 20:00:22 +03:00
Xizhi Zhu
b034b3c4e4 Update the head for qtsystems submodule. 2011-06-29 16:40:45 +03:00
Xizhi Zhu
908badc6ac Enable the build for QtSystems by default. 2011-06-29 15:13:58 +03:00
Qt Continuous Integration System
ed3e3cf5d3 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.
 2011-06-29 17:12:41 +10:00
Michael Goddard
d6abcb1b7e Add the QtMultimediaKit module. Currently not built. 
Reviewed-by: Rohan McGovern
 2011-06-29 16:32:18 +10:00
Qt Continuous Integration System
d2c7aeee7e 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
 2011-06-29 04:03:13 +10:00
Marius Storm-Olsen
8879542b22 QtDeclarative and QtDoc has moved into Gerrit 
So, ensure init-repository point their 'gerrit' remotes to the
right locations
 2011-06-28 12:56:39 -05:00
Qt Continuous Integration System
2ac5c82153 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.
 2011-06-23 17:59:27 +10:00