diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 06:51:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 06:51:00 (GMT) |
| commit | a762bb1ead644e00290b2f4c023e96f5ef765d43 (patch) | |
| tree | ef5cc23be286d2c6e771a04c64c32ca612dfea79 /src/imports/particles/qmldir | |
| parent | 6dcdab8d9ee66f420a525400d873cfccf78c7003 (diff) | |
| parent | fee38b5c766b0285ebd3283df0d1b29a978da316 (diff) | |
| download | Qt-a762bb1ead644e00290b2f4c023e96f5ef765d43.zip Qt-a762bb1ead644e00290b2f4c023e96f5ef765d43.tar.gz Qt-a762bb1ead644e00290b2f4c023e96f5ef765d43.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
Add missing semicolons. moc was confused and positionViewAtIndex not invokable.
Use the correct base URL in resolveUri
Remove timing sensitivity.
Optimize id checking.
Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Don't use QScriptValueIterator to iterate over arrays.
Skip test, to be fixed.
Only release the binding once we're finished with its memory
Make it harder to accidentally delete a binding
Adjust test now that redundant contexts are not create due
Block modifications to internal QDeclarativeContexts
Don't destroy cookie jar until while someone may be using it.
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
Another fix to find
Improve implicit "." import
Fix auto test
Fix type lookup with url
Fix default values on Textinput
Add an implicit import "." to types loaded from a local url
Fix crash
...
Diffstat (limited to 'src/imports/particles/qmldir')
| -rw-r--r-- | src/imports/particles/qmldir | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/particles/qmldir b/src/imports/particles/qmldir new file mode 100644 index 0000000..15456bb --- /dev/null +++ b/src/imports/particles/qmldir @@ -0,0 +1 @@ +plugin particles |