summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-11372-3583/+7106
|\
| * Correct Flipable back item based on parent, not scene transformAaron Kennedy2010-05-111-6/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-05-113-6/+5
| |\
| | * Round ideal width up to prevent incorrect word wrapping on Mac OS XAaron Kennedy2010-05-112-3/+5
| | * Remove unnecesary check for debug output.Martin Jones2010-05-101-3/+0
| * | Correct ownership of signal handlers in state changes.Michael Brasser2010-05-113-7/+68
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-10107-1126/+1702
| |\
| | * Removed multimedia effects from tvtennis declarative exampleLeonardo Sobral Cunha2010-05-103-8/+0
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-108-21/+34
| | |\
| | | * Fixes doc of mouse area's onEnteredLeonardo Sobral Cunha2010-05-101-3/+3
| | | * Remove debug messages from mousearea autotest fileLeonardo Sobral Cunha2010-05-101-6/+6
| | | * Prevent handling of Up/Down on Mac OS X, for consistency with other platforms.Warwick Allison2010-05-102-2/+15
| | | * Optimize QGW constructor.Alexis Menard2010-05-103-9/+10
| | | * There is no Qt.widgetsWarwick Allison2010-05-101-1/+0
| | * | Add some test assertsAaron Kennedy2010-05-101-0/+3
| | |/
| | * Avoid changing header dependencies.Warwick Allison2010-05-102-4/+6
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-08368-3549/+6999
| | |\ | |/ / |/| |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-07368-3549/+6999
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-07103-557/+955
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0738-375/+593
| | | | |\
| | | | | * DocAaron Kennedy2010-05-071-9/+24
| | | | | * Fix autotestsAaron Kennedy2010-05-076-153/+9
| | | | | * Fix autotests (remove import Qt.widgets)Aaron Kennedy2010-05-072-2/+0
| | | | | * Add missing qml file to qdeclarativemouseareaLeonardo Sobral Cunha2010-05-071-0/+28
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-0769-177/+585
| | | | | |\
| | | | | | * Update mouse area qmlvisual test to follow change QTBUG-10162Leonardo Sobral Cunha2010-05-071-2/+2
| | | | | | * Fix autotest bug in MouseAreaLeonardo Sobral Cunha2010-05-071-1/+1
| | | | | | * Avoid emitting release when the mouse is ungrabbedLeonardo Sobral Cunha2010-05-073-3/+61
| | | | | | * Resize qmlruntime window to new dimensions when orientation changesJoona Petrell2010-05-078-18/+156
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-07330-3187/+6439
| | | | | | |\
| | | | | * | | Doc fixBea Lam2010-05-071-1/+1
| | | | | * | | Clean up example code, add white background behind textBea Lam2010-05-077-171/+206
| | | | * | | | Avoid many unnecessary allocations, so so that paint engines attached to pixmapsWarwick Allison2010-05-0717-51/+107
| | | | * | | | Compile with opengl enabled.Warwick Allison2010-05-071-0/+2
| | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-051-0/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-05131-829/+1687
| | | |\ \ \ \ \ \
| | | * | | | | | | Make component.createObject require a parent argumentAlan Alpert2010-05-0513-28/+39
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-0827-648/+912
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2Simon Hausmann2010-05-0718-52/+225
| * | | | | | | | | Updated WebKit to e4b73bb0b173f21db8f0de3dae885a8a71282996Simon Hausmann2010-05-064-3/+17
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-05-069-19/+108
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3Simon Hausmann2010-05-0515-598/+675
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-073-6/+21
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix build error for S60 3.1 winscw targetDerick Hawcroft2010-05-052-5/+20
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Gstreamer mediaservice backend: fixed check for X11/QWS build.Dmytro Poplavskiy2010-05-041-1/+1
* | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-059-19/+108
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-049-19/+108
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-041-3/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | When one of the spin button subcontrol is activated, the state member ofKevin Ottens2010-05-041-3/+5
| |/ / / / / / / / /