summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
* Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
|\
| * Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-0422-273/+630
|\ \ | |/ |/|
| * Use a shared QScriptEngine for debugger console command scriptsKent Hansen2010-02-043-229/+233
| * Fix QtScript debugger hang/crash issue with updating locals modelKent Hansen2010-02-042-16/+44
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-2/+2
| |\
| | * Always activate popup windows on showJens Bache-Wiig2010-02-042-2/+2
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-045-14/+36
| |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-044-9/+16
| |\
| | * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | * Cocoa: Tool Windows steal focus from the main windowRichard Moe Gustavsen2010-02-043-9/+3
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-043-1/+30
| |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-042-0/+269
| |\
| | * Update QTestLib documentation with chart use case.Fabien Freling2010-02-042-0/+269
| * | qdoc3: Removed a debug output.Martin Smith2010-02-041-2/+0
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-043-6/+74
|\ \
| * | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | QHeaderView: fixes sectionClicked() emitted with wrong section indexOlivier Goffart2010-02-042-5/+73
* | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-04138-578/+30474
|\ \ \
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-04138-578/+30474
| |\ \ \ |/ / / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-041-2/+7
| |\ \ \
| | * | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0420-216/+805
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0320-216/+805
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-033-9/+30
| | | |\ \ \ \
| | | | * | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | * | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | | | * | | | Compile fix for non-Symbian compilersAlessandro Portale2010-02-031-7/+8
| | | * | | | | Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-031-1/+2
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-03153-576/+9778
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-03331-1814/+13474
| | | | |\ \ \ \
| | | | * | | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-0313-183/+727
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-29177-1189/+3466
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-2613-188/+365
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-259105-15150/+24796
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-283-23/+46
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0310-37/+111
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | / / / | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | 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