summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1963-681/+710
|\
| * Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-36/+68
| |\
| * \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1960-663/+671
| |\ \
| | * | Ran the script utils/normalizeOlivier Goffart2009-11-1859-662/+662
| | * | Fix html output of docsThomas Zander2009-11-181-1/+1
| | * | QMenu: make the menu follow its parent/caused layout directionThierry Bastian2009-11-181-1/+9
| * | | doc: Removed google search engine.Martin Smith2009-11-191-16/+0
| * | | French translation of designerBenjamin Poulain2009-11-181-0/+1
| * | | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-181-2/+38
| * | | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-182-1/+7
| |\ \ \
* | | | | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| |_|_|/ |/| | |
* | | | Fixed a few license checks in configure.exe.axis2009-11-181-13/+5
* | | | configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-181-26/+66
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1813-85/+235
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-172-10/+30
| |\ \ | | |/
| * | Fixed the closing of the A attribute at the start of each class pageThorbjørn Lindeijer2009-11-171-1/+1
| * | Fix crash on windows running while without gui. Should be 4.6 main.kh12009-11-161-1/+4
| * | fix linking following lrelease bootstrappingOswald Buddenhagen2009-11-131-0/+2
| * | do not (fail to) compile qdatastream into qmake and cetestOswald Buddenhagen2009-11-131-1/+0
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1312-126/+229
| |\ \
| * | | Assistant: Fix license header.ck2009-11-131-1/+1
| * | | fix cetest compilation following bootstrap changesOswald Buddenhagen2009-11-121-0/+1
| * | | Fixed border around classes table at the bottom-rightThorbjørn Lindeijer2009-11-101-4/+4
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1011-26/+75
| |\ \ \
| | * \ \ Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1019-275/+323
| | |\ \ \
| * | | | | uic/Designer: Use correct margin defaults for custom page-based containers.Friedemann Kleint2009-11-104-51/+62
| * | | | | build lrelease bootstrappedOswald Buddenhagen2009-11-107-12/+147
| * | | | | don't use qApp->arguments()Oswald Buddenhagen2009-11-101-16/+15
| | |/ / / | |/| | |
| * | | | 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' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-173-11/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-162-10/+30
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-1352-588/+894
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Fixed up qttracereplay and trace graphicsystem a bit.Gunnar Sletta2009-11-092-10/+30
| * | | | | Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | |/ / / | |/| | |