* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Correct missing module_activeqt -> module_qtactiveqt
Fix --ignore-submodules in init-repository after refactoring
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Clean up inconsistent usage of `depends' in qt.pro
The qtlocation module depends on declarative too
Some of the depends were referring to qmake targets and some of them
were referring to make targets. That's unnecessarily confusing. Make
them consistent.
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
init-repository: mark as requiring perl 5.10
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.
* '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
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
The previous method of adding qtlocation did not allow
`make module-qtlocation' to work.
Reviewed-by: Alex
Change-Id: I75caab75ddf8ed5800c75933097df297b0021c6c
Previously we were creating the staging remotes only for the submodules.
Reviewed-by: Keith Isdale
Change-Id: I0935ae1b14da1745ffff979248e952391586fcba
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
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
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
