summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-095-8/+152
|\
| * Carbon: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-4/+13
| * Cocoa: Native filedialog does not apply filters on app-bundlesRichard Moe Gustavsen2010-03-091-3/+7
| * Improve performance of QTimer::singleShotMarkus Goetz2010-03-092-1/+25
| * Add a benchmark comparing single shot timer with invokeMethodMarkus Goetz2010-03-092-0/+107
* | doc: Fixed several qdoc errors.Martin Smith2010-03-0917-60/+54
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-09102-3301/+4055
|\
| * use Qt's private mac functions, reduce code redundancyLorn Potter2010-03-091-43/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-08102-3267/+4051
| |\
| | * Merge remote branch 'origin/4.7' into 4.7Thiago Macieira2010-03-0815-475/+211
| | |\
| | * | Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| | * | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| | * | Modify the XML test suite not to use non-characters.Thiago Macieira2010-03-085-5/+5
| | * | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-082-8/+10
| | * | Doc: mark methods as internal (as they were in previous releases)Volker Hilsheimer2010-03-081-0/+10
| | * | Doc: add image for Qt Quick to "What's New" page.Volker Hilsheimer2010-03-082-0/+2
| | * | qdoc: Clear a static multimap after each qdocconf file.Martin Smith2010-03-083-0/+11
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-08160-3075/+4266
| | |\ \
| | | * | Fixed mouse wheel handling in scrollareas.Denis Dzyubenko2010-03-081-0/+1
| | | * | Added two missing keys for X11Denis Dzyubenko2010-03-083-0/+7
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0880-3224/+3985
| | | |\ \
| | | | * | Carbon: usage of menu bars can cause exceptions to be thrownRichard Moe Gustavsen2010-03-081-1/+1
| | * | | | qdoc: Added some debug output to track down a crashMartin Smith2010-03-081-2/+2
| | | |/ / | | |/| |
| | * | | Mac: compile fixRichard Moe Gustavsen2010-03-081-1/+2
| | * | | Fix buildHarald Fernengel2010-03-081-1/+1
| | * | | JPEG plugin: Use switch() instead of if()Markus Goetz2010-03-081-11/+22
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-07170-2570/+5044
| | |\ \ \
| | | * | | Avoid conversion to/from QChar in the cn codec to unicodeBenjamin Poulain2010-03-071-11/+11
| | | * | | Avoid memory allocations in conversion from Gb2312/Gb18030 to unicodeBenjamin Poulain2010-03-071-14/+37
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0774-3191/+3917
| | | |\ \ \
| | * | | | | don't try to build corewlan plugin when corewlan was not found at configureLorn Potter2010-03-071-1/+1
| | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-0687-3237/+12470
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0574-3190/+3916
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-0574-3190/+3916
| | | | |\ \ \ \
| | | | | * | | | fixed treatment of zlib on Mac when crossbuildingMark Brand2010-03-051-1/+1
| | | | | * | | | Partial overloading support for qdbus cli tool.Kimmo Kotajärvi2010-03-051-84/+91
| | | | | * | | | Allow empty authority in QUrl::setAuthority as per docs.Kimmo Kotajärvi2010-03-051-1/+5
| | | | | * | | | Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.Kimmo Kotajärvi2010-03-051-0/+9
| | | | | * | | | fixed case of GL include directoryMark Brand2010-03-051-1/+1
| | | | | * | | | check in MAC_APPLICATION_MENU translationsOswald Buddenhagen2010-03-0511-0/+253
| | | | | * | | | Re-generate the Unicode tables after updates to the program that generates themThiago Macieira2010-03-052-1842/+1907
| | | | | * | | | Fix the code after merge: DerivedNormalizationProps has two or more columnsThiago Macieira2010-03-051-1/+1
| | | | | * | | | add some usefull definitions to qunicodetables_p.hRitt Konstantin2010-03-053-19/+18
| | | | | * | | | qchar.cpp: fix identationRitt Konstantin2010-03-051-120/+123
| | | | | * | | | finish last commitRitt Konstantin2010-03-051-3/+4
| | | | | * | | | prefer DerivedNormalizationProps.txt over CompositionExclusions.txtRitt Konstantin2010-03-052-208/+28
| | | | | * | | | improve error reporting a bit moreRitt Konstantin2010-03-051-1/+8
| | | | | * | | | improve error reportingRitt Konstantin2010-03-051-0/+8
| | | | | * | | | fix incorect conditionRitt Konstantin2010-03-051-1/+1
| | | | | * | | | check if string to int conversions were done w/o errorsRitt Konstantin2010-03-051-3/+18