diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 05:28:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 05:28:16 (GMT) |
| commit | 1c47be7174ca1e9ed393a12461742975079710d7 (patch) | |
| tree | 63d106994a06e516c92b261ced8629c1ddfdb186 /doc | |
| parent | ef06a357aaeb83768d9170859bd99f0ceaf7e82b (diff) | |
| parent | 84a0a0c949d877dfc9a0eb05996a2b73d61b64f8 (diff) | |
| download | Qt-1c47be7174ca1e9ed393a12461742975079710d7.zip Qt-1c47be7174ca1e9ed393a12461742975079710d7.tar.gz Qt-1c47be7174ca1e9ed393a12461742975079710d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
Cocoa: fix namespace build breakage
Trivial doc fix
qdoc: Updated the extra images variable for each manual.qdocconf.
Cocoa: cocoa sometimes show a hidden window
Default (Parentless) QMenuBar actions do not work (without autotest)
Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions.
Revert "Report the error as being AlreadyExists if this is why it fails"
Revert "Default (Parentless) QMenuBar actions do not work"
fix memory bug
fix nativeFilePath character width issue
fix typos
Just use the path as the url can have an anchor attached etc...
Doc: Cleaning HTML generator and updating index.qdoc
Default (Parentless) QMenuBar actions do not work
Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore
qdoc: Avoided putting bad chars in links
Improve itemview appearance on Mac
Backport a few fixes to the Designer filteredit from Creator
Doc: Correcting qdocconf files for assistant
ScrollBar width not updated dynamically on Windows.
...
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] |