summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-142-3/+4
|\
| * Fix static text item positioning GL2 paint engineJiang Jiang2011-03-111-2/+2
| * Fix combining marks handling in Core Text shaperJiang Jiang2011-03-111-1/+2
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-141-2/+2
|\ \
| * | Deprecate QScriptValue::UserRangeKent Hansen2011-03-111-1/+1
| * | Deprecate QScriptValue::QObjectMemberKent Hansen2011-03-111-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-115-17/+60
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-115-17/+60
| |\ \ \
| | * | | Update QML "What's New" docs.Martin Jones2011-03-113-2/+6
| | * | | Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-112-2/+11
| | * | | Fix ListView boundary extents for RTL layout.Martin Jones2011-03-111-9/+39
| | * | | Fix compiler warning.Andrew den Exter2011-03-111-4/+4
* | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-11217-845/+2186
|\ \ \ \ \
| * | | | | Update copyright year to 2011.Rohan McGovern2011-03-10167-167/+167
| | |_|_|/ | |/| | |
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-107-14/+27
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-03-101-0/+3
| |\ \ \ \ \
| | * | | | | Refroze QtCore ARMV5 DEF filesEckhart Koppen2011-03-091-0/+3
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-092-11/+9
| |\ \ \ \ \ \
| | * | | | | | Removed obsolete documentation from QPixmap.Samuel Rødal2011-03-071-10/+0
| | * | | | | | Fixed auto-test failures caused by a3a79fefe65ec12.Samuel Rødal2011-03-071-2/+5
| | * | | | | | 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-releng-staging into mas...Qt Continuous Integration System2011-03-099-5/+465
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Updated ARMV5 DEF filesEckhart Koppen2011-03-085-4/+185
| | * | | | | | | Refroze WINSCW DEF files for SymbianEckhart Koppen2011-03-084-1/+280
| * | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-0811-24/+84
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-03-086-7/+30
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix preprocessor directive.Fabien Freling2011-03-041-1/+1
| | * | | | | | | | Fix compiling issue on Lion.Fabien Freling2011-03-042-0/+14
| | * | | | | | | | Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| | * | | | | | | | Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | * | | | | | | | Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-03-072-63/+64
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-072-63/+64
| * | | | | | | | 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