diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-23 01:53:26 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-23 01:53:26 (GMT) |
| commit | e24aa4af60718e17405871fb3776107adc0b36f1 (patch) | |
| tree | a055210a51704f4454398b64d6a77e4608210369 /doc | |
| parent | 92e7f06b3690e6e39af8fac7af6c101b416b0f4c (diff) | |
| parent | f6f247737c15e8180299b1c1c3f3704434a9b29a (diff) | |
| download | Qt-e24aa4af60718e17405871fb3776107adc0b36f1.zip Qt-e24aa4af60718e17405871fb3776107adc0b36f1.tar.gz Qt-e24aa4af60718e17405871fb3776107adc0b36f1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/examples/plugandpaint.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/examples/plugandpaint.qdoc b/doc/src/examples/plugandpaint.qdoc index a502e18..0e2bfd0 100644 --- a/doc/src/examples/plugandpaint.qdoc +++ b/doc/src/examples/plugandpaint.qdoc @@ -513,7 +513,7 @@ Since the approach is identical to \l{tools/plugandpaintplugins/basictools}{Basic Tools}, we won't - review the code here. The only part of interes is the + review the code here. The only part of interest is the \c .pro file, since Extra Filters is a dynamic plugin (\l{tools/plugandpaintplugins/basictools}{Basic Tools} is linked statically into the Plug & Paint executable). diff --git a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp index d97d61a..800a332 100644 --- a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp +++ b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp @@ -40,5 +40,6 @@ ****************************************************************************/ //! [0] +#include <QDBusMetaType> qDBusRegisterMetaType<MyClass>(); //! [0] |