summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-115-7/+64
* Add a declarative callback for when a QObject's objectName changesAaron Kennedy2010-10-112-0/+7
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0956-51/+562
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0856-51/+562
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0854-508/+931
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0853-50/+487
| | | | |\
| | | | | * Allow aliases to value type propertiesAaron Kennedy2010-10-0815-12/+147
| | | | | * Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-083-8/+41
| | | * | | Ensure GridView header is visible at the top of the view.Martin Jones2010-10-083-1/+75
| | | | |/ | | | |/|
| | | * | Test for QTBUG-13685Martin Jones2010-10-082-0/+13
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0817-4/+218
| | | |\ \
| | | | * | Disable Text {} image caching by defaultAaron Kennedy2010-10-081-2/+2
| | | | * | Check plugin and QML file case on Mac and WindowsAaron Kennedy2010-10-0816-2/+216
| | | * | | Don't forward keys to invisible items.Martin Jones2010-10-081-4/+4
| | | |/ /
| | | * | Add test for QTBUG-14279Martin Jones2010-10-082-0/+7
| | | * | Ensure that onRelease is called for doubleClick events.Martin Jones2010-10-082-7/+8
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-085-6/+0
| | | |\ \
| | | | * | Remove some unnecessary includes in cpp filesAaron Kennedy2010-10-085-6/+0
| | | * | | emit currentSectionChanged when section changes in ListView.Martin Jones2010-10-082-3/+18
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-087-1/+26
| | | |\ \
| | | | * | Don't allow multiple values to be assigned to a singular propertyAaron Kennedy2010-10-087-1/+26
| | | * | | Ensure Flickable.contentX and Flickable.contentY return correct values.Martin Jones2010-10-081-2/+2
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-0757-1056/+2960
| | | |\ \
| | | * | | Fix dragging items within a PathViewMartin Jones2010-10-071-3/+3
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-094-7/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-091-0/+0
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-093-7/+26
| |\ \ \ \ \ |/ / / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-083-7/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-082-1/+16
| | * | | | Fix infinite loop when justifying undisplayable Arabic textEskil Abrahamsen Blomfeldt2010-10-081-6/+10
| | | |_|/ | | |/| |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-19/+54
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Account for native child widgets when handling focus eventsGareth Stockwell2010-10-081-3/+4
| * | | | Added support for using inputMethodHints in QInputDialog edit widget.axis2010-10-084-2/+38
| * | | | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| * | | | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-081-4/+5
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix memory leak in QPixmap::toSymbianRSgImage() when an error occurs.Jason Barron2010-10-081-4/+5
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-088-58/+90
|\ \ \
| * | | Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-072-1/+42
| * | | Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ \
| * \ \ \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-10-071-0/+1
| | |\ \ \ \
| | | * | | | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0724-427/+638
|\ \ \ \ \ \ \
| * | | | | | | Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| * | | | | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| * | | | | | | Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| * | | | | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1