summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1019-275/+323
|\
| * Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
| * Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| * Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| * Fix some warnings.kh12009-11-091-3/+2
| * Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-10/+14
| * record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-063-20/+16
| * handle messages with ids (more) correctlyOswald Buddenhagen2009-11-064-52/+138
| * kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| * eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-066-48/+51
| * improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| * eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| * eliminate Translator::replace()Oswald Buddenhagen2009-11-063-17/+3
| * use right method to record new messagesOswald Buddenhagen2009-11-061-1/+1
| * do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| * remove unused TranslatorMessage::operator<()Oswald Buddenhagen2009-11-062-12/+0
| * cut code dupe ...Oswald Buddenhagen2009-11-061-12/+5
| * don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
* | Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-091-0/+11
|\ \
| * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Bradley T. Hughes2009-11-0917-164/+300
| |\ \
| * | | Added a -no-native-gestures option for configure.exeDenis Dzyubenko2009-11-061-0/+11
* | | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-099-19/+30
|\ \ \ \
| * | | | API review: *Count() are not pluralMarius Storm-Olsen2009-11-095-12/+23
| * | | | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-062-5/+5
| * | | | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-062-2/+2
| |/ / /
* | | | Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-4/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-041-4/+1
* | | | Merge commit 'ceteam/4.6' into 4.6Joerg Bornemann2009-11-091-3/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | cetest crashes and no helpful debugging providedKeith Isdale2009-11-061-3/+33
| | |/ | |/|
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-1/+10
|\ \ \
| * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-062-0/+5
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-051-1/+1
| | |\ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0415-43/+106
| | |\ \ \
| | * | | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-042-0/+5
| * | | | | Make declarative support in configure.exe auto.Martin Jones2009-11-061-1/+5
| | |_|/ / | |/| | |
* | | | | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
* | | | | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
* | | | | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
* | | | | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
* | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-0415-46/+107
|\| | | |
| * | | | eval: add key for the installer to grep for.Daniel Molkentin2009-11-041-1/+1
| | |/ / | |/| |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0413-24/+89
| |\ \ \
| | * \ \ Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-1/+1
| | |\ \ \
| | | * | | Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | * | | | Declarative building infrastructure.Warwick Allison2009-11-042-0/+13
| | * | | | qdoc updates for QMLWarwick Allison2009-11-0410-23/+75
| * | | | | qdoc: Fixed XHTML breakage caused by the Google search bar markup.David Boddie2009-11-031-2/+2
| |/ / / /
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-16/+14
| |\ \ \ \
| | * | | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14