summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-018-10/+12
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-016-9/+9
| |\
| | * Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| | * Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| | * Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| | * Fix a few typos in comments and docs.Jason McDonald2010-11-013-3/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-011-1/+2
| |\ \
| | * | Quickly clicking an item that doesn't use double clicking should result in tw...Joona Petrell2010-11-011-1/+2
| | |/
| * | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-303-12/+20
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-301-0/+3
| |\
| | * Fix Windows compilation.Samuel Rødal2010-10-271-0/+1
| | * Fixed race condition in raster paint engine.Samuel Rødal2010-10-271-0/+2
| | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-101-1/+1
| | |\
| | | * Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| | * | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| | * | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| | * | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-292-12/+17
| |\ \
| | * | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | * | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2960-636/+891
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-293-3/+0
| |\ \ \
| | * | | Remove unnecessary QML import project dependency to Symbian deployment pri fi...Joona Petrell2010-10-293-3/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2922-40/+389
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Avoid being killed by graphics out-of-memory monitor.Jason Barron2010-10-291-0/+11
| | * | | Revert function renaming in QtOpenVG.Jani Hautakangas2010-10-293-12/+12
| | * | | Support tactile feedback in QWidgets from QS60StyleSami Merila2010-10-291-1/+1
| | * | | Support tactile feeedback from QS60Style for QWidgetsSami Merila2010-10-2910-2/+249
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-2911-50/+141
| | |\ \ \
| | | * | | Readded .def file entries after a little stuntAlessandro Portale2010-10-282-0/+4
| | | * | | Do not crash on SymbianAlessandro Portale2010-10-285-11/+21
| | | * | | Temporarily remove .def file entries for a little stuntAlessandro Portale2010-10-282-4/+0
| | | * | | Fixed crash with QClipboard in Symbian^3Titta Heikkala2010-10-281-7/+3
| | | * | | Fallback to vgWritePixels in drawPixmap.Jani Hautakangas2010-10-285-28/+113
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-2926-326/+252
| |\ \ \ \ \
| | * | | | | QNAM: Fix doc rendering of QNetworkRequestMarkus Goetz2010-10-291-10/+0
| | * | | | | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
| | * | | | | QScriptValue::construct(): Don't crash if function throws non-ObjectKent Hansen2010-10-281-5/+8
| | * | | | | Network code: Fix code comment spellchecking errors.Markus Goetz2010-10-284-4/+4
| | * | | | | QNAM: fix buildPeter Hartmann2010-10-271-1/+5
| | * | | | | QNAM HTTP: Remove the error() of QHttpNetworkConnectionMarkus Goetz2010-10-275-29/+9
| | * | | | | QNAM HTTP: Remove enableEncryption()Markus Goetz2010-10-272-8/+0
| | * | | | | QNAM HTTP: Remove unused codeMarkus Goetz2010-10-273-42/+0
| | * | | | | QNAM HTTP: Move authenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-275-11/+7
| | * | | | | QNAM HTTP: Move proxyAuthenticationRequired() to QHttpNetworkReplyMarkus Goetz2010-10-274-13/+9
| | * | | | | QNAM HTTP: Move cacheCredentials() to QHttpNetworkReplyMarkus Goetz2010-10-274-5/+4
| | * | | | | QNAM HTTP: Use sslErrors() from QHttpNetworkReplyMarkus Goetz2010-10-275-8/+10
| | * | | | | QNAM HTTP: Remove Wait4AuthStateMarkus Goetz2010-10-273-8/+1