summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* updates french phrasebookPierre Rossi2009-11-231-0/+36
* Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-236-28/+44
|\
| * don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| * fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| * fix encodings, take NOswald Buddenhagen2009-11-203-17/+21
| * don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
| * fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
* | revert QT -= xml nonsenseOswald Buddenhagen2009-11-201-2/+0
* | QT —= xml for bootstrapped lreleaseOswald Buddenhagen2009-11-201-0/+2
* | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 i...Simon Hausmann2009-11-201-1/+1
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1963-681/+710
| |\ \
| * | | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
* | | | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-191-2/+5
| |_|/ |/| |
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1966-718/+785
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-36/+68
| |\ \ | | |/
| | * 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 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
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-173-11/+31
| | |\ \ | | | |/
| | * | qttracerelay: Handle wrong command line parametersMarkus Goetz2009-11-171-0/+6
| | * | configure.exe: fix when configured with -openssl-linkedPeter Hartmann2009-11-171-1/+1
* | | | Properly return the absolute file path for help files.kh12009-11-191-11/+13
|/ / /
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-172-10/+30
|\ \ \ | | |/ | |/|
| * | 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
| | |/ | |/|
* | | 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
|\ \ \ | |/ /
| * | 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
| * | french translation of qt_helpPierre Rossi2009-11-112-1/+22
| * | Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-111-9/+10
| * | Assistant: Add missing initialization of member variable.qt-info@nokia.com2009-11-111-0/+1
| * | Fix Assistant losing font settings across invocations.kh12009-11-112-62/+67
| * | Fix some warnings.kh12009-11-111-3/+2
| * | Assistant: Fix bugs related to setting the current filter remotely.qt-info@nokia.com2009-11-113-10/+14