summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-119-17/+37
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-106-8/+24
| |\
| | * Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023Olivier Goffart2010-11-101-2/+2
| | * Fix warningsOlivier Goffart2010-11-101-4/+4
| | * Fix crash in tst_QByteArray::qUncompressOlivier Goffart2010-11-101-0/+10
| | * Support glyph subpixel positioning without subpixel renderingJiang Jiang2010-11-104-4/+10
| * | Update the text cursor's position for input method events.Pierre Rossi2010-11-102-0/+4
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-081-9/+9
| |\
| | * Make qsTr() work with Unicode (non-Latin-1) stringsKent Hansen2010-11-081-9/+9
* | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-096-92/+91
|\ \ \ | |/ /
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
| |\ \ | | |/ | |/|
| | * Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| * | Revert "QPointer: assert when using QPointer on destroyed QObject"Olivier Goffart2010-11-081-2/+0
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-066-91/+92
| |\ \
| | * | Silence warning in qvector with MSVCOlivier Goffart2010-11-051-3/+3
| | * | QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetS...Olivier Goffart2010-11-052-85/+74
| | * | QStyleSheetStyle: add a way to style the up arrowOlivier Goffart2010-11-051-0/+4
| | * | QPointer: assert when using QPointer on destroyed QObjectOlivier Goffart2010-11-051-0/+2
| | * | Add missing Q_ENUMS to QAbstractSocketOlivier Goffart2010-11-051-0/+1
| | * | Fix QMenu rendering in the unified toolbarFabien Freling2010-11-051-3/+8
* | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0726-77/+135
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-069-32/+41
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-059-32/+41
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-059-32/+41
| | | |\ \
| | | | * | Optimize and clean up QClipData::fixup()Andreas Kling2010-11-041-18/+20
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-048-14/+21
| | | | |\ \
| | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-039-14/+23
| | | | | |\ \
| | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-039-14/+23
| | | | | | |\ \
| | | | | | | * | Fixed whitespace.David Boddie2010-11-021-1/+1
| | | | | | | * | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| | | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-018-14/+21
| | | | | | | |\ \
| | | | | | | | * | Push and pop the thread-default context for the current threadPhilip Van Hoof2010-11-011-0/+7
| | | | | | | | * | Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.Thiago Macieira2010-11-011-1/+1
| | | | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-016-13/+13
| | | | | | | | |\ \
| | | | | | | | | * | QNAM HTTP: Do not set cache headers when already set by userRobert Hogan2010-11-011-4/+6
| | | | | | | | | * | QNAM: Do not cache network connections per username.Robert Hogan2010-11-011-1/+1
| | | | | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-015-8/+6
| | | | | | | | | |\ \
| | | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-305-8/+6
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-305-8/+6
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-295-8/+6
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | Don't crash when null-pointer is passed to qScriptValueFromValue()Kent Hansen2010-10-291-4/+1
| | | | | | | | | | | | | * | Simplify object lifetime management when moving objects to a QThreadBradley T. Hughes2010-10-293-3/+3
| | | | | | | | | | | | | * | Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-2815-19/+67
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | | Don't put Objective-C sources in SOURCESTor Arne Vestbø2010-10-271-1/+2
| * | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-0517-45/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-055-9/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix tst_symbols auto testHarald Fernengel2010-11-041-5/+5
| | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-045-8/+49
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-035-8/+49
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \