| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
| |
Make QML docs fit in with the new Qt style. Fix numerous qdoc errors.
|
|
|
|
|
|
|
| |
This reverts commit 0cdd8518090be320fa89efaa11ced32215cc2ccc.
We've made a decision on apps interacting with the engine - not in the
initial version.
|
|
|
|
|
|
| |
commit 752a15ca makes some stuff private that is needed to be public.
Moving some stuff back to public until we make a real decision (on how
apps can interact with the engine).
|
| |
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/
|
|
|
| |
(and a *TEST* hack for Qt/4.6/ - this is exactly NOT the way to do it)
Two-step type resolution for Javascript (Aaron).
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
|
| |
| |
| |
| | |
Having to use QUrl::fromLocalFile() is crummy. Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine.
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| |
| | |
Renamed evalQml to be consistent with us, not javascript.
Fixed bug where createComponent never had the right path.
createQmlObject (evalQml) now has a parent as a argument.
It also still has a bug where that parent doesnt get set properly,
although it is used as the creation context also.
|
| |
| |
| |
| |
| | |
This will allow, for example, a different set of types to be
imported for "import Qt 4.6" than for "import Qt 4.7".
|
|/
|
|
|
|
|
|
|
|
|
| |
Works same as before for now, but now the variables and methods are
all in the right place. In particular, type resolving is per-component,
not per-engine, even though it is the engine that ultimately has the
ability to find types, because each component will have a different set
of available types.
Designed to be optimizable - QmlEngine could share data between QmlEngine::Import
objects, and the import objects could read types in bulk rather than always searching.
|
|
|
|
|
|
| |
The QtScript object wrapper now has a destroy function. This should work
for all QML objects. This commit also has some clean up in the dynamic
creation code, which still has a bug regarding path resolution.
|
|
|
|
|
|
| |
Can now create, inside script, objects from qml snippets and files.
These objects can then be manipulated from script. Deleting these items
is still being looked into.
|
|
|
|
|
|
|
| |
componentSearchPath() returns the list of urls (folders) inspected
by qml to locate sub components. This is used in Bauhaus.
Autotests have been stored in new "declarative/qmlengine" directory.
|
|
|
|
| |
This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction. Currently this data is only used to store an object's QmlContext, but it will be used for more later.
|
|
|