summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-06191-1759/+8509
|\
| * 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
| * 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
| * | | doc: Removed a const from a declaration in the example.Martin Smith2010-01-041-1/+1
| |/ /
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-04158-1363/+7895
| |\ \
| | * | Remove the need to know the service owner when adding/removing signal rules.Thiago Macieira2010-01-024-34/+21
| | * | Use the watched service name list in matching incoming signals too.Thiago Macieira2010-01-021-2/+8
| | * | Change the QtDBus watched service list to a map to its owner.Thiago Macieira2010-01-022-17/+48
| | * | Update debug output to show the connection's ptr and threadThiago Macieira2010-01-021-10/+10
| | * | Update the scrolling code of FlickCharmBenjamin Poulain2009-12-301-110/+177
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-306-4/+32
| | * | Symbian build fixSimon Hausmann2009-12-301-1/+1
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-304-7/+17
| | * | For maemo, do not strip the binaries during the installation.Adrian Constantin2009-12-301-0/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-3012-15/+255
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2009-12-2912-15/+255
| | | |\ \
| | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2009-12-2912-15/+255
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-294-11/+38
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove pointless const's from functions (internal API)Tom Cooksey2009-12-292-4/+4