summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-212-15/+34
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-212-15/+34
| |\
| | * Fixed an assert in QMenuThierry Bastian2010-05-211-11/+1
| | * Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-217-17/+206
|\ \ \
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-217-17/+206
| |/ /
* | | Backport multitouch bug fixes to 4.6Shane Kearns2010-05-212-7/+19
* | | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
* | | Fixing the race condition in event dispatcher implementation onAleksandar Sasha Babic2010-05-212-10/+56
|/ /
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-211-1/+1
|\ \
| * | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-202-2/+71
|\ \ \ | |/ / |/| |
| * | QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-05-197-17/+36
| |\ \
| * | | The documentation for processedUSecs() is ambiguousKurt Korbatits2010-05-191-1/+10
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-201-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Switch Symbian^3 QCursor implementation back to 5.0 wayShane Kearns2010-05-201-2/+0
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-181-2/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | QNAM HTTP: Remove dead codeMarkus Goetz2010-05-181-2/+0
| |/ /
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-171-7/+12
|\ \ \ | |/ / |/| |
| * | Doc: fix typoOlivier Goffart2010-05-171-1/+1
| * | QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-143-4/+12
|\ \ \
| * | | Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-142-4/+11
| |\ \ \ | | |/ / | |/| |
| | * | QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelikeSami Merila2010-05-142-4/+11
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | QNetworkAccessManager: Backends were tried in wrong orderMarkus Goetz2010-05-141-1/+1
| | |/ | |/|
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-141-3/+11
|\ \ \ | |/ / |/| |
| * | Fix QUrl::isValid if the host contains invalid caracter.Olivier Goffart2010-05-141-2/+8
| * | QUrl: parsing of host name with an undercore.Olivier Goffart2010-05-141-1/+3
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-131-0/+3
|\ \ | |/ |/|
| * QNAM HTTP: Preemptive anti crash if() statementMarkus Goetz2010-05-131-0/+3
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-121-4/+83
|\ \
| * | OpenVG blending modes from VG_KHR_advanced_blending extensionRhys Weatherley2010-05-121-4/+83
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-4/+6
|\ \ \ | |/ / |/| |
| * | Fix spurious mouse click when dismissing a native menuShane Kearns2010-05-121-4/+6
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-122-5/+6
|\ \ \ | |/ / |/| |
| * | Workaround for ATI driver bug when using QGraphicsEffect with GL.Kim Motoyoshi Kalland2010-05-122-5/+6
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-1/+1
|\ \ \ | |/ / |/| |
| * | Fix wins def file for qtguiShane Kearns2010-05-121-1/+1
| |/
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-121-0/+3
|\ \ | |/ |/|
| * Fixed QFont to respect the italics constructor flag.Trond Kjernåsen2010-05-121-0/+3
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-121-1/+2
|\ \
| * | QNAM HTTP: Only force read when actual bytes availableMarkus Goetz2010-05-121-1/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-121-1/+3
|\ \ \
| * | | Don't crash when applications set Qt::WA_TranslucentBackground.Jason Barron2010-05-121-1/+3
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-121-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Phonon QT7 backend; Don't release string after unsuccessful AudioDeviceGetPro...Justin McPherson2010-05-121-1/+0
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-111-4/+5
|\ \ \ \ | |_|/ / |/| | |