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
178 Commits 118 Branches 270 Tags
6bd52260c811d7ad9eb74bde0db02f178bd40b47
Commit Graph

178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lincoln Ramsay
6bd52260c8 Check for a non-error, non-continue case. 
There is at least one case in configure where it exist with a code of 0
but does not create .qmake.cache. Detect this and avoid continuing.

Change-Id: I0554991e5d4a50b7072494c080fa2c593e03b726
Reviewed-on: http://codereview.qt-project.org/6094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-10-07 02:29:16 +02:00
Qt Submodule Update Bot
59621329f1 Updated submodules. 
Change-Id: I001256627373360183e7b6328bcce496309ae319
Reviewed-on: http://codereview.qt-project.org/6183
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-07 00:17:40 +02:00
Qt Submodule Update Bot
0012566273 Updated submodules. 
Change-Id: I28988e75c246acbce921acdc669aab1676e5696d
Reviewed-on: http://codereview.qt-project.org/6110
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-06 08:45:39 +02:00
Qt Submodule Update Bot
28988e75c2 Updated submodules. 
Change-Id: Ia6029bc9e8823a419b2e9467e098f151ba80b27f
Reviewed-on: http://codereview.qt-project.org/6017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-06 00:25:04 +02:00
Qt Submodule Update Bot
a6029bc9e8 Updated submodules. 
Change-Id: Iffb9620f4975589c2d03b94e7f9915b6d06e22ff
Reviewed-on: http://codereview.qt-project.org/5913
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
 2011-10-05 02:24:54 +02:00
Qt Submodule Update Bot
ffb9620f49 Updated submodules. 
Change-Id: Ie74a9b5d12452af4c32167bf8b7583b5ec879462
Reviewed-on: http://codereview.qt-project.org/5817
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-10-03 03:11:49 +02:00
Qt Submodule Update Bot
e74a9b5d12 Updated submodules. 
Change-Id: Ia676bea47dc377c4fe4d030dfd8b2daa353fdfc6
Reviewed-on: http://codereview.qt-project.org/5675
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-29 08:41:51 +02:00
Rohan McGovern
a18953473b Revert "Enabled compilation of qtwayland by default." 
This reverts commit a507ff6241d8d22d4405a445fdbd16f32f1e3cde

This commit is counterproductive at least until qtwayland follows
a few more modularization requirements (e.g. .pro file named
`qtwayland.pro')

Change-Id: I5b9e6283eef9aaf1cdc3b71823181eaab1f9f3a7
Reviewed-on: http://codereview.qt-project.org/5681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-28 09:49:27 +02:00
Qt Submodule Update Bot
a676bea47d Updated submodules. 
Change-Id: I472e486c3a8a4a0a402c7e178b69d2a907bbe849
Reviewed-on: http://codereview.qt-project.org/5645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-28 04:31:19 +02:00
Rohan McGovern
1d3b5a518e Enabled compilation of qtwayland by default. 
Change-Id: I8c62231ddbee1a731db7aa98a0796c8e81ee5a44
Reviewed-on: http://codereview.qt-project.org/5581
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
 2011-09-27 10:41:04 +02:00
Rohan McGovern
80f75f093c Added new module, qtwayland. 
Not yet enabled by default.

Change-Id: I6f22e7d69743415ec8f9588a8621cd28ca6d8eda
Reviewed-on: http://codereview.qt-project.org/5580
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
 2011-09-27 10:41:04 +02:00
Qt Submodule Update Bot
472e486c3a Updated submodules. 
Change-Id: I6b12a69df5a715d15754d0dd35667b22f05620b8
Reviewed-on: http://codereview.qt-project.org/5511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-27 08:42:36 +02:00
Qt Submodule Update Bot
6b12a69df5 Updated submodules. 
Change-Id: Ieeab4de108796b5c86a1a881879114c1bc13424a
Reviewed-on: http://codereview.qt-project.org/5476
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-26 03:17:20 +02:00
Rohan McGovern
423d8d9af7 Re-enable qtlocation by default. 
Change-Id: Ib4e96ebc014d5f8651ab16184955645fbba16458
Reviewed-on: http://codereview.qt-project.org/5355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
 2011-09-23 08:48:52 +02:00
Qt Submodule Update Bot
eeab4de108 Updated submodules. 
Change-Id: Ib6dc4927e07342e30a1f09cf648d4b3fbbad0992
Reviewed-on: http://codereview.qt-project.org/5446
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-23 08:48:41 +02:00
Rohan McGovern
c3b9fdc3f1 Enabled qtconnectivity by default. 
Change-Id: Ic34b6d270cdb754167977e9bda4c41a23819f31a
Reviewed-on: http://codereview.qt-project.org/5415
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-23 04:58:37 +02:00
Qt Submodule Update Bot
b6dc4927e0 Updated submodules. 
Change-Id: I3cabeeee23b2581e9ed694b1ae33259c5e1438ab
Reviewed-on: http://codereview.qt-project.org/5411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
 2011-09-23 01:17:43 +02:00
Qt Submodule Update Bot
3cabeeee23 Updated submodules. 
Change-Id: I14ca106b0fbadd80ddaf92f258714ab4a2750cb7
Reviewed-on: http://codereview.qt-project.org/4237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-22 08:02:56 +02:00
Rohan McGovern
ddf85c473b Updated submodules (merged refactor) 
This commit updates all applicable submodules past the merge of the
refactor branches.

Dependencies for qtlocation and qtdoc in qt.pro were fixed to match
the latest dependencies in those modules.

Change-Id: I0000000000000d80ddaf92f258714ab4a2750cb7
Reviewed-on: http://codereview.qt-project.org/5109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
 2011-09-22 05:28:19 +02:00
Rohan McGovern
a7b8fd44f9 Updated qtdoc. 
Explicitly updated the qtdoc module on request, as normal updates of all
modules are likely to be delayed for some time due to recent `refactor'
merge.

Change-Id: I618776fd03efd57ff0b6d91218372537e29b5066
Reviewed-on: http://codereview.qt-project.org/4928
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
 2011-09-15 10:19:12 +02:00
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