summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | 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
| | | |/ /
| * | | | Make use of the fast image paths for CompositionMode_Source as well.Samuel Rødal2010-11-012-5/+13
| |/ / /
| * | | Compile when PATH_MAX is not definedOlivier Goffart2010-11-011-0/+4
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-014-3/+59
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-304-3/+59
| | |\ \ \
| | | * | | Fix compilation in qglobal.h when included from a .c fileOlivier Goffart2010-10-301-3/+4
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-304-3/+58
| | | |\ \ \
| | | | * | | Fix compilation in namespaceOlivier Goffart2010-10-294-5/+5
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-294-3/+58
| | | | |\ \ \
| | | | | * | | qSwap: use std::swap as implementation, and specialize std::swap for our cont...Olivier Goffart2010-10-294-3/+58
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-311-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-301-0/+3
| | |\ \ \ \ \
| | | * | | | | Fix Windows compilation.Samuel Rødal2010-10-271-0/+1
| | | * | | | | Fixed race condition in raster paint engine.Samuel Rødal2010-10-271-0/+2
| | | * | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-101-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| | | * | | | | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| | | * | | | | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| | | * | | | | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
| | | |/ / / / /
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-3027-55/+406
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-292-12/+17
| | |\ \ \ \ \
| | | * | | | | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | | * | | | | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13
| | * | | | | | 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