lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,311 Commits 120 Branches 272 Tags
156b753fc57982fdfface8b0b15f29d838bfb167
Commit Graph

6311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan McGovern
3be6eb3042 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>
 2011-07-07 09:03:16 +02:00
Jonas Rabbe
aef0d33e30 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>
 2011-07-07 03:06:29 +02:00
Qt Continuous Integration System
25f4329e0b 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.
 2011-07-06 15:02:50 +10:00
Qt Submodule Update Automaton
1eb86ca9f2 Updated submodules. 
Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2
 2011-07-06 14:41:38 +10:00
Qt Continuous Integration System
104bf98bd6 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
 2011-07-05 11:46:45 +10:00
Rohan McGovern
4d0c303024 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.
 2011-07-05 11:37:55 +10:00
Qt Continuous Integration System
3e42e0076e 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.
 2011-07-04 10:57:41 +10:00
Rohan McGovern
1225ee9c51 Added qtfeedback module. 
Not yet compiled by default.
 2011-07-04 10:05:37 +10:00
Qt Continuous Integration System
2e0f534cc4 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.
 2011-07-02 14:22:57 +10:00
Rohan McGovern
0d814147eb Update qttools (fix compile) 2011-07-02 14:17:04 +10:00
Rohan McGovern
b397b26b58 qtwebkit: force separate_debug_info off 
This feature does not currently work with webkit's custom build script,
so disable it.
 2011-07-01 15:21:02 +10:00
Rohan McGovern
868c76dc4a Update qtwebkit (fix compile) 2011-07-01 11:16:25 +10:00
Xizhi Zhu
4df43a509b Update submodule reference to the latest. 2011-06-29 20:00:22 +03:00
Xizhi Zhu
b034b3c4e4 Update the head for qtsystems submodule. 2011-06-29 16:40:45 +03:00
Xizhi Zhu
908badc6ac Enable the build for QtSystems by default. 2011-06-29 15:13:58 +03:00
Qt Continuous Integration System
ed3e3cf5d3 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.
 2011-06-29 17:12:41 +10:00
Michael Goddard
d6abcb1b7e Add the QtMultimediaKit module. Currently not built. 
Reviewed-by: Rohan McGovern
 2011-06-29 16:32:18 +10:00
Qt Continuous Integration System
d2c7aeee7e 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
 2011-06-29 04:03:13 +10:00
Marius Storm-Olsen
8879542b22 QtDeclarative and QtDoc has moved into Gerrit 
So, ensure init-repository point their 'gerrit' remotes to the
right locations
 2011-06-28 12:56:39 -05:00
Qt Continuous Integration System
2ac5c82153 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.
 2011-06-23 17:59:27 +10:00
Xizhi Zhu
f7225b87a9 Add the QtSystems module. 2011-06-23 10:38:59 +03:00
Qt Continuous Integration System
f899887738 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.
 2011-06-22 01:23:17 +10:00
Alan Alpert
8484878f25 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
 2011-06-21 16:54:22 +10:00
Friedemann Kleint
d8b73a8ba0 Add --berlin to set up WebKit mirror accordingly. 
Initial-patch-by: danimo <daniel.molkentin@nokia.com>
 2011-06-21 08:44:31 +02:00
Qt Continuous Integration System
865e04b617 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
 2011-06-06 17:24:30 +10:00
Alex
680b0afee5 Enable Sensors and Location API builds by default 2011-06-06 17:20:27 +10:00
Qt Continuous Integration System
80c36e4d62 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
 2011-06-02 09:40:44 +10:00
Rohan McGovern
c685702156 Updated submodule references to latest modules' content 2011-06-02 09:37:59 +10:00
Qt Continuous Integration System
6b04bb249b 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
 2011-06-02 04:23:06 +10:00
Marius Storm-Olsen
c6f334f766 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.
 2011-06-01 13:16:09 -05:00
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