summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix QScopedPointerarray default constructorOlivier Goffart2011-07-052-1/+25
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-0553-1406/+1876
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-reviewMartin Jones2011-07-0553-1406/+1876
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-048-169/+293
| | |\
| | | * Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-045-153/+200
| | | * Skip flick velocity test on Mac.Martin Jones2011-07-031-0/+4
| | | * Try again to fix flickable velocity on Mac.Martin Jones2011-06-301-0/+1
| | | * Try to fix Mac CI test failureMartin Jones2011-06-301-2/+2
| | | * qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | * qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-291-2/+8
| | | * Flickable is too sensitive.Martin Jones2011-06-291-1/+5
| | | * Reduce timing dependancy in flickable testMartin Jones2011-06-292-49/+22
| | | * Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-06-282-9/+90
| | | * qmldump: Fix export comparison.Christian Kamm2011-06-271-1/+1
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-2339-1211/+1315
| | |\ \ | | | |/
| | | * QmlInspector: Some code cleanupsThorbjørn Lindeijer2011-06-237-51/+11
| | | * QmlInspector: Some cleanup in the Color Picker toolThorbjørn Lindeijer2011-06-232-44/+10
| | | * QmlInspector: Unified mouse and keyboard event handlingThorbjørn Lindeijer2011-06-2310-180/+320
| | | * QmlInspector: Removed private header postfix and Qt namespaceThorbjørn Lindeijer2011-06-2337-401/+302
| | | * QmlInspector: Share code between QGV/SG based QML debuggingThorbjørn Lindeijer2011-06-238-595/+732
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-232-20/+44
| | |\ \ | | | |/
| | | * qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | * qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| | |/
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-225-7/+225
| | |\
| | | * QDeclarativeDebug: Add code coverage informationKai Koehne2011-06-225-7/+225
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-0514-509/+1077
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-0414-509/+1077
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-041-1/+1
| | |\ \ \ \
| | | * | | | Fix horizontal center alignment with trailing spaceJiang Jiang2011-07-041-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-041-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Regression: QS60Style - All standardIcons are drawn as "small icons"Sami Merila2011-07-041-1/+1
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-0114-504/+1068
| | |\ \ \ \
| | | * | | | QS60Style: provide more standard iconsSami Merila2011-07-014-6/+638
| | | * | | | Update QtOpenGL section in Symbian platform notes.Jani Hautakangas2011-07-012-5/+42
| | | * | | | The qmlshadersplugin deployment must be scoped same as its buildingMiikka Heikkinen2011-06-301-4/+8
| | | * | | | Do not try to open VKB if it is already open in SymbianMiikka Heikkinen2011-06-301-18/+41
| | | * | | | Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engineJani Hautakangas2011-06-306-471/+339
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-041-0/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update changelog with Accessibility fixes.Frederik Gladhorn2011-07-041-0/+11
| * | | | | | Changelog: Add mention of qmlplugindump.Christian Kamm2011-07-041-0/+3
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-043-19/+23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-271-10/+8
| |\ \ \ \ \ \
| | * | | | | | Fixing winscw def file broken by recent mergemread2011-06-271-10/+8
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-27112-455/+2275
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-06-27112-455/+2275
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-06-2416-71/+134
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | runonphone: Change the upload option to allow uploading any fileMartin Storsjo2011-06-241-7/+7
| | * | | | | | | runonphone: Include the manufacturer name in the friendly name on OS XMartin Storsjo2011-06-241-1/+2
| | * | | | | | | runonphone: Fix usb device enumeration on Mac OS XMartin Storsjo2011-06-241-1/+6
| | * | | | | | | Merge remote branch 'qt/4.8'Shane Kearns2011-06-2414-62/+119
| | |\ \ \ \ \ \ \