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
260 Commits 118 Branches 270 Tags
f6ce3e9c7bc2b30a6639b95a040ae80142bacdfd
Commit Graph

260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Continuous Integration System
3ab36e99cf 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
 2011-05-13 12:11:11 +10:00
Rohan McGovern
e9fae0f07f Update to latest qtbase master. 2011-05-13 12:05:56 +10:00
Rohan McGovern
d4da74a74d 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
 2011-05-13 12:05:56 +10:00
axis
3dfd8e78d4 Updated to latest version of qtrepotools. 
It's necessary to make sure the git-qt-graft script works in a fresh
clone.
 2011-05-12 10:48:10 +02:00
Olivier Goffart
44c2257210 update to the master branch in each submodules 2011-05-11 15:50:18 +02:00
Qt Continuous Integration System
0d7c262847 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
 2011-05-11 15:30:13 +10:00
Alex
e36ef7a76e Add commit-template support 
Reviewed-by: Rohan McGovern
 2011-05-11 15:24:41 +10:00
Qt Continuous Integration System
e4a61858d9 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
 2011-05-11 12:39:23 +10:00
Rohan McGovern
b984a0da2b 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
 2011-05-11 12:34:45 +10:00
Qt Continuous Integration System
cf80e02cd3 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
 2011-05-11 08:53:48 +10:00
Rohan McGovern
5bba019a81 init-repository: whitespace fix 2011-05-11 08:48:55 +10:00
Qt Continuous Integration System
ae892337db 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
 2011-05-10 19:11:40 +10:00
Olivier Goffart
423219ddfe Merge remote-tracking branch 'origin/master' 2011-05-10 11:04:50 +02:00
Olivier Goffart
0c15747884 Document how to install the grafts 2011-05-10 11:04:29 +02:00
Qt Continuous Integration System
6e431f6271 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 .gitignore to qt5 root repo
 2011-05-10 18:20:36 +10:00
Alex
e469aa8ce8 add .gitignore to qt5 root repo 
Needed since in source builds create Makefiles.
 2011-05-10 18:14:55 +10:00
Qt Continuous Integration System
0620b2504e 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 new qtlocation module
 2011-05-10 15:33:13 +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
Qt Continuous Integration System
5bdb8b1784 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: avoid failure when combining `--force' and mirrors
 2011-05-06 17:27:05 +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
Qt Continuous Integration System
7d94af3595 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: also create the staging remote for qt5
 2011-05-06 16:27:15 +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
Qt Continuous Integration System
66cbe5de4d Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging 
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Improve maintainability of init-repository script.
 2011-05-06 15:21:39 +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
axis
257d74c476 Corrected typo. 
Reviewed-by: Trust me
 2011-05-05 16:27:55 +02:00
axis
df453967a1 Removed qt3support. 
It will not be part of Qt5.

Reviewed-by: Marius Storm-Olsen
 2011-05-05 16:27:17 +02:00
Rohan McGovern
9093f9d771 build system: use consistent target names for all modules 
Force all top-level makefile rules to be named `module-$GITSUBMODULE',
including the addition of the missing qlalr and qtqa targets.

This naming convention must be upheld, otherwise there is no simple
way to programmatically build a single git submodule and all of its
dependencies.

Reviewed-by: Liang Qi
 2011-05-05 17:13:02 +10:00
Lincoln Ramsay
d3f10a82ff Don't assume that commands succeed 
Signed-off-by: axis <qt-info@nokia.com>
 2011-05-03 13:47:51 +02: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
ea437d3767 Updated to latest qtrepotools. 2011-05-03 12:53:13 +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
axis
b53f0f5d56 Updated to latest qtrepotools version. 2011-04-28 15:17:33 +02:00
axis
b98b6df27a Fixed outdated README contents. 2011-04-28 15:17:33 +02:00
Sergio Ahumada
a3209ceba8 Add -no-update option to init script 
Reviewed-by: axis
 2011-04-28 13:25:41 +02:00
axis
837d5a3cb6 Updated qttools to a version that compiles without WebKit. 2011-04-28 10:29:24 +02:00
Alan Alpert
82ca078d06 Add -no-webkit to init script 2011-04-28 10:21:09 +02:00