summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Update QML doc style.Michael Brasser2009-09-011-29/+9
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3127-351/+351
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311121-14577/+14577
|\
| * Update tech preview license header.Jason McDonald2009-08-311114-14486/+14486
* | Added doc link to point to Assistant doc table of collection file values.Peter Yard2009-08-311-0/+8
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-284-4/+4
|\ \ | |/
| * Add missing license headers.Jason McDonald2009-08-285-16/+198
* | doc: Change some uses of \reimp to \internal.Martin Smith2009-08-281-6/+6
* | Fix some missing and duplicated license headers.Jason McDonald2009-08-274-27/+65
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-253-4/+8
|\ \
| * | Fixed compile of cetest.Rohan McGovern2009-08-253-4/+8
* | | Restore old behaviour if qdoc3 is built without $QT_BUILD_TREE set.Jason McDonald2009-08-251-1/+1
|/ /
* | Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-1/+1
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-243-9/+2
|\ \ | |/
| * Designer Preview window title not setKeith Isdale2009-08-241-0/+1
| * remove dead codeOswald Buddenhagen2009-08-141-7/+0
| * remove withdrawn attributes (and fix syntax)Oswald Buddenhagen2009-08-141-9/+0
| * Update URL for Qt FTP site.Jason McDonald2009-08-111-1/+1
| * Update URL of online documentation.Jason McDonald2009-08-114-5/+5
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-1110-49/+64
| * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-117-13/+13
| * Update license headers.Jason McDonald2009-08-111109-1109/+1109
| * Doc: Our webdomain has changed.Volker Hilsheimer2009-08-1012-14/+14
| * remove useles QT += networkOswald Buddenhagen2009-08-071-2/+1
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-2/+2
| * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-1/+1
* | Designer: Disable the Button group property editor for good.Friedemann Kleint2009-08-241-1/+1
* | Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-243-40/+1
* | Use relative paths in DESTDIR in qdoc3.pro.Thiago Macieira2009-08-211-1/+1
* | Merge commit 'qt/master'Jason Barron2009-08-214-8/+14
|\ \
| * | qdoc: Moved javascripts for search box from header to footer.Martin Smith2009-08-211-6/+6
| * | qdoc: Redesigned the Class and Function Documentation page.Martin Smith2009-08-212-2/+7
| * | move qdoc3 binary to bin, so we can use it for Qt Creator without hacks.Daniel Molkentin2009-08-211-0/+1
* | | Merge commit 'qt/master'Jason Barron2009-08-218-11/+47
|\ \ \ | |/ /
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-203-9/+5
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-207-28/+167
| |\ \ \
| * | | | make Qt Designer compile when Qt is configured with -no-scriptKent Hansen2009-08-197-3/+22
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-1815-121/+1904
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-176-28/+72
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'qtscript-jsc-backend-configure' of git@scm.dev.nokia.troll.no:q...Kent Hansen2009-08-171-2/+2
| |\ \ \ \ \ \
| | * | | | | | Make script and scripttools autodetect, like webkitMarius Storm-Olsen2009-08-171-2/+2
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-146-9/+14
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'qtscript-jsc-backend-configure' of git@scm.dev.nokia.troll.no:q...Kent Hansen2009-08-141-3/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Make Script and ScriptTools availability the same as WebKitMarius Storm-Olsen2009-08-141-3/+1
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-126-21/+38
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-121151-1217/+1293
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Add -script/-no-script option to configure.exe as wellMarius Storm-Olsen2009-08-111-5/+24
* | | | | | | | | | Merge commit 'qt/master'Jason Barron2009-08-2010-37/+172
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Removed warning about signal conflicts.Friedemann Kleint2009-08-201-4/+0
| * | | | | | | | | Designer: Tab widget / stacked widget / tool box pages got localized names.Friedemann Kleint2009-08-201-3/+3