summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix compile after merge from 4.6.Michael Brasser2009-08-2526-28/+29
|
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-2523-187/+510
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-08-252-0/+99
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Reading and writing of QVariant for QmlValueTypeThomas Hartmann2009-08-252-0/+99
| | | | | | | | | | | | | | | | | | This is very useful for Bauhaus and avoids code duplication Reviewed-by: Aaron Kennedy
| * | Don't crash for QFxWebView::setUrl(QUrl)Kai Koehne2009-08-251-1/+1
| |/
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-2513-50/+335
| |\ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcompiler.cpp src/declarative/qml/qmlengine_p.h
| | * Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-08-2510-48/+329
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-252-4/+4
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-255-39/+252
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-252-7/+13
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-2413-202/+220
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-08-249-93/+133
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | | | Use 'extend' for now. 'extends' is a JavaScript reserved wordsYann Bodson2009-08-241-3/+3
| | | | | | | | |
| | | | * | | | | Add missing CONSTANT to view property.Yann Bodson2009-08-241-1/+1
| | | | | | | | |
| | | * | | | | | Add support for prefixed attached properties at compile timeAaron Kennedy2009-08-253-9/+68
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | To reduce possible confusion, an id used within a component may not conflict with namespace prefixes.
| | | * | | | | Implement QFxKeyNavigationAttached classAaron Kennedy2009-08-253-39/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation is missing until we fix up focus behaviour
| | | * | | | | Remove the QmlBinding_Id from QmlContext on destructionAaron Kennedy2009-08-252-2/+15
| | | | | | | |
| | | * | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-08-255-153/+22
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | | Remove unnecessary KeysAttached static mapMartin Jones2009-08-252-7/+13
| | | | | |_|/ | | | | |/| |
| | | * | | | Add (non-functional) KeyNavigation typeAaron Kennedy2009-08-251-1/+98
| | | | | | |
| | * | | | | Silence gcc compiler errorKai Koehne2009-08-241-2/+5
| | | | | | |
| * | | | | | Make QmlEnginePrivate::Imports a stack type.Warwick Allison2009-08-252-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes memleak.
| * | | | | | Revert cb81a637c8ef041cff2e96c6065763084776d75aWarwick Allison2009-08-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Programming error to call with ns==0.
| * | | | | | Largely revert 40c12237b506bd and implement simpler more efficient way.Warwick Allison2009-08-245-135/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Still doubtful that ACTUAL version import is needed.
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-2413-201/+216
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Centralize QNetworkRequest attribute setting, turn on pipelining.Warwick Allison2009-08-246-6/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in two places. Qt expects the "application" to configure caching, proxy, pipelining, etc., on a QNetworkAccessManager, so now we do that in the two most important cases: the loader example and qmlviewer tool.
* | | | | | Only need to mess with the scope chain when evaluating.Michael Brasser2009-08-251-6/+6
| |_|_|/ / |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-248-166/+167
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Remove QmlDomDocument::saveKai Koehne2009-08-242-13/+1
| | | | |
| * | | | Remove QmlDomDocument::versionKai Koehne2009-08-242-12/+1
| | | | | | | | | | | | | | | | | | | | Has been superseeded by the versioning/library infrastructure.
| * | | | Remove setter from QmlDom classesKai Koehne2009-08-242-119/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | All methods modifying the object dom were removed. Change was discussed with Aaron.
| * | | Disallow lowercase import qualifier idsAaron Kennedy2009-08-241-1/+10
| | | |
| * | | Fix crash on missing imports.Aaron Kennedy2009-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | This would previously crash: Blah.Rectangle {}
| * | | Expose type library information in QmlDomObjectKai Koehne2009-08-248-21/+150
| | | | | | | | | | | | | | | | | | | | New QmlDomObject::objectTypeMajorVersion && objectTypeMinorVersion accessors expose import library information.
* | | | Fix list startPosition calculation.Martin Jones2009-08-241-2/+5
|/ / /
* | | Add a spacing property to ListViewMartin Jones2009-08-242-14/+41
| | |
* | | Fix onFooPressed key handlers.Martin Jones2009-08-242-21/+7
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-249-90/+130
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-241-2/+0
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-08-243-9/+26
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove duplicated signals.Michael Brasser2009-08-241-2/+0
| | | |/ | | |/|
| * | | Rename positioners.Warwick Allison2009-08-246-82/+85
| | | | | | | | | | | | | | | | QFxBasePositioner still exists though.
| * | | Special handling of Tab/BackTabWarwick Allison2009-08-242-0/+22
| | |/ | |/| | | | | | | | | | This may need to be reconsidered with QML focus improvements, but for now, we simply ensure the webview behaves like a QWebView.
| * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-08-242-7/+5
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fix WebViewSettingsWarwick Allison2009-08-242-6/+23
| | | | | | | | | | | | | | | | | | | | More QML <-> JavaScript integration, with example. From Tapani Mikola
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-241-3/+3
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2441-447/+729
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Doc tweak.Martin Jones2009-08-241-3/+3
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-08-2410-42/+78
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Rhys Weatherley2009-08-243-10/+10
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui