* '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.
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Have init-repository init nested submodule in qtdeclarative
Add --berlin to set up WebKit mirror accordingly.
qtdeclarative is expected to gain a nested submodule soon. This change
makes init-repository checkout that submodule as well.
Reviewed-by: Rohan McGovern
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
Add option --codereview-user <username> to add Gerrit repos
Add 'staging' remote to repos which don't have a staging area
Remove silly "goto" usage in foreach loop
Make all staging repos 'staging' remotes in submodules
Default to --ignore-submodules for --nokia-developer/--brisbane
qtbase-earth-staging is no longer used, so remove it
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.
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.
There was a mistake when pushing the modularized QtWebKit branch,
which repushed the whole history of WebKit. This happened because the
branch was based on the wrong SVN mirror.
The proper SHA has been pushed to QtWebKit and this change reflects
that in qt5.
* '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
