diff options
| -rw-r--r-- | examples/activeqt/comapp/doc/src/comapp.qdoc | 2 | ||||
| -rw-r--r-- | src/activeqt/control/qaxfactory.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/activeqt/comapp/doc/src/comapp.qdoc b/examples/activeqt/comapp/doc/src/comapp.qdoc index 59cd471..7e89731 100644 --- a/examples/activeqt/comapp/doc/src/comapp.qdoc +++ b/examples/activeqt/comapp/doc/src/comapp.qdoc @@ -73,7 +73,7 @@ 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 \l {QApplication::}{quit()} through a single-shot-timer, + \c quit() slot, before calling \l {QCoreApplication::}{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 diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp index 3d6ff9f..5797bb7 100644 --- a/src/activeqt/control/qaxfactory.cpp +++ b/src/activeqt/control/qaxfactory.cpp @@ -548,8 +548,8 @@ bool QAxFactory::registerActiveObject(QObject *object) \a IDTypeLib, and if the server is an executable server then it will have the application id \a IDApp. - This macro needs to be used together with the \l {QAxFactory::}{QAXCLASS()}, \c {QAxFactory::}{QAXTYPE()} - and \c {QAxFactory::}{QAXFACTORY_END()} macros. + This macro needs to be used together with the QAXCLASS(), QAXTYPE() + and QAXFACTORY_END() macros. \snippet src_activeqt_control_qaxfactory.cpp 9 */ |