summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-122-32/+2
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Benjamin Poulain2009-11-117-115/+198
| |\
| | * qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | * qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | * qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| * | Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| |/
* | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-1132-302/+420
|\ \ | |/
| * french translation of qt_helpPierre Rossi2009-11-102-1/+22
| * 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
| | | |/ | | |/|
* | | | Don't display "QML" for attached signals/methods.Michael Brasser2009-11-111-2/+2
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-112-0/+16
|\ \ \ \
| * | | | Add ability for viewer to slow down animations.Michael Brasser2009-11-102-0/+16
* | | | | Change stateChanged(State) signatures to have (QmlDebugWatch::State)Bea Lam2009-11-116-9/+9
|/ / / /
* | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-104-25/+41
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-0920-166/+306
|\ \ \ \ | |/ / /
| * | | 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-051-1/+5
| | | |_|/ / | | |/| | |
| * | | | | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2