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-04-1546-309/+647
|\
| * Support valuetypes as method return valuesAaron Kennedy2010-04-155-40/+99
| * Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| |\
| | * DocAaron Kennedy2010-04-151-0/+20
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1512-99/+126
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-153-10/+104
| | |\
| | * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1511-94/+119
| | * | CommentsAaron Kennedy2010-04-151-1/+3
| | * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| * | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-152-12/+5
| * | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-156-24/+73
| | |/ | |/|
| * | Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-153-10/+104
| |/
| * Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeDataAaron Kennedy2010-04-1521-80/+80
| * Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-156-17/+17
| * Add flow property to Grid, adding TopToBottom mode.Martin Jones2010-04-152-43/+112
| * Add QML object destruction hookAaron Kennedy2010-04-152-2/+13
| * Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-151-1/+1
| * Output script errors in ScriptAction and StateChangeScriptMartin Jones2010-04-152-0/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-149-66/+235
| |\
| * | Don't create delegates when destroying view.Martin Jones2010-04-141-1/+4
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-158-60/+200
|\ \ \ | |_|/ |/| |
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-148-60/+200
| |\ \
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-148-60/+200
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-133-4/+16
| | | |\ \
| | | | * | Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | * | QNAM HTTP: Do not pipeline with WebLogic serversMarkus Goetz2010-04-131-0/+2
| | | | * | Make qsTr work in global scopeKent Hansen2010-04-131-3/+13
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-131-2/+13
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Not possible to show selected text in virtual keyboardSami Merila2010-04-131-2/+13
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-131-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix typos, there is no QT_NO_SSLMarkus Goetz2010-04-131-1/+1
| | | * | | QS60Style: Single Click UI support for SD 9.2 time-boxSami Merila2010-04-133-53/+170
| | | |/ /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1444-169/+610
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-143-6/+12
| |\ \ \ \
| | * | | | Updates to the module documentationmae2010-04-142-4/+10
| * | | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1493-1068/+1631
| |\ \ \ \ | | |/ / /
| * | | | Reduce warnings at shutdownAaron Kennedy2010-04-146-4/+40
| * | | | Image with PreserveAspect enabled with either width or height defined should ...Joona Petrell2010-04-141-0/+6
| * | | | Reduce warnings at shutdownAaron Kennedy2010-04-145-9/+10
| * | | | Fix QT_NO_DESKTOPSERVICESTasuku Suzuki2010-04-141-2/+8
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-04-149-9/+20
| |\ \ \ \
| | * | | | Compiled bindings should not print warnings where normal bindings don'tAaron Kennedy2010-04-141-3/+1
| | * | | | Include qvariant.h as a convenience as context propertiesBea Lam2010-04-141-0/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1416-80/+365
| | |\ \ \ \
| | | * | | | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-145-5/+5
| | * | | | | Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystemMartin Jones2010-04-142-1/+13
| * | | | | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-143953-159806/+328683
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-1411-75/+360
| | |/ / / /