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
145 Commits 118 Branches 270 Tags
571e52ea92be96d42b61cf435a1f78581ff7f70d
Commit Graph

54 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Rohan McGovern
1225ee9c51 Added qtfeedback module. 
Not yet compiled by default.
 2011-07-04 10:05:37 +10:00
Michael Goddard
d6abcb1b7e Add the QtMultimediaKit module. Currently not built. 
Reviewed-by: Rohan McGovern
 2011-06-29 16:32:18 +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
Xizhi Zhu
f7225b87a9 Add the QtSystems module. 2011-06-23 10:38:59 +03:00
Alan Alpert
8484878f25 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
 2011-06-21 16:54:22 +10:00
Friedemann Kleint
d8b73a8ba0 Add --berlin to set up WebKit mirror accordingly. 
Initial-patch-by: danimo <daniel.molkentin@nokia.com>
 2011-06-21 08:44:31 +02:00
Marius Storm-Olsen
c6f334f766 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.
 2011-06-01 13:16:09 -05:00
Marius Storm-Olsen
da3eb5c7ec 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.
 2011-06-01 12:17:41 -05:00
Marius Storm-Olsen
5d54ac9bb0 Remove silly "goto" usage in foreach loop 2011-06-01 11:02:53 -05:00
Marius Storm-Olsen
3c8d0ab74e 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'.
 2011-06-01 11:00:33 -05:00
Marius Storm-Olsen
15b148592f 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.
 2011-06-01 10:52:29 -05:00
Marius Storm-Olsen
c250ff7715 qtbase-earth-staging is no longer used, so remove it 2011-06-01 10:46:39 -05:00
Alex
dd45bb2735 Add new QtSensors module 2011-05-20 16:16:33 +10:00
Marius Storm-Olsen
66bd89af42 Fix --ignore-submodules in init-repository after refactoring 2011-05-19 11:22:25 -05:00
Rohan McGovern
5feaf36fa7 init-repository: mark as requiring perl 5.10 
This script currently requires perl 5.10, so mark it as such.
 2011-05-16 09:54:36 +10:00
Rohan McGovern
c85ca381a4 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.
 2011-05-16 09:52:17 +10:00
Alex
e36ef7a76e Add commit-template support 
Reviewed-by: Rohan McGovern
 2011-05-11 15:24:41 +10:00
Rohan McGovern
5bba019a81 init-repository: whitespace fix 2011-05-11 08:48:55 +10:00
Alex
0044c57a81 Add new qtlocation module 
The module is not yet enabled as various other repos need
to be in place first.
 2011-05-10 15:26:44 +10:00
Rohan McGovern
caba93a9a6 init-repository: avoid failure when combining `--force' and mirrors 
Avoid a fatal error if the `mirror' remote already exists.

Reviewed-by: Sunil Thaha
Change-Id: Id6225fad265abb575f6f35f750ba7aed7729e0dc
 2011-05-06 17:22:45 +10:00
Rohan McGovern
65ac36828a init-repository: also create the staging remote for qt5 
Previously we were creating the staging remotes only for the submodules.

Reviewed-by: Keith Isdale
Change-Id: I0935ae1b14da1745ffff979248e952391586fcba
 2011-05-06 16:23:13 +10:00
Rohan McGovern
9bf69ecc2f Improve maintainability of init-repository script. 
Make it object-oriented.

Document via pod and use pod2usage to implement `--help'.

Use Getopt::Long instead of hand-rolled argument parsing.

Make it pass `perlcritic -stern'.

Check the exit code of all commands.

Reviewed-by: Sunil Thaha
Reviewed-by: Lincoln Ramsay
Change-Id: Iac2a3358a05db7cdd953ba3d5396a8bb6bcfb44b
 2011-05-06 13:42:18 +10:00
Marius Storm-Olsen
780b928e4c Don't fog the $mirror 
WebKit mirror worked, but the general mirror was shadowed after
reorganizing code.
 2011-05-05 13:09:17 -05:00
Marius Storm-Olsen
8b83cf2bcf Make sure -brisbane uses the 'internal' protocol 2011-05-05 12:52:15 -05:00
Marius Storm-Olsen
da82709651 Add staging repos as 'staging' remote for each module 
Also fetch instead of clone, when repo is already populated.

Reviewed-by: axis
 2011-05-05 10:39:18 -05:00
Marius Storm-Olsen
add5bd04d9 Make printUsage more maintainable 
Reviewed-by: axis
 2011-05-05 10:39:12 -05:00
Marius Storm-Olsen
f47defb081 Add -copy-objects option 
Reviewed-by: axis
 2011-05-05 10:39:06 -05:00
Marius Storm-Olsen
4816c73f93 Add -mirror and -mirror-webkit options 
They also support using them as local mirrors, should you want
to do that instead of using -alternates

Reviewed-by: axis
 2011-05-05 10:38:59 -05:00
Marius Storm-Olsen
74f6b9fc61 Add -alternates option 
Reviewed-by: axis
 2011-05-05 10:38:53 -05:00
Marius Storm-Olsen
c2819f45a2 Clean up options, add -http for public access 
Reviewed-by: axis
 2011-05-05 10:38:47 -05:00
Marius Storm-Olsen
610962ed07 Add -ignore-submodules option 
Will make 'diff', 'fetch', 'pull' etc ignore the submodules
by default. You can still use --ignore-submodules=none to
override this, when really needed.

Very convenient when working with staging repos, instead of
what the qt5 repo dictate as the current module SHA1.

Reviewed-by: axis
 2011-05-05 10:38:40 -05:00
Marius Storm-Olsen
30960ad5b8 Remove whole submodule section 
Not removing the whole section will leave residue
sections in the config file when reinitiating the
submodules

Reviewed-by: axis
 2011-05-05 10:38:31 -05:00
Marius Storm-Olsen
1a9f4af89f Illegal->Unknown and show usage on wrong options 
Reviewed-by: axis
 2011-05-05 10:38:23 -05:00
Lincoln Ramsay
984400a586 Warn everywhere, not just Unix 
use warnings; is the portable way of doing #!/usr/bin/perl -w
Also use strict; in init-repository.

Signed-off-by: axis <qt-info@nokia.com>
 2011-05-03 13:47:51 +02:00
axis
9b197b1ca5 Added -ssh-protocol option for those with very restrictive firewalls. 
Reviewed by: Sergio Ahumada
 2011-05-03 12:52:27 +02:00
axis
0b4b4cc5d1 Removed some debug prints and made sure that -no-update is respected. 
Reviewed-by: Sergio Ahumada
 2011-04-28 16:15:07 +02:00
axis
2690ff63b7 Prettified the usage screen. 2011-04-28 16:12:52 +02:00
Alan Alpert
3c270630df Add -brisbane-nokia-developer switch 
Uses the local mirrors to save a few hours on initial checkouts.

Reviewed-by: axis
 2011-04-28 16:12:41 +02:00
Sergio Ahumada
a3209ceba8 Add -no-update option to init script 
Reviewed-by: axis
 2011-04-28 13:25:41 +02:00
Alan Alpert
82ca078d06 Add -no-webkit to init script 2011-04-28 10:21:09 +02:00