summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-292-7/+34
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2009-12-293-4/+12
| |\ \ \
| | * | | Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-293-4/+12
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-291-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed a copy-paste error in QRasterPixmapData::metric().Trond Kjernåsen2009-12-291-1/+1
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-2819-227/+470
| |\ \ \ | | |/ / | |/| |
| | * | QUrl::toEncoded() fix for the case of "password, but no username".David Faure2009-12-282-5/+16
| | * | Fix tst_QFileInfo::isHidden_data on WindowsOlivier Goffart2009-12-281-2/+2
| | * | QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2009-12-282-1/+58
| | * | Lots of mostly cosmetic cleanups to GL2 paint engineTom Cooksey2009-12-284-138/+133
| | * | Move the 0.5 offset we add for aliased rendering to updateMatrix()Tom Cooksey2009-12-282-33/+47
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-2813-55/+221
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-2713-55/+221
| | | |\ \
| | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-2613-55/+221
| | | | |\ \
| | | | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2009-12-2513-55/+221
| | | | | |\ \
| | | | | | * | revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845Ritt Konstantin2009-12-233-15/+7
| | | | | | * | Read QWS_SIZE from layer rather than screenAnders Bakken2009-12-231-1/+8
| | | | | | * | Get rid of no_cast_from_ascii warningAnders Bakken2009-12-231-1/+1
| | | | | | * | Docs: Amendments to latest changes to QImageReader docs.Andreas Aardal Hanssen2009-12-231-17/+16