summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-2910-10/+204
|\
| * Remove QGVLauncher from the WebKit import.Simon Hausmann2009-09-241-0/+3
| * Update mkdist-webkit script to use latest tagJocelyn Turcotte2009-09-241-1/+1
| * Fixes for WebKit trunk importSimon Hausmann2009-09-241-1/+5
| * Added helper script to import src/3rdparty/javascriptcoreSimon Hausmann2009-09-221-0/+187
| * Fixed license headers in /util/qlalr.Kim Motoyoshi Kalland2009-09-218-8/+8
* | Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-182-13/+24
|\ \ | |/
| * Removed JavaScriptCore.pro file that shouldn't be there.Simon Hausmann2009-09-181-0/+1
| * Update list of excluded files in mkdit-webkit script.Jocelyn Turcotte2009-09-181-0/+5
| * Update default tag name in mkdist-webkit script.Jocelyn Turcotte2009-09-181-1/+1
| * have make_qfeatures_dot_h use QTSRCDIR if defined, update qfeatures.hJeremy Katz2009-09-161-12/+17
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1573-312/+313
|\ \ | |/
| * Update license headers embedded in code.Jason McDonald2009-09-093-0/+3
| * Update license headers again.Jason McDonald2009-09-0973-312/+310
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-087-2/+289
|\ \ | |/
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-047-2/+289
| |\
| | * Add license headers to .l files.Jason McDonald2009-09-042-0/+82
| | * Add license headers to python codeJason McDonald2009-09-044-2/+166
| | * Pedantic fixes for license headers.Jason McDonald2009-09-041-0/+41
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-041-0/+1
|\ \ \ | |/ /
| * | QCSSScanner: really skip toLower() when tokenizing the input.Ariya Hidayat2009-09-031-0/+1
* | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0311-18/+336
|\ \ \ | |/ /
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-0310-16/+335
| |\ \ | | |/
| | * Add missing license headersJason McDonald2009-09-037-0/+281
| | * Update license headers.Jason McDonald2009-09-021-3/+0
| | * Update license text.Jason McDonald2009-09-021-13/+13
| | * Assorted license header fixes.Jason McDonald2009-09-021-0/+41
| * | CSS parser speed-up: skip the need to call toLower().Ariya Hidayat2009-09-031-2/+1
* | | CompileAaron Kennedy2009-09-033-6/+6
|/ /
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3111-143/+143
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3147-676/+676
|\ \ | |/
| * Update tech preview license header.Jason McDonald2009-08-3144-637/+637
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-283-4/+3
|\ \ | |/
| * Add missing license headers.Jason McDonald2009-08-283-1/+120
| * Add missing license headers.Jason McDonald2009-08-281-0/+41
* | Fix some missing and duplicated license headers.Jason McDonald2009-08-271-0/+41
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-242-10/+37
|\ \ | |/
| * Update embedded copyright headers.Jason McDonald2009-08-124-30/+84
| * Update URL of online documentation.Jason McDonald2009-08-111-1/+1
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-1117-20/+19
| * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-112-3/+3
| * Update license headers.Jason McDonald2009-08-1140-65/+65
* | Merge commit 'qt/master'Jason Barron2009-08-2010-8/+127
|\ \
| * | Make the license test pass.Frans Englich2009-08-1910-8/+127
* | | Changed names and URLs to reflect name change.axis2009-08-1914-14/+14
* | | Merge commit 'qt/master'Jason Barron2009-08-181-2/+5
|\ \ \ | |/ /
| * | Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| * | Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
* | | Merge commit 'qt/master'Jason Barron2009-08-1344-131/+155
|\ \ \ | |/ /
| * | Fix WebKit import from the trunk (part 2)Simon Hausmann2009-08-121-1/+27