summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
* Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-205-8/+27
|\
| * Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-202-0/+4
| * Don't truncate image:// url strings prematurelyBea Lam2010-12-202-8/+20
| * Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
* | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-181-1/+2
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-171-1/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Ville Pernu2010-12-178-35/+36
| | |\
| | * | Fix waitForOpened not working with already active configurationVille Pernu2010-12-171-1/+2
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-174-1/+8
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-174-1/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-164-1/+8
| | |\ \
| | | * | Add work around for bug when painting w/glTexSubImage into large textureEskil Abrahamsen Blomfeldt2010-12-164-1/+8
| | | |/
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-167-26/+36
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-161-1/+4
| |\ \ \
| | * | | QmlDebugger: Fix runtime warnings about unregistered metatypesKai Koehne2010-12-161-1/+4
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-161-2/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Avoid duplicate resize eventMiikka Heikkinen2010-12-161-2/+4
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-166-32/+28
| |\ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-162-10/+25
| |\ \
| | * | Improve performance of clipping to a scaled QRectFLars Knoll2010-12-152-10/+25
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-153-13/+3
| |\ \ \
| | * | | Suppress a warning about killing a timer that isn't active.Thiago Macieira2010-12-151-0/+2
| | * | | Add a warning about trying to release a timer ID that isn't activeThiago Macieira2010-12-151-0/+1
| | * | | Don't need to set FD_CLOEXEC since qt_safe_* will have done that.Thiago Macieira2010-12-151-13/+0
* | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-1610-250/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-167-32/+116
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-157-32/+116
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-151-3/+3
| | | |\ \ | | | | |/ | | | |/|
| | | | * Resize event for QDesktopWidget was sent too earlyMiikka Heikkinen2010-12-151-3/+3
| | * | | Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.Samuel Rødal2010-12-151-11/+0
| | |/ /
| | * | Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
| | |/
| | * Merge commit 'c9faf2defa9fa3209e44e8a5c1ae2da8e630d379' into maemo/199755Aaron McCarthy2010-12-152-11/+88
| | |\
| | | * Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-151-4/+7
| | |\ \ | | | |/ | | |/|
| | | * Don't delete FBO when resetting glyph cacheEskil Abrahamsen Blomfeldt2010-12-141-4/+7
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-141-0/+13
| | |\ \
| | | * | Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| | | * | Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
* | | | | Remove warning about null cursor handle on S60 while handle is validPaul Labedan2010-12-151-2/+2
|/ / / /
* | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-1423-54/+139
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-144-37/+35
| |\ \ \
| | * | | Docs: implications of creating network access managers in other threadsBea Lam2010-12-141-20/+33
| | * | | Clarify that XmlListModel is read onlyBea Lam2010-12-141-2/+2
| | * | | Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-142-15/+0
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-149-9/+17
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed a bug in the input methods on S60 with QGraphicsWebView.axis2010-12-141-0/+8
| | * | | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-148-9/+9
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-141-3/+3
| |\ \ \ \