summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-21465-3451/+34188
|\
| * More focus example cleanup.Yann Bodson2010-04-212-33/+31
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2135-55/+5565
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-2118-1/+5185
| | |\
| | | * Emit released and hoveredChanged in MouseArea when a UngrabMouse is receivedLeonardo Sobral Cunha2010-04-2118-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 Jones2010-04-217-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 Allison2010-04-211-1/+2
| | | | | | | | | | | | Task-number: QTBUG-8406
| | * Cleanup declarative focus example.Yann Bodson2010-04-212-7/+2
| | |
| | * Add forceFocus method to QDeclarativeItem.Yann Bodson2010-04-217-5/+161
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | AutotestsAaron Kennedy2010-04-2142-0/+163
| | |
| * | AutotestAaron Kennedy2010-04-215-0/+18
| |/
| * Don't allow properties in Component elementsAaron Kennedy2010-04-218-0/+34
| | | | | | | | QTBUG-10082
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-2118-317/+363
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-04-211-1/+3
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2168-466/+634
| | | |\
| | | * | Fix crash.Warwick Allison2010-04-211-1/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | * | | Ignore message in QDeclarativeLoader test.Yann Bodson2010-04-211-3/+2
| | | |/ | | |/|
| | * | Fix qmlvisual/animation/parentAnimation autotestLeonardo Sobral Cunha2010-04-211-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.7Martin Jones2010-04-212-199/+182
| | |\ \
| | | * | Remove \internal from QDeclarativePropertyValueSource. It should beBea Lam2010-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | public according to the docs.
| | | * | Revert structural changes to extending.qdoc made inBea Lam2010-04-211-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 Jones2010-04-211-26/+28
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-216-20/+20
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-215-11/+13
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
| | | * | | Fix following qdoc changesBea Lam2010-04-211-16/+0
| | | | | |
| | | * | | Fix doc linksBea Lam2010-04-212-3/+4
| | | | | |
| | | * | | Ignore warningsBea Lam2010-04-214-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10035
| | * | | | Fix highlight position with StrictlyEnforceRange and range greater than item ↵Martin Jones2010-04-214-63/+118
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | size. Task-number: QTBUG-9901
| | * | | Make logger widget thread safe.Martin Jones2010-04-213-4/+6
| | | | |
| * | | | Fix crash when QDeclarativeInfo objects are copiedAaron Kennedy2010-04-212-81/+78
| |/ / /
| * | | Use different ports to avoid clashes in parallel testing.Yann Bodson2010-04-212-5/+5
| |/ /
| * | Improve docs and examples for Extending QML in C++Bea Lam2010-04-2151-493/+533
| | |
| * | Make property value source examples workBea Lam2010-04-213-3/+3
| | |
| * | Visual test fix.Michael Brasser2010-04-212-2/+3
| | |
| * | License headersAaron Kennedy2010-04-203-1/+83
| |/
| * Show command line help / qml runtime output in GUIKai Koehne2010-04-205-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 Bodson2010-04-2011-0/+250
| |
| * CleanupYann Bodson2010-04-2016-99/+0
| |
| * docWarwick Allison2010-04-206-14/+27
| |
| * doc typoWarwick Allison2010-04-201-2/+2
| |
| * Fix API call for multiple tags.Warwick Allison2010-04-201-1/+6
| | | | | | | | Spec says comma, not eg. space separated.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-2014-253/+492
| |\
| | * Allow null to be assigned to object propertiesAaron Kennedy2010-04-205-1/+61
| | |
| | * Typo.Yann Bodson2010-04-201-1/+0
| | |
| | * DocAaron Kennedy2010-04-201-10/+46
| | | | | | | | | | | | QTBUG-9768
| | * Fix AnchorChanges to work with parent.right.Michael Brasser2010-04-207-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 Allison2010-04-201-0/+2
| |/ | | | | | | Task-number: QTBUG-9940
| * CompileWarwick Allison2010-04-201-2/+0
| |
| * Complete tst_qdeclarativedom::position autotestAaron Kennedy2010-04-201-1/+2
| | | | | | | | QTBUG-10036
| * Regenerate recordsnapshot to fix fillmode visual test in qmlLeonardo Sobral Cunha2010-04-202-1/+1
| | | | | | | | Reviewed-by: Michael Brasser