aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Automaton2011-07-0610-0/+0
| | | | Change-Id: I8c39bb8a8961abf287ed3efaafce763b910bbae2
* README: improve build instructionsRohan McGovern2011-07-051-18/+97
| | | | | | | 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.
* Added qtfeedback module.Rohan McGovern2011-07-044-0/+11
| | | | Not yet compiled by default.
* Update qttools (fix compile)Rohan McGovern2011-07-021-0/+0
|
* qtwebkit: force separate_debug_info offRohan McGovern2011-07-011-0/+5
| | | | | This feature does not currently work with webkit's custom build script, so disable it.
* Update qtwebkit (fix compile)Rohan McGovern2011-07-011-0/+0
|
* Update submodule reference to the latest.Xizhi Zhu2011-06-2914-0/+0
|
* Update the head for qtsystems submodule.Xizhi Zhu2011-06-291-0/+0
|
* Enable the build for QtSystems by default.Xizhi Zhu2011-06-291-2/+0
|
* Add the QtMultimediaKit module. Currently not built.Michael Goddard2011-06-294-0/+11
| | | | Reviewed-by: Rohan McGovern
* QtDeclarative and QtDoc has moved into GerritMarius Storm-Olsen2011-06-281-0/+2
| | | | | So, ensure init-repository point their 'gerrit' remotes to the right locations
* Add the QtSystems module.Xizhi Zhu2011-06-234-0/+11
|
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-06-221-0/+24
|\ | | | | | | | | | | * '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.
| * Have init-repository init nested submodule in qtdeclarativeAlan Alpert2011-06-211-0/+5
| | | | | | | | | | | | | | qtdeclarative is expected to gain a nested submodule soon. This change makes init-repository checkout that submodule as well. Reviewed-by: Rohan McGovern
| * Add --berlin to set up WebKit mirror accordingly.Friedemann Kleint2011-06-211-0/+19
| | | | | | | | Initial-patch-by: danimo <daniel.molkentin@nokia.com>
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-06-061-4/+0
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Enable Sensors and Location API builds by default
| * Enable Sensors and Location API builds by defaultAlex2011-06-061-4/+0
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-06-0216-0/+0
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Updated submodule references to latest modules' content
| * Updated submodule references to latest modules' contentRohan McGovern2011-06-0216-0/+0
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-06-021-38/+84
|\| | | | | | | | | | | | | | | | | | | * '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
| * Add option --codereview-user <username> to add Gerrit reposMarius Storm-Olsen2011-06-011-18/+54
| | | | | | | | | | | | | | | | 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.
| * Add 'staging' remote to repos which don't have a staging areaMarius Storm-Olsen2011-06-011-9/+21
| | | | | | | | | | | | | | This makes it simpler to do git submodule foreach commands, since you don't need to worry about the repos without any staging area.
| * Remove silly "goto" usage in foreach loopMarius Storm-Olsen2011-06-011-4/+2
| |
| * Make all staging repos 'staging' remotes in submodulesMarius Storm-Olsen2011-06-011-23/+20
| | | | | | | | | | | | | | This allows us to more easily use git submodule foreach since you can just refer to staging for the repo, like you would 'origin'.
| * Default to --ignore-submodules for --nokia-developer/--brisbaneMarius Storm-Olsen2011-06-011-0/+4
| | | | | | | | | | | | | | 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.
| * qtbase-earth-staging is no longer used, so remove itMarius Storm-Olsen2011-06-011-1/+0
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-301-3/+13
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Tells readers about qt5_tool
| * Tells readers about qt5_toolmae2011-05-301-3/+13
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-251-0/+0
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Update to new SHA in the QtWebKit repository.
| * Update to new SHA in the QtWebKit repository.axis2011-05-251-0/+0
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-2317-0/+11
|\| | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Updated submodule references to latest modules' content Add new QtSensors module
| * Updated submodule references to latest modules' contentEckhart Koppen2011-05-2013-0/+0
| | | | | | | | Updated to the current tip of each modules' master branch
| * Add new QtSensors moduleAlex2011-05-204-0/+11
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-202-2/+2
|\| | | | | | | | | | | * '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
| * Correct missing module_activeqt -> module_qtactiveqtMarius Storm-Olsen2011-05-191-1/+1
| |
| * Fix --ignore-submodules in init-repository after refactoringMarius Storm-Olsen2011-05-191-1/+1
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-191-3/+3
|\| | | | | | | | | | | * '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
| * Clean up inconsistent usage of `depends' in qt.proRohan McGovern2011-05-191-3/+3
| | | | | | | | | | | | 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.
| * The qtlocation module depends on declarative tooAlex2011-05-171-1/+1
| |
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-161-3/+6
|\| | | | | | | | | | | * '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)
| * init-repository: mark as requiring perl 5.10Rohan McGovern2011-05-161-0/+1
| | | | | | | | This script currently requires perl 5.10, so mark it as such.
| * init-repository: fixed `--help' with older Pod::Usage (OSX 10.6)Rohan McGovern2011-05-161-3/+5
| | | | | | | | | | | | 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.
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-1316-1/+1
|\| | | | | | | | | | | | | | | * '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
| * Update to latest qtbase master.Rohan McGovern2011-05-131-0/+0
| |
| * Remove platform-specific logic for qtactiveqt module.Rohan McGovern2011-05-132-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Updated to latest version of qtrepotools.axis2011-05-121-0/+0
| | | | | | | | | | It's necessary to make sure the git-qt-graft script works in a fresh clone.
| * update to the master branch in each submodulesOlivier Goffart2011-05-1114-0/+0
|/
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-112-0/+21
|\ | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: Add commit-template support
| * Add commit-template supportAlex2011-05-112-0/+21
| | | | | | | | Reviewed-by: Rohan McGovern
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-stagingQt Continuous Integration System2011-05-111-1/+3
|\| | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging: qtlocation: add to SUBDIRS, but do not (yet) compile it by default