summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-042-1/+6
|\
| * Place cursor at the end of the selected rangeJiang Jiang2011-03-041-1/+1
| * Fail in a nicer way when QPixmap is used in a non-GUI application.Samuel Rødal2011-03-041-0/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-03-0435-590/+1450
|\ \
| * \ Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2835-590/+1450
| |\ \
| | * | QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24310-2507/+9095
| | |\ \
| | * | | QAbstractSocket: Check for engine validity on Unbuffered readsMarkus Goetz2011-02-241-2/+5
| | * | | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | * | | Fixed library casing.axis2011-02-241-1/+1
| | * | | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-241-1/+4
| | * | | QNAM: Add a warning for misuse of the file backend.Martin Petersson2011-02-241-0/+2
| | * | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-241-0/+15
| | * | | QNAM HTTP: Be more strict with HTTP channel stateMarkus Goetz2011-02-242-11/+30
| | * | | QNAM HTTP: Add qWarning() for double-finished() bugMarkus Goetz2011-02-231-0/+10
| | * | | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
| | * | | SSL backend: loat root certificates on demand on Unix (excluding Mac)Peter Hartmann2011-02-235-14/+71
| | * | | tst_qnetworkreply: Fix httpProxyCommands() on Windows.Martin Petersson2011-02-221-1/+4
| | * | | QNAM File: Switch back to use QFileMarkus Goetz2011-02-212-36/+18
| | * | | QNAM HTTP: Define SynchronousRequestAttribute instead of enum hackMarkus Goetz2011-02-213-4/+4
| | * | | QNAM HTTP: Fix compilation 2Markus Goetz2011-02-211-2/+8
| | * | | QNAM HTTP: Fix compilationMarkus Goetz2011-02-211-4/+6
| | * | | QNAM: Threaded HTTP implementationMarkus Goetz2011-02-2117-507/+1272
| | * | | Avoid warning when seting a window iconOlivier Goffart2011-02-211-1/+1
| | * | | QNativeSocketEngine: Check for WSAEADDRNOTAVAIL on Windows.Martin Petersson2011-02-181-0/+5
| | * | | QAbstractSocket: compile without QT3SupportMartin Petersson2011-02-181-1/+1
| | * | | QNativeSocketEngine: Only do SIO_UDP_CONNRESET for UDP socketsMartin Petersson2011-02-181-9/+11
| | * | | QAbstractSocket: Do not always change notifier on setReadBufferSizeMartin Petersson2011-02-181-1/+1
| | * | | Remove useless processEventOlivier Goffart2011-02-171-1/+0
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0327-168/+1407
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-031-3/+3
| |\ \ \ \ \
| | * | | | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-031-1/+1
| |\ \ \ \ \ \
| | * | | | | | Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-026-19/+105
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-0/+1
| | * | | | | Don't assert if font engine creates new glyphsAaron Kennedy2011-03-021-5/+6
| | * | | | | Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-021-0/+4
| | * | | | | Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-013-6/+31
| | * | | | | Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-014-8/+63
| * | | | | | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| * | | | | | Removing extra tabs from def file.Laszlo Agocs2011-03-011-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-01273-2557/+9088
| |\ \ \ \ \ \
| * | | | | | | Fix style issue in qvgimagepool.cppJani Hautakangas2011-03-011-1/+1
| * | | | | | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-017-3/+31
| * | | | | | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-2817-144/+1335
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-024-6/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't allow non-Object values to be set as prototypeKent Hansen2011-03-021-2/+6
| * | | | | | | | Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| * | | | | | | | Don't assert in abortEvaluation() autotestKent Hansen2011-03-011-2/+11