summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-207-28/+167
|\
| * Make the license test pass.Frans Englich2009-08-197-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
|\ \ | |/
| * optimize getToken(), part 2: avoid QString::append()Oswald Buddenhagen2009-08-171-24/+66
| * consolidate some variablesOswald Buddenhagen2009-08-171-70/+66
| * optimize getToken(), part 1Oswald Buddenhagen2009-08-171-29/+47
| * optimize getChar()Oswald Buddenhagen2009-08-171-7/+9
| * Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-172-2/+2
| * Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-1712-28/+1753
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-176-28/+72
|\ \ | |/
| * Add some more exception around to clucene index writer.kh12009-08-172-20/+60
| * qdoc: Fixed the bug that made reporting NOTIFY signals not work.Martin Smith2009-08-173-3/+9
| * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-5/+3
* | 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
|\ \ \ | | |/ | |/|
| * | qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
| * | Assistant compiles on Windows CEThomas Hartmann2009-08-132-0/+8
| * | Fix qmake warningsPrasanth Ullattil2009-08-132-4/+0
| * | qdoc: Disabled reporting the NOTIFY signal until I know what it broke.Martin Smith2009-08-131-3/+2
* | | 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
|\ \ \ | | |/ | |/|
| * | qdoc: Changed the scripts for the google search boxMartin Smith2009-08-121-1/+6
| * | qdoc: Added google CSE to each page.Martin Smith2009-08-121-11/+18
| * | Update obsolete license headers.Jason McDonald2009-08-125-10/+15
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-b...Kent Hansen2009-08-121151-1217/+1293
|\ \ \ | |/ / | | / | |/ |/|
| * Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-1210-11/+11
| * Surrounded a string const with QString() to get snippet to work.Martin Smith2009-08-121-0/+1
| * Update obsolete URL's in code and docs.Jason McDonald2009-08-121-1/+1
| * Update references to online documentation.Jason McDonald2009-08-124-5/+5
| * Eliminate last mentions of "Qt Software".Jason McDonald2009-08-122-2/+2
| * Update URL's to use new domain.Jason McDonald2009-08-1219-27/+27
| * Update contact URL in license headers.Jason McDonald2009-08-121134-1134/+1134
| * Tr-Fixes in Qt Designer.Friedemann Kleint2009-08-113-7/+9
| * Introducing icon theme supportJens Bache-Wiig2009-08-109-17/+75
| * Linguist: Fixed spehling error.Friedemann Kleint2009-08-104-10/+10
| * qdoc: List the NOTIFY signal function in the property doc.Martin Smith2009-08-105-3/+18
* | Add -script/-no-script option to configure.exe as wellMarius Storm-Olsen2009-08-111-5/+24
|/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-1013-95/+148
|\
| * Make checksdk give a nonzero exit code when it's asked for an SDK whichRohan McGovern2009-08-101-2/+2
| * nicer way to deal with missing support for template class friendsOswald Buddenhagen2009-08-062-4/+13
| * Designer: Cannot edit menus in an RTL form when Designer uses LTR.Friedemann Kleint2009-08-069-62/+114
| * qdoc: Don't include internal or private classes in annotated lists.Martin Smith2009-08-061-1/+2
| * qdoc: Fixed a Windows crash in HtmlGenerator::generateCompactList().Martin Smith2009-08-061-26/+17
* | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-104-4/+4
|/
* Merge commit 'origin/4.5'Rohan McGovern2009-08-062-0/+6
|\
| * Fix compilation when QT_NO_HTTP is definedMarkus Goetz2009-08-052-0/+6
* | cetcpsync: unneeded error message removedJoerg Bornemann2009-08-051-1/+2