diff options
author | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
commit | 88b2bf18c558d0e2f8a9268802f277212f17e61e (patch) | |
tree | d41ca52003037fba9b45605aa6d2ed86f73b940a /doc/src/snippets | |
parent | 4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff) | |
parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
download | Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/snippets')
-rw-r--r-- | doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp | 1 | ||||
-rw-r--r-- | doc/src/snippets/declarative/script.js | 1 |
2 files changed, 2 insertions, 0 deletions
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] diff --git a/doc/src/snippets/declarative/script.js b/doc/src/snippets/declarative/script.js new file mode 100644 index 0000000..cd67311 --- /dev/null +++ b/doc/src/snippets/declarative/script.js @@ -0,0 +1 @@ +# Just here so that workerscript.qml succeeds. |