summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-035-3/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-035-3/+27
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-034-3/+25
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | * | | | | | | | | | 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-2 into master...Qt Continuous Integration System2010-11-0360-62/+678
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix warnings with clangOlivier Goffart2010-11-031-8/+8
| * | | | | | | | | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-0329-0/+127
| * | | | | | | | | | Containers: add member-swapMarc Mutz2010-11-0326-0/+131
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-022-0/+332
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | QVarLenghtArray: Implement more API from QVectorOlivier Goffart2010-11-022-0/+332
| * | | | | | | | | | | Merge branch 'lancelot'aavit2010-11-023-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fixes unstability caused by a dangling pointer in GL text renderingTrond Kjernåsen2010-10-273-8/+11
| | * | | | | | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-022-0/+33
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed index type after reapplying commit 89cbb165.Kim Motoyoshi Kalland2010-11-021-1/+4
| | * | | | | | | | | | | Reapply "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-11-022-0/+30
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-02338-834/+31960
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Fixes: Reading and writing PNG iTXt international text chunksaavit2010-11-021-27/+31
| * | | | | | | | | | | Fixes: corruption of whitespace in text fields when reading PNG imagesaavit2010-10-291-19/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-026-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-012-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-012-1/+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
| | |/ / / / / / / /