Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp | ||||
| * | Make mkdist-webkit work from in-source builds | Simon Hausmann | 2009-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Explicitly unset QTDIR_build, to make sure we generate Makefiles with real rules to call the extra tools. Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> | ||||
* | | Changed WebKit import script to default to import from the trunk instead of 4.5 | Simon Hausmann | 2009-04-02 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust me | ||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 1 | -16/+19 |
|\ \ | |/ | |||||
| * | Simplify WebKit import script | Simon Hausmann | 2009-04-02 | 1 | -16/+19 |
| | | | | | | | | | | | | | | Don't require any arguments by default, get the repo path from git config and updated the default tag. Reviewed-by: Trust me | ||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1 | -0/+314 |
| | |||||
* | Fix up WebKit import from the trunk. | Simon Hausmann | 2009-04-01 | 1 | -1/+0 |
| | | | | | | acinclude.m4 has been moved to autotools/ Reviewed-by: Trust me | ||||
* | Fix WebKit import from the trunk. | Simon Hausmann | 2009-04-01 | 1 | -1/+0 |
| | | | | | | WebCore/plugins/wx is gone. Reviewed-by: Trust me | ||||
* | Exclude the autotools subdirectory when importing from WebKit trunk. | Simon Hausmann | 2009-04-01 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+314 |