lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,431 Commits 118 Branches 270 Tags
68e8df875d26ab2972d20d987e29ef990dbfb7e8
Commit Graph

5431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Continuous Integration System
817c42a97a 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
 2011-05-30 23:32:57 +10:00
mae
a4694332c8 Tells readers about qt5_tool 2011-05-30 15:30:20 +02:00
Qt Continuous Integration System
250b6004e6 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.
 2011-05-25 23:49:54 +10:00
axis
dcd1c8d466 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.
 2011-05-25 15:48:59 +02:00
Qt Continuous Integration System
12ffad0bb3 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
 2011-05-23 08:40:22 +10:00
Eckhart Koppen
4439175f10 Updated submodule references to latest modules' content 
Updated to the current tip of each modules' master branch
 2011-05-20 10:22:31 +03:00
Alex
dd45bb2735 Add new QtSensors module 2011-05-20 16:16:33 +10:00
Qt Continuous Integration System
3660ebd9ef 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
 2011-05-20 02:30:47 +10:00
Marius Storm-Olsen
25d7376943 Correct missing module_activeqt -> module_qtactiveqt 2011-05-19 11:23:27 -05:00
Marius Storm-Olsen
66bd89af42 Fix --ignore-submodules in init-repository after refactoring 2011-05-19 11:22:25 -05:00
Qt Continuous Integration System
04dd09b17f 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
 2011-05-19 08:54:29 +10:00
Rohan McGovern
5360908e14 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.
 2011-05-19 08:48:24 +10:00
Alex
8f7c4684fe The qtlocation module depends on declarative too 2011-05-17 15:46:21 +10:00
Qt Continuous Integration System
0bd5d8134f 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)
 2011-05-16 10:02:34 +10: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
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