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-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-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
| | |\ \ \ \ \ \