diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-03 18:15:55 +0100 |
| commit | 8ee393f9fc26948c22cfdfa4d5c1be95fac968bd (patch) | |
| tree | d5bdef5e9340c64bbcf16115beced802b4170dd8 /examples | |
| parent | 35c178c310ebb85a8959d116acd913e7c050c8df (diff) | |
| parent | 7e3a5fd664b02a537b7f5dcd73840c5c7a437519 (diff) | |
| download | qtactiveqt-8ee393f9fc26948c22cfdfa4d5c1be95fac968bd.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1
Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/comapp/doc/src/comapp.qdoc | 4 | ||||
| -rw-r--r-- | examples/activeqt/hierarchy/doc/src/hierarchy.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/activeqt/comapp/doc/src/comapp.qdoc b/examples/activeqt/comapp/doc/src/comapp.qdoc index 986984b..59cd471 100644 --- a/examples/activeqt/comapp/doc/src/comapp.qdoc +++ b/examples/activeqt/comapp/doc/src/comapp.qdoc @@ -73,8 +73,8 @@ name (accessible through the \c id property) is set to \c "From QAxFactory" to indicate that this COM object has been created by COM. Note that there is no destructor that would delete the QTabWidget - this is instead done in the - \c quit() slot, before calling QApplication::quit() through a single-shot-timer, - which is necessary ensure that the COM call to the slot is complete. + \c quit() slot, before calling \l {QApplication::}{quit()} through a single-shot-timer, + which is necessary to ensure that the COM call to the slot is complete. \snippet activeqt/comapp/main.cpp 6 The classes are exported from the server using the QAxFactory macros. Only diff --git a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc index a8196b4..60765ef 100644 --- a/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc +++ b/examples/activeqt/hierarchy/doc/src/hierarchy.qdoc @@ -47,7 +47,7 @@ this class. \snippet activeqt/hierarchy/objects.cpp 0 - The constructor of QParentWidget creates a vertical box layout. + The constructor of \c QParentWidget creates a vertical box layout. New child widgets are automatically added to the layout. \snippet activeqt/hierarchy/objects.cpp 1 @@ -69,7 +69,7 @@ \snippet activeqt/hierarchy/objects.cpp 3 \snippet activeqt/hierarchy/objects.cpp 4 - The implementation of the QSubWidget class is self-explanatory. + The implementation of the \c QSubWidget class is self-explanatory. \snippet activeqt/hierarchy/main.cpp 0 The classes are then exported using a QAxFactory. \c QParentWidget is |