summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove Painted, have WebView use ImageItemIan Walters2009-05-056-503/+24
| | | | | | | | Reducing duplicated code and functionality. Removing QFxPainted as it isn't used and has less features than QFxImageItem, which fufills the same roles. Have QFxWebView use QFxImageItem as a base to reduce duplicated caching code. Minimal risk given that QFxImageItem is based of QFxWebView.
* Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-05242-4939/+7570
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/tutorials/declarative.qdoc
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0526-850/+757
| |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmldom.cpp
| | * Add not-yet-working Content example.Martin Jones2009-05-052-0/+17
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-05109-2088/+2681
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Store the location for the `default' token.Roberto Raggi2009-05-043-5/+15
| | | |
| | | * Extended the test for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+15
| | | |
| | | * Fixed QmlDomValueValueSource::object() to actually return the newly created ↵Erik Verbruggen2009-05-041-1/+1
| | | | | | | | | | | | | | | | object.
| | | * Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-041-2/+10
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-041-4/+6
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-2/+10
| | | | | |
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-041-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-05-0412-22/+22
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | Fix example in documentationKai Koehne2009-05-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | src has been replaced by source in QFxImage
| | | * | | | Added (failing) testcase for QmlDomValueValueSource.Erik Verbruggen2009-05-041-0/+19
| | | | |/ / | | | |/| |
| | | * | | Fixed initialization for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+2
| | | | | |
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-0412-21/+19
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-042-9/+3
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * Fix script snippet in test exampleKai Koehne2009-05-041-1/+1
| | | | | |
| | | | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-0411-20/+18
| | | | | |
| | | * | | Fixed initialization for QmlDomValueBinding.Erik Verbruggen2009-05-041-1/+2
| | | | |/ | | | |/|
| | | * | Fix QmlDom breakageKai Koehne2009-05-041-8/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two actual copies of QmlScriptParser & the parse tree were instantiated in QmlDocument::load, with the result that the additions that the compiler stored in the one parse tree were not seen by the Dom classes, using the other one. Reviewed-by: erikv
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-044-628/+582
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
| | | | |
| | | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-042-4/+6
| | | |/
| | * | Join some lines in examples.Martin Jones2009-05-053-177/+66
| | | |
| * | | Improve error handling consistencyAaron Kennedy2009-05-0522-131/+501
| | |/ | |/|
| * | Use QML signal syntaxAaron Kennedy2009-05-014-11/+4
| | |
| * | Use QML properties syntaxAaron Kennedy2009-05-0123-130/+68
| | |
| * | Correctly set the JsIdentifier svalAaron Kennedy2009-05-012-4/+14
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-013-120/+174
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0110-70/+79
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | docWarwick Allison2009-05-013-120/+174
| | | | |
| * | | | Add QML signal declaration syntaxAaron Kennedy2009-05-018-824/+851
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Syntax is signal <signalName> Currently signal parameters aren't supported
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0112-360/+517
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | docWarwick Allison2009-05-016-109/+136
| | | |
| | * | docWarwick Allison2009-05-016-251/+381
| | | |
| * | | Rename QFxView::setXml to QFxView::setQml.Michael Brasser2009-05-016-42/+37
| | | |
| * | | Correct doc.Michael Brasser2009-05-011-3/+3
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0125-1111/+1328
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | docWarwick Allison2009-05-018-74/+92
| | | |
| | * | docWarwick Allison2009-05-017-57/+68
| | | |
| | * | docWarwick Allison2009-05-011-18/+39
| | | |
| | * | Remove userStyleSheetUrl.Warwick Allison2009-05-011-15/+23
| | | | | | | | | | | | | | | | | | | | Doc Only supports localfiles, not resolved against document URL if relative.
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0134-1203/+1529
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0125-262/+429
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | CompileAaron Kennedy2009-05-011-1/+1
| | | | | |
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0118-115/+180
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Tweak QML property syntaxAaron Kennedy2009-05-018-940/+1099
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The syntax is now [default] property <type> <name> [ : <expression> ] where name is one of "int", "bool", "double", "real", "string", "color", "date", "var" or "variant"
| | * | | | | Ensure baseUrl is set.Warwick Allison2009-05-011-7/+7
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | userStyleSheet is still useless though - it's never resolved, and it can only be a localfile.
generated by cgit v0.12 at 2024-10-20 21:00:17 (GMT)