summaryrefslogtreecommitdiffstats
path: root/src
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 ↵Aaron Kennedy2009-05-0517-667/+633
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmldom.cpp
| * Store the location for the `default' token.Roberto Raggi2009-05-043-5/+15
| |
| * Fixed QmlDomValueValueSource::object() to actually return the newly created ↵Erik Verbruggen2009-05-041-1/+1
| | | | | | | | object.
| * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-041-4/+6
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-05-0411-21/+21
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Fixed initialization for QmlDomValueValueSource.Erik Verbruggen2009-05-041-1/+2
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-0410-19/+17
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Fixed initialization for QmlDomValueBinding.Erik Verbruggen2009-05-041-1/+2
| | | | |
| | * | | Fix example in documentationKai Koehne2009-05-041-2/+2
| | |/ / | | | | | | | | | | | | src has been replaced by source in QFxImage
| * | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-2/+10
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-041-8/+2
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * 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
| * | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-0410-19/+17
| |/
| * Fixed 5 shift/reduce conflicts introduced by T_SIGNAL and T_PROPERTY.Roberto Raggi2009-05-044-628/+582
| |
* | Improve error handling consistencyAaron Kennedy2009-05-0521-131/+493
|/
* 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-014-36/+31
| |\ | | | | | | | | | 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-013-33/+28
| |
* | Correct doc.Michael Brasser2009-05-011-3/+3
|/
* 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-0118-995/+1150
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-019-54/+50
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-019-87/+98
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Doc work.Michael Brasser2009-05-019-54/+50
| | | |
| * | | CompileAaron Kennedy2009-05-011-1/+1
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0114-115/+129
| |\ \ \ | | | |/ | | |/| | | | | 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.
* | | Small fix for QXmlListModel.Yann Bodson2009-05-011-1/+1
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-017-86/+77
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More format changes.Martin Jones2009-05-012-11/+14
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0120-922/+1031
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More format changesMartin Jones2009-05-013-47/+31
| | | |
| * | | More format conversion.Martin Jones2009-05-012-28/+32
| | | |
* | | | Support userStyleSheetUrl.Warwick Allison2009-05-011-0/+20
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-018-790/+875
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-012-2/+30
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0128-1068/+1302
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Add epsilon to Follow can be used in more circumstances.Warwick Allison2009-05-012-2/+30
| | | | | | | | | | | | | | | | | | | | Was biased to pixel-sized values. Scale-sized values did not work smoothly.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0110-198/+176
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
generated by cgit v0.12 at 2024-10-20 20:58:27 (GMT)