summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-05-1164-12676/+0
|\
| * Clean up old Qt 3 stuff.Thiago Macieira2009-05-1164-12676/+0
| | | | | | | | Reviewed-By: TrustMe
* | Slim down WebKit import a bit moreSimon Hausmann2009-05-071-0/+1
| | | | | | | | | | | | Remove v8 JS bindings. Reviewed-by: Trust me
* | Reduced the number of files in the WebKit importSimon Hausmann2009-05-061-0/+6
| | | | | | | | | | | | Exclude chromium files from the import. Reviewed-by: Trust me
* | Fixed import of WebKit trunkSimon Hausmann2009-05-041-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/qtSimon Hausmann2009-04-232-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 McDonald2009-04-221-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 McDonald2009-04-221-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/qtSimon Hausmann2009-04-021-1/+1
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-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.5Simon Hausmann2009-04-021-1/+1
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-16/+19
|\ \ | |/
| * Simplify WebKit import scriptSimon Hausmann2009-04-021-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 Knoll2009-03-23214-0/+97570
|
* Fix up WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | acinclude.m4 has been moved to autotools/ Reviewed-by: Trust me
* Fix WebKit import from the trunk.Simon Hausmann2009-04-011-1/+0
| | | | | | WebCore/plugins/wx is gone. Reviewed-by: Trust me
* Exclude the autotools subdirectory when importing from WebKit trunk.Simon Hausmann2009-04-011-1/+1
| | | | Reviewed-by: Trust Me
* introduce QT_NO_NETWORKDISKCACHEPeter Hartmann2009-03-251-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 Knoll2009-03-23214-0/+97599