Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-04-21 | 465 | -3451/+34188 |
|\ | |||||
| * | More focus example cleanup. | Yann Bodson | 2010-04-21 | 2 | -33/+31 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-21 | 35 | -55/+5565 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-21 | 18 | -1/+5185 |
| | |\ | |||||
| | | * | Emit released and hoveredChanged in MouseArea when a UngrabMouse is received | Leonardo Sobral Cunha | 2010-04-21 | 18 | -1/+5185 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unbgrab mouse happens when the mouse area is inside a flickable and the flickables takes control over the mouse handling. In this case, the UngrabMouse will behave similarly to a MouseRelease, emitting released, pressedChanged and hoveredChanged. Visual autotest added to mousearea in qmlvisual. Reviewed-by: Michael Brasser | ||||
| | * | | Add hasModelChildren property to delegates with QAbstractItemModel model type. | Martin Jones | 2010-04-21 | 7 | -41/+215 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Also add some helper function to VisualDataModel: - VisualDataModel::modelIndex(int) returns a QModelIndex which can be assigned to VisualDataModel::rootIndex - VisualDataModel::parentModelIndex() returns a QModelIndex which can be assigned to VisualDataModel::rootIndex | ||||
| | * | Balance grid items for larger displays. | Warwick Allison | 2010-04-21 | 1 | -1/+2 |
| | | | | | | | | | | | | Task-number: QTBUG-8406 | ||||
| | * | Cleanup declarative focus example. | Yann Bodson | 2010-04-21 | 2 | -7/+2 |
| | | | |||||
| | * | Add forceFocus method to QDeclarativeItem. | Yann Bodson | 2010-04-21 | 7 | -5/+161 |
| | | | | | | | | | | | | Reviewed-by: Aaron Kennedy | ||||
| * | | Autotests | Aaron Kennedy | 2010-04-21 | 42 | -0/+163 |
| | | | |||||
| * | | Autotest | Aaron Kennedy | 2010-04-21 | 5 | -0/+18 |
| |/ | |||||
| * | Don't allow properties in Component elements | Aaron Kennedy | 2010-04-21 | 8 | -0/+34 |
| | | | | | | | | QTBUG-10082 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-21 | 18 | -317/+363 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Yann Bodson | 2010-04-21 | 1 | -1/+3 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-21 | 68 | -466/+634 |
| | | |\ | |||||
| | | * | | Fix crash. | Warwick Allison | 2010-04-21 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy | ||||
| | * | | | Ignore message in QDeclarativeLoader test. | Yann Bodson | 2010-04-21 | 1 | -3/+2 |
| | | |/ | | |/| | |||||
| | * | | Fix qmlvisual/animation/parentAnimation autotest | Leonardo Sobral Cunha | 2010-04-21 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformOriginPoint was not up tp date when used in ParentChange after this commit: 575f0064bd91e26daa75805c142c10a04a32c2fd. Reviewed-by: Michael Brasser | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-21 | 2 | -199/+182 |
| | |\ \ | |||||
| | | * | | Remove \internal from QDeclarativePropertyValueSource. It should be | Bea Lam | 2010-04-21 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | public according to the docs. | ||||
| | | * | | Revert structural changes to extending.qdoc made in | Bea Lam | 2010-04-21 | 1 | -197/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 61f3cb6e79fea0aed80df091013c2228f64955ec. A separate, more tutorial-like page for this topic will be created and this can be kept as a reference-type page. | ||||
| | * | | | delete the viewer before calling exit(). Ensures correct cleanup. | Martin Jones | 2010-04-21 | 1 | -26/+28 |
| | | | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-21 | 6 | -20/+20 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-04-21 | 5 | -11/+13 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | ||||
| | | * | | | Fix following qdoc changes | Bea Lam | 2010-04-21 | 1 | -16/+0 |
| | | | | | | |||||
| | | * | | | Fix doc links | Bea Lam | 2010-04-21 | 2 | -3/+4 |
| | | | | | | |||||
| | | * | | | Ignore warnings | Bea Lam | 2010-04-21 | 4 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10035 | ||||
| | * | | | | Fix highlight position with StrictlyEnforceRange and range greater than item ↵ | Martin Jones | 2010-04-21 | 4 | -63/+118 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | size. Task-number: QTBUG-9901 | ||||
| | * | | | Make logger widget thread safe. | Martin Jones | 2010-04-21 | 3 | -4/+6 |
| | | | | | |||||
| * | | | | Fix crash when QDeclarativeInfo objects are copied | Aaron Kennedy | 2010-04-21 | 2 | -81/+78 |
| |/ / / | |||||
| * | | | Use different ports to avoid clashes in parallel testing. | Yann Bodson | 2010-04-21 | 2 | -5/+5 |
| |/ / | |||||
| * | | Improve docs and examples for Extending QML in C++ | Bea Lam | 2010-04-21 | 51 | -493/+533 |
| | | | |||||
| * | | Make property value source examples work | Bea Lam | 2010-04-21 | 3 | -3/+3 |
| | | | |||||
| * | | Visual test fix. | Michael Brasser | 2010-04-21 | 2 | -2/+3 |
| | | | |||||
| * | | License headers | Aaron Kennedy | 2010-04-20 | 3 | -1/+83 |
| |/ | |||||
| * | Show command line help / qml runtime output in GUI | Kai Koehne | 2010-04-20 | 5 | -11/+114 |
| | | | | | | | | | | | | | | | | | | Since qml is a GUI program, debugging output isn't visible by default for Windows/Mac users. Therefore provide command line help in a dialog (Windows), and runtime errors/warnings in a separate top level window. Done together with mae. Reviewed-by: mae | ||||
| * | Add declarative demos to doc. | Yann Bodson | 2010-04-20 | 11 | -0/+250 |
| | | |||||
| * | Cleanup | Yann Bodson | 2010-04-20 | 16 | -99/+0 |
| | | |||||
| * | doc | Warwick Allison | 2010-04-20 | 6 | -14/+27 |
| | | |||||
| * | doc typo | Warwick Allison | 2010-04-20 | 1 | -2/+2 |
| | | |||||
| * | Fix API call for multiple tags. | Warwick Allison | 2010-04-20 | 1 | -1/+6 |
| | | | | | | | | Spec says comma, not eg. space separated. | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-20 | 14 | -253/+492 |
| |\ | |||||
| | * | Allow null to be assigned to object properties | Aaron Kennedy | 2010-04-20 | 5 | -1/+61 |
| | | | |||||
| | * | Typo. | Yann Bodson | 2010-04-20 | 1 | -1/+0 |
| | | | |||||
| | * | Doc | Aaron Kennedy | 2010-04-20 | 1 | -10/+46 |
| | | | | | | | | | | | | QTBUG-9768 | ||||
| | * | Fix AnchorChanges to work with parent.right. | Michael Brasser | 2010-04-20 | 7 | -241/+385 |
| | | | | | | | | | | | | | | | | | | | | | "parent" needs to be evaluated with the AnchorChanges target as the scope object. Task-number: QTBUG-5338 | ||||
| * | | Pass double clicks like other mouse events. | Warwick Allison | 2010-04-20 | 1 | -0/+2 |
| |/ | | | | | | | Task-number: QTBUG-9940 | ||||
| * | Compile | Warwick Allison | 2010-04-20 | 1 | -2/+0 |
| | | |||||
| * | Complete tst_qdeclarativedom::position autotest | Aaron Kennedy | 2010-04-20 | 1 | -1/+2 |
| | | | | | | | | QTBUG-10036 | ||||
| * | Regenerate recordsnapshot to fix fillmode visual test in qml | Leonardo Sobral Cunha | 2010-04-20 | 2 | -1/+1 |
| | | | | | | | | Reviewed-by: Michael Brasser |