mirror/qt/qt5.git
9 years agoUpdate licenseheader text in source files for qt5 repo master_201107090039
Jyri Tahtela [Fri, 8 Jul 2011 11:10:54 +0000 (14:10 +0300)]
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>
9 years agoqtwebkit: work around compile failure in npapi when using qpa master_201107081727
Rohan McGovern [Fri, 8 Jul 2011 02:52:07 +0000 (12:52 +1000)]
qtwebkit: work around compile failure in npapi when using qpa

The current version of qtwebkit used in qt5 does not work with Qt/QPA.
The problem is in the netscape plugin API's usage of QX11EmbedContainer.
Disable the netscape plugin API until qtwebkit in qt5 can be updated to
a fixed version.

Change-Id: I833bfff2f1b1059810206b4160494eb59734b5ea
Reviewed-on: http://codereview.qt.nokia.com/1337
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
9 years agoCan now tell init-repository to only use a subset of modules master_201107072200
Alan Alpert [Wed, 6 Jul 2011 07:53:58 +0000 (17:53 +1000)]
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>
9 years agoinit-repository: replace obsolete staging remotes with gerrit remotes master_201107071707
Rohan McGovern [Thu, 7 Jul 2011 00:49:23 +0000 (10:49 +1000)]
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>
9 years agoEnable building of Qt Multimedia Kit by default. master_201107071237
Jonas Rabbe [Thu, 7 Jul 2011 01:01:03 +0000 (11:01 +1000)]
Enable building of Qt Multimedia Kit by default.

Change-Id: I9a74a43c71371fcb95f8b24c007ff95907a270a4
Reviewed-on: http://codereview.qt.nokia.com/1255
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 6 Jul 2011 05:02:50 +0000 (15:02 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodules.

9 years agoUpdated submodules.
Qt Submodule Update Automaton [Wed, 6 Jul 2011 04:41:38 +0000 (14:41 +1000)]
Updated submodules.

Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 5 Jul 2011 01:46:45 +0000 (11:46 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  README: improve build instructions

9 years agoREADME: improve build instructions
Rohan McGovern [Tue, 5 Jul 2011 01:37:55 +0000 (11:37 +1000)]
README: improve build instructions

Explain the stable build process first, followed by the bleeding-edge
build process.  Previously, the README exclusively recommended only the
process for building bleeding-edge of all modules together, which
frequently results in build failures.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 4 Jul 2011 00:57:41 +0000 (10:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Added qtfeedback module.

9 years agoAdded qtfeedback module.
Rohan McGovern [Mon, 4 Jul 2011 00:05:37 +0000 (10:05 +1000)]
Added qtfeedback module.

Not yet compiled by default.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Sat, 2 Jul 2011 04:22:57 +0000 (14:22 +1000)]
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 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.

9 years agoUpdate qttools (fix compile)
Rohan McGovern [Sat, 2 Jul 2011 04:17:04 +0000 (14:17 +1000)]
Update qttools (fix compile)

9 years agoqtwebkit: force separate_debug_info off
Rohan McGovern [Fri, 1 Jul 2011 05:21:02 +0000 (15:21 +1000)]
qtwebkit: force separate_debug_info off

This feature does not currently work with webkit's custom build script,
so disable it.

9 years agoUpdate qtwebkit (fix compile)
Rohan McGovern [Fri, 1 Jul 2011 01:16:25 +0000 (11:16 +1000)]
Update qtwebkit (fix compile)

9 years agoUpdate submodule reference to the latest.
Xizhi Zhu [Wed, 29 Jun 2011 17:00:22 +0000 (20:00 +0300)]
Update submodule reference to the latest.

9 years agoUpdate the head for qtsystems submodule.
Xizhi Zhu [Wed, 29 Jun 2011 13:40:45 +0000 (16:40 +0300)]
Update the head for qtsystems submodule.

9 years agoEnable the build for QtSystems by default.
Xizhi Zhu [Wed, 29 Jun 2011 12:13:58 +0000 (15:13 +0300)]
Enable the build for QtSystems by default.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 29 Jun 2011 07:12:41 +0000 (17:12 +1000)]
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 the QtMultimediaKit module.  Currently not built.

9 years agoAdd the QtMultimediaKit module. Currently not built.
Michael Goddard [Wed, 29 Jun 2011 05:16:16 +0000 (15:16 +1000)]
Add the QtMultimediaKit module.  Currently not built.

Reviewed-by: Rohan McGovern
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 28 Jun 2011 18:03:13 +0000 (04:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  QtDeclarative and QtDoc has moved into Gerrit

9 years agoQtDeclarative and QtDoc has moved into Gerrit
Marius Storm-Olsen [Tue, 28 Jun 2011 17:56:39 +0000 (12:56 -0500)]
QtDeclarative and QtDoc has moved into Gerrit

So, ensure init-repository point their 'gerrit' remotes to the
right locations

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Thu, 23 Jun 2011 07:59:27 +0000 (17:59 +1000)]
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 the QtSystems module.

9 years agoAdd the QtSystems module.
Xizhi Zhu [Thu, 23 Jun 2011 07:37:45 +0000 (10:37 +0300)]
Add the QtSystems module.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 21 Jun 2011 15:23:17 +0000 (01:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* '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.

9 years agoHave init-repository init nested submodule in qtdeclarative
Alan Alpert [Tue, 21 Jun 2011 06:54:22 +0000 (16:54 +1000)]
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
9 years agoAdd --berlin to set up WebKit mirror accordingly.
Friedemann Kleint [Tue, 21 Jun 2011 06:37:30 +0000 (08:37 +0200)]
Add --berlin to set up WebKit mirror accordingly.

Initial-patch-by: danimo <daniel.molkentin@nokia.com>
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 6 Jun 2011 07:24:30 +0000 (17:24 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Enable Sensors and Location API builds by default

9 years agoEnable Sensors and Location API builds by default
Alex [Mon, 6 Jun 2011 07:20:27 +0000 (17:20 +1000)]
Enable Sensors and Location API builds by default

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 1 Jun 2011 23:40:44 +0000 (09:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodule references to latest modules' content

9 years agoUpdated submodule references to latest modules' content
Rohan McGovern [Wed, 1 Jun 2011 23:37:59 +0000 (09:37 +1000)]
Updated submodule references to latest modules' content

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 1 Jun 2011 18:23:06 +0000 (04:23 +1000)]
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 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

9 years agoAdd option --codereview-user <username> to add Gerrit repos
Marius Storm-Olsen [Wed, 1 Jun 2011 18:16:09 +0000 (13:16 -0500)]
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.

9 years agoAdd 'staging' remote to repos which don't have a staging area
Marius Storm-Olsen [Wed, 1 Jun 2011 17:17:41 +0000 (12:17 -0500)]
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.

9 years agoRemove silly "goto" usage in foreach loop
Marius Storm-Olsen [Wed, 1 Jun 2011 16:02:53 +0000 (11:02 -0500)]
Remove silly "goto" usage in foreach loop

9 years agoMake all staging repos 'staging' remotes in submodules
Marius Storm-Olsen [Wed, 1 Jun 2011 16:00:33 +0000 (11:00 -0500)]
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'.

9 years agoDefault to --ignore-submodules for --nokia-developer/--brisbane
Marius Storm-Olsen [Wed, 1 Jun 2011 15:52:29 +0000 (10:52 -0500)]
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.

9 years agoqtbase-earth-staging is no longer used, so remove it
Marius Storm-Olsen [Wed, 1 Jun 2011 15:46:39 +0000 (10:46 -0500)]
qtbase-earth-staging is no longer used, so remove it

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 30 May 2011 13:32:57 +0000 (23:32 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Tells readers about qt5_tool

9 years agoTells readers about qt5_tool
mae [Mon, 30 May 2011 13:30:20 +0000 (15:30 +0200)]
Tells readers about qt5_tool

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 25 May 2011 13:49:54 +0000 (23:49 +1000)]
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 new SHA in the QtWebKit repository.

9 years agoUpdate to new SHA in the QtWebKit repository.
axis [Wed, 25 May 2011 13:43:12 +0000 (15:43 +0200)]
Update to new SHA in the QtWebKit repository.

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.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Sun, 22 May 2011 22:40:22 +0000 (08:40 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  Updated submodule references to latest modules' content
  Add new QtSensors module

9 years agoUpdated submodule references to latest modules' content
Eckhart Koppen [Fri, 20 May 2011 07:22:31 +0000 (10:22 +0300)]
Updated submodule references to latest modules' content

Updated to the current tip of each modules' master branch

9 years agoAdd new QtSensors module
Alex [Fri, 20 May 2011 06:16:33 +0000 (16:16 +1000)]
Add new QtSensors module

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Thu, 19 May 2011 16:30:47 +0000 (02:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* '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

9 years agoCorrect missing module_activeqt -> module_qtactiveqt
Marius Storm-Olsen [Thu, 19 May 2011 16:23:27 +0000 (11:23 -0500)]
Correct missing module_activeqt -> module_qtactiveqt

9 years agoFix --ignore-submodules in init-repository after refactoring
Marius Storm-Olsen [Thu, 19 May 2011 16:22:25 +0000 (11:22 -0500)]
Fix --ignore-submodules in init-repository after refactoring

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 18 May 2011 22:54:29 +0000 (08:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

* '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

9 years agoClean up inconsistent usage of `depends' in qt.pro
Rohan McGovern [Wed, 18 May 2011 22:48:24 +0000 (08:48 +1000)]
Clean up inconsistent usage of `depends' in qt.pro

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.

9 years agoThe qtlocation module depends on declarative too
Alex [Tue, 17 May 2011 05:46:21 +0000 (15:46 +1000)]
The qtlocation module depends on declarative too

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Mon, 16 May 2011 00:02:34 +0000 (10:02 +1000)]
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: mark as requiring perl 5.10
  init-repository: fixed `--help' with older Pod::Usage (OSX 10.6)

9 years agoinit-repository: mark as requiring perl 5.10
Rohan McGovern [Sun, 15 May 2011 23:54:36 +0000 (09:54 +1000)]
init-repository: mark as requiring perl 5.10

This script currently requires perl 5.10, so mark it as such.

9 years agoinit-repository: fixed `--help' with older Pod::Usage (OSX 10.6)
Rohan McGovern [Sun, 15 May 2011 23:52:17 +0000 (09:52 +1000)]
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.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Fri, 13 May 2011 02:11:11 +0000 (12:11 +1000)]
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

9 years agoUpdate to latest qtbase master.
Rohan McGovern [Fri, 13 May 2011 02:04:56 +0000 (12:04 +1000)]
Update to latest qtbase master.

9 years agoRemove platform-specific logic for qtactiveqt module.
Rohan McGovern [Fri, 13 May 2011 00:13:24 +0000 (10:13 +1000)]
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

9 years agoUpdated to latest version of qtrepotools.
axis [Thu, 12 May 2011 08:46:29 +0000 (10:46 +0200)]
Updated to latest version of qtrepotools.

It's necessary to make sure the git-qt-graft script works in a fresh
clone.

9 years agoupdate to the master branch in each submodules
Olivier Goffart [Wed, 11 May 2011 13:12:10 +0000 (15:12 +0200)]
update to the master branch in each submodules

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 11 May 2011 05:30:13 +0000 (15:30 +1000)]
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

9 years agoAdd commit-template support
Alex [Wed, 11 May 2011 05:24:41 +0000 (15:24 +1000)]
Add commit-template support

Reviewed-by: Rohan McGovern
9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Wed, 11 May 2011 02:39:23 +0000 (12:39 +1000)]
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

9 years agoqtlocation: add to SUBDIRS, but do not (yet) compile it by default
Rohan McGovern [Tue, 10 May 2011 23:05:46 +0000 (09:05 +1000)]
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

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 22:53:48 +0000 (08:53 +1000)]
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

9 years agoinit-repository: whitespace fix
Rohan McGovern [Tue, 10 May 2011 22:48:55 +0000 (08:48 +1000)]
init-repository: whitespace fix

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 09:11:40 +0000 (19:11 +1000)]
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

9 years agoMerge remote-tracking branch 'origin/master'
Olivier Goffart [Tue, 10 May 2011 09:04:50 +0000 (11:04 +0200)]
Merge remote-tracking branch 'origin/master'

9 years agoDocument how to install the grafts
Olivier Goffart [Tue, 10 May 2011 08:41:41 +0000 (10:41 +0200)]
Document how to install the grafts

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 08:20:36 +0000 (18:20 +1000)]
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

9 years agoadd .gitignore to qt5 root repo
Alex [Tue, 10 May 2011 08:14:55 +0000 (18:14 +1000)]
add .gitignore to qt5 root repo

Needed since in source builds create Makefiles.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Tue, 10 May 2011 05:33:13 +0000 (15:33 +1000)]
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

9 years agoAdd new qtlocation module
Alex [Tue, 10 May 2011 05:26:44 +0000 (15:26 +1000)]
Add new qtlocation module

The module is not yet enabled as various other repos need
to be in place first.

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Fri, 6 May 2011 07:27:05 +0000 (17:27 +1000)]
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

9 years agoinit-repository: avoid failure when combining `--force' and mirrors
Rohan McGovern [Fri, 6 May 2011 07:12:16 +0000 (17:12 +1000)]
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

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Fri, 6 May 2011 06:27:15 +0000 (16:27 +1000)]
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

9 years agoinit-repository: also create the staging remote for qt5
Rohan McGovern [Fri, 6 May 2011 05:42:10 +0000 (15:42 +1000)]
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

9 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging
Qt Continuous Integration System [Fri, 6 May 2011 05:21:39 +0000 (15:21 +1000)]
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.

9 years agoImprove maintainability of init-repository script.
Rohan McGovern [Fri, 6 May 2011 00:52:54 +0000 (10:52 +1000)]
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

9 years agoDon't fog the $mirror
Marius Storm-Olsen [Thu, 5 May 2011 18:09:17 +0000 (13:09 -0500)]
Don't fog the $mirror

WebKit mirror worked, but the general mirror was shadowed after
reorganizing code.

9 years agoMake sure -brisbane uses the 'internal' protocol
Marius Storm-Olsen [Thu, 5 May 2011 17:52:15 +0000 (12:52 -0500)]
Make sure -brisbane uses the 'internal' protocol

9 years agoAdd staging repos as 'staging' remote for each module
Marius Storm-Olsen [Thu, 5 May 2011 14:37:24 +0000 (09:37 -0500)]
Add staging repos as 'staging' remote for each module

Also fetch instead of clone, when repo is already populated.

Reviewed-by: axis
9 years agoMake printUsage more maintainable
Marius Storm-Olsen [Thu, 5 May 2011 01:14:50 +0000 (20:14 -0500)]
Make printUsage more maintainable

Reviewed-by: axis
9 years agoAdd -copy-objects option
Marius Storm-Olsen [Wed, 4 May 2011 21:07:30 +0000 (16:07 -0500)]
Add -copy-objects option

Reviewed-by: axis
9 years agoAdd -mirror and -mirror-webkit options
Marius Storm-Olsen [Wed, 4 May 2011 20:49:27 +0000 (15:49 -0500)]
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
9 years agoAdd -alternates option
Marius Storm-Olsen [Wed, 4 May 2011 19:44:57 +0000 (14:44 -0500)]
Add -alternates option

Reviewed-by: axis
9 years agoClean up options, add -http for public access
Marius Storm-Olsen [Wed, 4 May 2011 17:49:18 +0000 (12:49 -0500)]
Clean up options, add -http for public access

Reviewed-by: axis
9 years agoAdd -ignore-submodules option
Marius Storm-Olsen [Wed, 4 May 2011 17:45:05 +0000 (12:45 -0500)]
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
9 years agoRemove whole submodule section
Marius Storm-Olsen [Wed, 4 May 2011 17:41:59 +0000 (12:41 -0500)]
Remove whole submodule section

Not removing the whole section will leave residue
sections in the config file when reinitiating the
submodules

Reviewed-by: axis
9 years agoIllegal->Unknown and show usage on wrong options
Marius Storm-Olsen [Wed, 4 May 2011 17:40:38 +0000 (12:40 -0500)]
Illegal->Unknown and show usage on wrong options

Reviewed-by: axis
9 years agoCorrected typo.
axis [Thu, 5 May 2011 14:21:44 +0000 (16:21 +0200)]
Corrected typo.

Reviewed-by: Trust me
9 years agoRemoved qt3support.
axis [Thu, 5 May 2011 14:20:21 +0000 (16:20 +0200)]
Removed qt3support.

It will not be part of Qt5.

Reviewed-by: Marius Storm-Olsen
9 years agobuild system: use consistent target names for all modules
Rohan McGovern [Thu, 5 May 2011 05:20:33 +0000 (15:20 +1000)]
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
9 years agoDon't assume that commands succeed
Lincoln Ramsay [Thu, 28 Apr 2011 04:22:30 +0000 (14:22 +1000)]
Don't assume that commands succeed

Signed-off-by: axis <qt-info@nokia.com>
9 years agoWarn everywhere, not just Unix
Lincoln Ramsay [Thu, 28 Apr 2011 04:19:42 +0000 (14:19 +1000)]
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>
9 years agoUpdated to latest qtrepotools.
axis [Tue, 3 May 2011 10:53:13 +0000 (12:53 +0200)]
Updated to latest qtrepotools.

9 years agoAdded -ssh-protocol option for those with very restrictive firewalls.
axis [Tue, 3 May 2011 09:08:50 +0000 (11:08 +0200)]
Added -ssh-protocol option for those with very restrictive firewalls.

Reviewed by: Sergio Ahumada

9 years agoRemoved some debug prints and made sure that -no-update is respected.
axis [Thu, 28 Apr 2011 14:03:32 +0000 (16:03 +0200)]
Removed some debug prints and made sure that -no-update is respected.

Reviewed-by: Sergio Ahumada
9 years agoPrettified the usage screen.
axis [Thu, 28 Apr 2011 13:58:48 +0000 (15:58 +0200)]
Prettified the usage screen.

9 years agoAdd -brisbane-nokia-developer switch
Alan Alpert [Thu, 28 Apr 2011 06:02:39 +0000 (16:02 +1000)]
Add -brisbane-nokia-developer switch

Uses the local mirrors to save a few hours on initial checkouts.

Reviewed-by: axis
9 years agoUpdated to latest qtrepotools version.
axis [Thu, 28 Apr 2011 13:17:17 +0000 (15:17 +0200)]
Updated to latest qtrepotools version.