summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | QNAM: Internal function renamingMarkus Goetz2010-10-273-10/+10
| | * | | | QNAM HTTP: Internal variable spelling mistakesMarkus Goetz2010-10-273-12/+12
| | * | | | QNAM HTTP: Pause connection when emitting proxy auth signalMarkus Goetz2010-10-271-0/+4
| | * | | | QNAM HTTP: Also pause connection when emitting sslErrors()Markus Goetz2010-10-271-0/+4
| | * | | | QNAM HTTP: Also resume uploads after connection pauseMarkus Goetz2010-10-271-3/+4
| | * | | | QNAM HTTP: Process authenticationRequired() from HTTP properlyMarkus Goetz2010-10-274-7/+10
| | * | | | QNAM HTTP: Pause sockets while emitting to user code.Markus Goetz2010-10-272-41/+56
| | * | | | QNAM HTTP: Do not copy around credentials when using NTLMMarkus Goetz2010-10-271-0/+7
| | * | | | QNAM HTTP: Move caching of credentials from URLMarkus Goetz2010-10-272-6/+6
| | * | | | QNAM: Do not load credentials from cache prematurelyMarkus Goetz2010-10-271-11/+5
| | * | | | QAuthenticator: Fix NTLMv2 credential caching of QNAMMarkus Goetz2010-10-272-6/+9
| | * | | | Sockets: Private function for pausing/resuming notifiersMarkus Goetz2010-10-274-0/+53
| | | |/ / | | |/| |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-297-263/+237
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Regression: horizontal alignment bug with single line textYann Bodson2010-10-291-3/+3
| | * | Regression: QML fonts look bad on Mac with font smoothing onYann Bodson2010-10-291-0/+8
| | * | Update when text changes to ""Alan Alpert2010-10-291-1/+2
| | * | Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| | * | Export private QtDeclarative classes needed by Qt3d on SymbianJoona Petrell2010-10-285-218/+218
| | |/
| * | Do not support QImage::Format_ARGB32 in meego gfx for egl images.Michael Dominic K2010-10-281-2/+1
| * | Use QVarLengthArray to store accumulator data.Michael Dominic K2010-10-281-2/+12
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
|\ \ | |/
| * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1