summaryrefslogtreecommitdiffstats
path: root/src
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-1938-436/+1411
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1913-176/+386
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-192-157/+234
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-194-161/+271
| | | |\
| | | | * Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | * | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | * | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-196-10/+92
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1910-31/+101
| | |\ \ | | | |/
| | | * When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | * Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14
| | | * Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-181-2/+2
| | * | docWarwick Allison2010-05-193-5/+39
| * | | Doc improvementsBea Lam2010-05-194-131/+152
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1830-134/+878
| |\ \
| | * | Regression fix for Loader anchors not workingJoona Petrell2010-05-181-0/+1
| | * | Make Qt.include() work for js files that have '.pragma library'Bea Lam2010-05-181-0/+3
| | * | doc fixBea Lam2010-05-181-2/+2
| | * | Prevent assignment of values (string, number, bool) to signal handlers.Michael Brasser2010-05-181-0/+3
| | * | Make sure strings are escaped when returned via asScript.Michael Brasser2010-05-183-25/+70
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1816-28/+35
| | |\
| | | * Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1814-26/+33
| | | |\
| | | | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-1814-26/+33
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-187-6/+622
| | | |\ \ | | | | |/
| | | * | Round correctly in binding optimizerAaron Kennedy2010-05-181-1/+1
| | * | | Fix naming.Warwick Allison2010-05-187-21/+6
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-5/+1
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-183-73/+157
| | | |\ \ | | | | |/
| | | * | Don't disable SmoothPixmapTransform in qDrawBorderPixmap()Martin Jones2010-05-181-5/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-183-73/+157
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Use QDeclarativeScriptString for ParentChange.Michael Brasser2010-05-183-73/+157
| | | |/
| | * | Port from QListModelInterface to QAbstractListModel.Warwick Allison2010-05-182-51/+44
| | * | Move stuff from QML viewer to plugins.Warwick Allison2010-05-176-1/+628
| | |/
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-19288-45894/+19
|\ \ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-18288-45894/+19
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-18353-5596/+9091
| | |\ \ \ | | | |/ /
| | * | | More mediaservices removal work.Derick Hawcroft2010-05-181-11/+1
| | * | | Removed mediaservices.Kurt Korbatits2010-05-18287-45873/+18
* | | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-192-9/+12
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-181-2/+0
| |\ \ \ \ \
| | * | | | | QNAM HTTP: Remove dead codeMarkus Goetz2010-05-181-2/+0
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-171-7/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Doc: fix typoOlivier Goffart2010-05-171-1/+1
| | * | | | | QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
* | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-1854-710/+1400
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-1854-710/+1400
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-1754-710/+1400
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-143-4/+12
| | | |\ \ \
| | | | * | | Support linked fonts (.ltt) from standard font locations.Alessandro Portale2010-05-141-0/+1
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-142-4/+11
| | | | |\ \ \ | | | | | |/ / | | | | |/| |