summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Update docs with correct property nameAlan Alpert2010-05-201-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2075-2385/+2678
|\
| * Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| * Remove warnings.Warwick Allison2010-05-202-3/+0
| * Add XmlListModel::errorString()Bea Lam2010-05-202-2/+28
| * Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| * Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| * Stop warnings.Warwick Allison2010-05-202-11/+11
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-202-8/+24
| |\
| | * Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-202-8/+24
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-205-18/+21
| |\ \ | | |/
| | * Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-203-7/+10
| | * Fixes for docs, example codeBea Lam2010-05-202-11/+11
| * | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-201-0/+2
| |/
| * Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| * Missing breakAaron Kennedy2010-05-201-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1940-444/+1427
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1945-2219/+2290
| |\ \
| | * | Added default countries for Mongolian and Nepali.Denis Dzyubenko2010-05-191-31/+31
| | * | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-19334-46612/+1430
| | |\ \
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration t...Kent Hansen2010-05-194-6/+40
| | * | | doc: Fixed many broken links.Martin Smith2010-05-193-17/+28
| | * | | doc: Fixed many broken links.Martin Smith2010-05-1920-50/+50
| | * | | doc: Fixed many broken links.Martin Smith2010-05-198-50/+48
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-1912-2069/+2097
| | |\ \ \
| | | * | | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | * | | Added support for es_419 locale.Denis Dzyubenko2010-05-184-356/+367
| | | * | | Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-181-0/+2
| | | * | | Gestures in GraphicsView do not require a viewport to subscribe to gestures.Denis Dzyubenko2010-05-185-8/+44
| | | * | | Upgraded QLocale to Unicode CLDR 1.8.1Denis Dzyubenko2010-05-182-1666/+1666
| | | * | | Removed the "maybe" timer from gesturemanager.Denis Dzyubenko2010-05-182-38/+7
| | | * | | Fixes a crash and a memory leak in gesturemanager.Denis Dzyubenko2010-05-181-1/+3
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-1912-101/+278
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-19334-46609/+1425
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Update QtDeclarative .def files for 4.7Shane Kearns2010-05-192-8/+8
| | * | | | | Improve virtual mouse on E72 optical joystickShane Kearns2010-05-192-78/+138
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-1912-36/+155
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Update symbian def files for 4.7Shane Kearns2010-05-188-9/+89
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-188-27/+66
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-178-27/+66
| | | | |\ \ \
| | | | | * \ \ Merge commit 'qt/4.7' into 4.7Miikka Heikkinen2010-05-1777-782/+2062
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-148-27/+66
| | | | | |\ \ \ \
| | | | | | * | | | Update Symbian DEF files for WINSCW and EABIIain2010-05-136-22/+47
| | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-132-5/+19
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-132-5/+19
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Fix spurious mouse click when dismissing a native menuShane Kearns2010-05-121-4/+6
| | | | | | | | * | | | Double-click support for virtual cursor in SymbianMiikka Heikkinen2010-05-122-1/+13
* | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1940-444/+1427
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-195-9/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |