summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2620-81/+258
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-261-0/+1
| |\
| | * Fix minor memory leakMiikka Heikkinen2010-11-261-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2616-45/+216
| |\ \
| | * | Revert "Fix a missing error-signal when a server is shut down while downloading"Peter Hartmann2010-11-262-18/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2616-46/+234
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2516-46/+234
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2516-46/+234
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-2416-46/+234
| | | | | |\
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-11-2453-95/+357
| | | | | | |\
| | | | | | | * Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
| | | | | | | * HTTP backend: fix build without Qt3 supportPeter Hartmann2010-11-231-1/+1
| | | | | | | * QNetworkAccessManager: enable synchronous HTTP callsPeter Hartmann2010-11-2315-40/+209
| | | | | | * | Fix a missing error-signal when a server is shut down while downloadingVille Pernu2010-11-242-1/+18
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-262-31/+35
| |\ \ \ \ \ \ \
| | * | | | | | | Fix type punning warnings from gccAaron Kennedy2010-11-262-31/+35
| | |/ / / / / /
| * | | | | | | Repaint when text color changesAlan Alpert2010-11-261-5/+6
| |/ / / / / /
* | | | | | | Doc: Removed two warnings from QDirIterator docsGeir Vattekar2010-11-261-6/+0
* | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-2532-170/+647
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix possible artifacts under glyphs in texture glyph cacheEskil Abrahamsen Blomfeldt2010-11-251-1/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-252-1/+37
| |\ \ \ \ \ \
| | * | | | | | End painting of Rectangle pixmap before inserting it to pixmap cache to avoid...Joona Petrell2010-11-251-0/+8
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-251-1/+29
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Document KeyEvent::modifiersBea Lam2010-11-251-1/+29
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-11-252-0/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-11-242-0/+8
| | | |\ \ \ \
| | | | * | | | Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-251-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fix inf loop bughawcroft2010-11-251-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2426-167/+600
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-2426-167/+600
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-231-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix QPixmap::fromImage() in the OpenVG pixmap backend.Jason Barron2010-11-231-1/+1
| | | * | | | | | | Fix spacesJanne Koskinen2010-11-232-2/+2
| | | |/ / / / / /
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-232-17/+35
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-231-0/+3
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' into 4.7-s60axis2010-11-236-22/+50
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | * | | | | | | | Native color dialog on symbianMilla Pohjanheimo2010-11-233-6/+131
| | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Fix non-stroked filled paths in OpenVG paint engine.Jason Barron2010-11-231-0/+3
| | | * | | | | | | Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-238-57/+67
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| / / / / / | | | | |/ / / / /
| | | * | | | | | Fix a build break when namespace is definedMiikka Heikkinen2010-11-221-17/+17
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-1922-166/+471
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | | * | | | | | Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-191-2/+2
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-11-193-1/+15
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Add symbian scope for qfiledialog_symbian.cppMiikka Heikkinen2010-11-181-1/+1
| | | | | * | | | | | Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-182-0/+14