Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Small fix for the WebKit import from the trunk. | Simon Hausmann | 2009-06-29 | 1 | -1/+1 |
| | | | | Don't try to remove the symbian/ directory, it doesn't exist anymore. | ||||
* | Update WebKit to today's snapshot, after receiving a green light from pulse. | Simon Hausmann | 2009-06-29 | 1 | -1/+1 |
| | |||||
* | Update src/3rdparty/webkit to a new snapshot. | Simon Hausmann | 2009-06-24 | 1 | -1/+1 |
| | |||||
* | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 1 | -2/+2 |
| | | | | Reviewed-by: Trust Me | ||||
* | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 41 | -86/+86 |
|\ | |||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 41 | -86/+86 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Lock down src/3rdparty/webkit to a specific tag. | Simon Hausmann | 2009-06-15 | 1 | -1/+9 |
| | | | | | | | | | | | | | | Also removed some unused files from the import. Reviewed-by: Tor Arne Reviewed-by: Kent Hansen | ||||
* | | small refactoring to reduce memory usage of static data | Thierry Bastian | 2009-06-09 | 1 | -3/+3 |
| | | |||||
* | | Make sure that indexes in the autogenerated locale info do not exceed 16bit ↵ | Denis Dzyubenko | 2009-06-08 | 1 | -1/+11 |
| | | | | | | | | | | | | range. Reviewed-By: TrustMe | ||||
* | | Fix webkit import from the trunk. | Simon Hausmann | 2009-06-03 | 1 | -5/+1 |
| | | | | | | | | | | | | Updated the file list, the SVG filters have been removed. Reviewed-by: Trust me | ||||
* | | Speed up util/normalize dir iteration | Matteo Bertozzi | 2009-05-27 | 1 | -13/+9 |
| | | | | | | | | | | | | | | Use QDirIterator to speed up iterating over directories in normalize util. Reviewed-by: Eskil | ||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-05-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix webkit import on cygwin and gentoo | Simon Hausmann | 2009-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Use .XXXXX in mktemp. Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com> | ||||
* | | Merge branch '4.5' | Thiago Macieira | 2009-05-11 | 64 | -12676/+0 |
|\ \ | |/ | |||||
| * | Clean up old Qt 3 stuff. | Thiago Macieira | 2009-05-11 | 64 | -12676/+0 |
| | | | | | | | | Reviewed-By: TrustMe | ||||
* | | Slim down WebKit import a bit more | Simon Hausmann | 2009-05-07 | 1 | -0/+1 |
| | | | | | | | | | | | | Remove v8 JS bindings. Reviewed-by: Trust me | ||||
* | | Reduced the number of files in the WebKit import | Simon Hausmann | 2009-05-06 | 1 | -0/+6 |
| | | | | | | | | | | | | Exclude chromium files from the import. Reviewed-by: Trust me | ||||
* | | Fixed import of WebKit trunk | Simon Hausmann | 2009-05-04 | 1 | -2/+0 |
| | | | | | | | | | | | | Don't try to remove scons files that don't exist anymore. Reviewed-by: Trust me | ||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-23 | 2 | -7/+7 |
|\ \ | |/ | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h | ||||
| * | Make all qdoc footers consistent with the main Qt docs. | Jason McDonald | 2009-04-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Use the same copyright message in all doc footers. As a side-effect, this change also removes most of the remaining THISYEAR placeholders, and fixes some footers that try to use 110% of the page width. Reviewed-by: Thiago | ||||
| * | Make make_qfeatures_dot_h script generate the current copyright header. | Jason McDonald | 2009-04-22 | 1 | -5/+36 |
| | | | | | | | | | | | | | | Update the script, and update the generated file. Reviewed-by: Thiago Reviewed-by: Paul Olav Tvete | ||||
* | | 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 | 214 | -0/+97570 |
| | |||||
* | 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 | ||||
* | introduce QT_NO_NETWORKDISKCACHE | Peter Hartmann | 2009-03-25 | 1 | -6/+38 |
| | | | | | | | | | | that was necessary because when defining QT_NO_TEMPORARYFILE there would be a compile error in qnetworkdisccache.h, which uses a QTemporaryFile. Moreover, the script "make_qfeatures_dot_h" was updated to generate LGPL license header. Reviewed-by: Paul Task-number: 248807 | ||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 214 | -0/+97599 |