summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-0618-72/+262
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-061-1/+1
| |\
| | * Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| * | doc: Clarified activeSubControls and subControls.Martin Smith2010-01-061-4/+6
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0618-93/+283
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0644-436/+654
| | |\
| | | * Fix QT_NO_CONTEXTMENUKent Hansen2010-01-061-0/+2
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-064-7/+24
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0611-60/+229
| | |\ \
| | | * | Fixed Symbian application deployment instructionsMiikka Heikkinen2010-01-052-7/+3
| | | * | Fixed "run" makefile target documentation for SymbianMiikka Heikkinen2010-01-052-1/+15
| | | * | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-048-45/+207
| | | |\ \ | | |/ / /
| | | * | Deal with test cases that crash or hangShane Kearns2010-01-046-33/+183
| | | * | Updated sis file names and related content in Symbian installation docsMiikka Heikkinen2010-01-042-12/+24
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-044-63/+87
| | |\ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-0116-134/+480
| | |\ \ \ \
| * | | | | | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-2/+2
* | | | | | | Update copyright year to 2010Jason McDonald2010-01-068857-8927/+8927
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix license check failure.Jason McDonald2010-01-062-26/+28
|/ / / / /
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-062-18/+4
|\ \ \ \ \
| * | | | | QHttpSocketEngine: Remove unneeded codeMarkus Goetz2010-01-062-18/+4
* | | | | | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-061-3/+4
|/ / / / /
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-061-9/+13
|\ \ \ \ \
| * | | | | QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUGMarkus Goetz2010-01-061-9/+9
| * | | | | QAbstractSocket: Warn when wrong QHostInfo was receivedMarkus Goetz2010-01-061-0/+4
* | | | | | doc: Clarified that the scene owns its items and destroys them.Martin Smith2010-01-061-11/+17
|/ / / / /
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-063-14/+18
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.5' into 4.6-stagingThiago Macieira2010-01-051-13/+15
| |\ \ \ \ \
| | * | | | | tst_qhostinfo benchmark: Fix license headerMarkus Goetz2010-01-041-13/+15
| * | | | | | Prevent a crash when creating an inputContext from the QApplication dtor.Denis Dzyubenko2010-01-052-1/+3
* | | | | | | doc: Fixed references to currsor position().Martin Smith2010-01-061-26/+29
|/ / / / / /
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-052-2/+51
|\ \ \ \ \ \
| * | | | | | Small optimization in QIODevice::readAll()Markus Goetz2010-01-052-2/+51
* | | | | | | doc: Added some missing macro descriptions.Martin Smith2010-01-051-4/+27
|/ / / / / /
* | | | | | doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
* | | | | | doc: Replaced usses of rootState() with state machine pointer.Martin Smith2010-01-051-2/+2
* | | | | | doc: Fixed typo.Martin Smith2010-01-051-1/+1
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-053-2/+22
|\ \ \ \ \ \
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-053-2/+22
* | | | | | | doc: Clarified which values were added in Qt 4.4.Martin Smith2010-01-051-8/+11
|/ / / / / /
* | | | | | doc: Clarified next and previous activation order.Martin Smith2010-01-051-8/+8
* | | | | | Fix typo in QFSFileEnginePrivate::canonicalizedMarkus Goetz2010-01-041-1/+1
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0413-244/+296
|\ \ \ \ \ \
| * | | | | | tst_qtcpserver: Move benchmarksMarkus Goetz2010-01-044-156/+291
| * | | | | | Cocoa: added release poolRichard Moe Gustavsen2010-01-041-0/+1
| * | | | | | Remove TEST_QNETWORK_PROXY define from the testsMarkus Goetz2010-01-049-88/+4
* | | | | | | doc: Fixed remaining qdoc errorsMartin Smith2010-01-041-44/+73
|/ / / / / /
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-041-0/+1
|\ \ \ \ \ \
| * | | | | | Mac: qcolordialog autotest fails.Richard Moe Gustavsen2010-01-041-0/+1