summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
* Autotest: to be sure, generate .cpp files with the proper headers tooThiago Macieira2010-02-031-17/+40
* Fix regression in clipped icon text on WindowsJens Bache-Wiig2010-01-132-1/+18
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-037-19/+53
|\
| * Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-031-0/+9
| |\
| | * QTcpServer: Clarify thread affinity of incoming QTcpSocketMarkus Goetz2010-02-031-0/+9
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-031-4/+4
| |\ \ | | |/
| | * Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.Bastian Bense2010-02-031-4/+4
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-0347-246/+8355
| |\ \ | | |/
| | * Updated my changelog entryDenis Dzyubenko2010-02-031-3/+8
| | * QNAM HTTP: Fix bug related to re-sending a requestMarkus Goetz2010-02-033-10/+27
| | * Adding my changes.Carlos Manuel Duclos Vergara2010-02-031-1/+4
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-02291-1634/+5050
| |\ \
| * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-2266-224/+700
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-201-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-201-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-209-24/+70
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-20285-3483/+5402
| |\ \ \ \ \ \ \
| * | | | | | | | Remove erroneous warning in QFileInfo::absolutePath()Andreas Kling2010-01-121-2/+5
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0365-156/+21087
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revert to fromUtf16() usage in fromWCharArray()Oswald Buddenhagen2010-02-031-1/+1
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0365-156/+21087
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0265-156/+21087
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Assistant examples: Fix missing QLatin1String.ck2010-02-021-1/+1
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6ck2010-02-0221-15/+21099
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Added Czech translations.Pavel Fric2010-02-0210-1/+20910
| | | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0254-154/+174
| | | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Webkit: Fix missing namespace.ck2010-02-021-0/+2
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | | * | | | | | | | | | qmake: fix warningsOswald Buddenhagen2010-02-016-24/+27
| | | * | | | | | | | | | qmake: Remove macro and simplify string expression previously using itOswald Buddenhagen2010-02-011-2/+3
| | | * | | | | | | | | | qmake: use isActiveConfig() instead of hand-crafting comparisonsOswald Buddenhagen2010-02-013-15/+15
| | | * | | | | | | | | | Fix missing namespace.ck2010-02-011-0/+4
| | | * | | | | | | | | | Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
| | | * | | | | | | | | | Assistant: Use const references in foreach loops.ck2010-02-0112-48/+48
| | | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-0131-49/+60
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-0113-16/+18
| | | | * | | | | | | | | | document QString::fromUtf16() slownessOswald Buddenhagen2010-02-011-0/+11
| | | | * | | | | | | | | | remove duplicated calculation of lengthOswald Buddenhagen2010-02-011-1/+1
| | | | * | | | | | | | | | remove pointless conditionalsOswald Buddenhagen2010-02-011-3/+2
| | | | * | | | | | | | | | micro-optimizationOswald Buddenhagen2010-02-011-1/+1
| | | | * | | | | | | | | | optimize qhash()Oswald Buddenhagen2010-02-011-4/+4
| | | | * | | | | | | | | | Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-0115-24/+23
* | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-033-5/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Implementation for QVGPixmapData to/fromSymbianCFbsBitmapJani Hautakangas2010-02-033-5/+136
* | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0321-107/+8108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix license headers on these new files (and the generator).Thiago Macieira2010-02-025-104/+230
| * | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0221-107/+7982
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add auto-generated tests for QScriptValueKent Hansen2010-02-024-83/+6836