diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 03:38:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 03:38:10 (GMT) |
| commit | f183932778932a8c2fc5ac38c753893eaeb99575 (patch) | |
| tree | 392acf9ef4e355667517d41b9443f957ba14a7e8 /doc/src/declarative/modules.qdoc | |
| parent | 123172f61f1f1bba6389850835ec946ca6ee82de (diff) | |
| parent | 059a91650d7fdb7491108c07e3eda0e79e2d9203 (diff) | |
| download | Qt-f183932778932a8c2fc5ac38c753893eaeb99575.zip Qt-f183932778932a8c2fc5ac38c753893eaeb99575.tar.gz Qt-f183932778932a8c2fc5ac38c753893eaeb99575.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/examples.qdoc
doc/src/declarative/focus.qdoc
doc/src/declarative/modules.qdoc
doc/src/declarative/network.qdoc
doc/src/declarative/qdeclarativedebugging.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/tutorial.qdoc
tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
Diffstat (limited to 'doc/src/declarative/modules.qdoc')
| -rw-r--r-- | doc/src/declarative/modules.qdoc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc index 2c2da2c..f5dd405 100644 --- a/doc/src/declarative/modules.qdoc +++ b/doc/src/declarative/modules.qdoc @@ -165,7 +165,6 @@ current file is implicitly loaded. This is the exact same as if you had added 'i every QML file. The effect of this is that you can automatically use types defined in C++ plugins or QML files if they reside in the same directory. - */ /* |