summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Add documentation about script evaluation context and allowed typesBea Lam2010-11-041-2/+28
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0423-105/+180
|\
| * Fix errors in example code. Also reverts the example code to the oldBea Lam2010-11-043-21/+27
| * Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-042-7/+51
| * Fix regression in 648eb76c and update visual tests.Martin Jones2010-11-041-0/+1
| * Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-041-4/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0317-73/+101
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-0310-14/+53
| | |\
| | | * Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-033-0/+15
| | | * Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-027-2/+26
| | | * Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-021-12/+12
| | * | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-033-43/+31
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-026-9/+9
| | |\
| | * | Removing a binding while it is being applied caused a crash.Martin Jones2010-11-024-16/+17
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-033-7/+20
|\ \ \ \
| * | | | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| * | | | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| * | | | QNAM: Reset authenticator state properly between requestsMarkus Goetz2010-11-032-3/+14
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-033-31/+35
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-018-10/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-303-12/+20
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2960-636/+891
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-292-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2779-240/+572
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2575-3131/+3506
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
| * | | | | | | | | Doc: Corrected the name property as it was incorrectly declared.David Boddie2010-10-211-1/+1
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-016-9/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix compilation on AIX 5.3 with gccKent Hansen2010-11-011-1/+1
| * | | | | | | Doc: Fixed typoThorbjørn Lindeijer2010-11-011-1/+1
| * | | | | | | Fix poor English in QStyle::polish documentation.Jason McDonald2010-11-011-4/+4
| * | | | | | | Fix a few typos in comments and docs.Jason McDonald2010-11-013-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-011-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Quickly clicking an item that doesn't use double clicking should result in tw...Joona Petrell2010-11-011-1/+2
| |/ / / / / /
* | | | | | | Fix OpenVG painting artifacts after restoreState().Jason Barron2010-11-011-0/+1
|/ / / / / /
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-301-0/+3
|\ \ \ \ \ \
| * | | | | | Fix Windows compilation.Samuel Rødal2010-10-271-0/+1
| * | | | | | Fixed race condition in raster paint engine.Samuel Rødal2010-10-271-0/+2
| * | | | | | Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-10-101-1/+1
| |\ \ \ \ \ \
| | * | | | | | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| * | | | | | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| * | | | | | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| * | | | | | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
| |/ / / / / /
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-292-12/+17
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| * | | | | | Fix memory leak on exitHarald Fernengel2010-10-291-8/+13