diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-04-15 12:31:05 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2021-04-16 07:11:36 +0000 |
| commit | ff72ae1903e9b303e7fdc9572ae829be9f3af9e3 (patch) | |
| tree | f6b5192a71982e24ede5562ed421d56e99013c79 /src | |
| parent | 0d12b5359800727dde28ddcd92892fdc5c2a736a (diff) | |
Doc: Fix documentation warnings
* Add a dependency to QtCore for the documentation target; required to
pull in Qt-specific include paths for QDoc
* Fix minor issues, mostly linking to items
Pick-to: 6.1
Task-number: QTBUG-91875
Change-Id: Ia99c4e417af15da4e8ac66d14d07f23e83690088
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/axbase/qaxtypefunctions.cpp | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxobject.cpp | 4 | ||||
| -rw-r--r-- | src/activeqt/doc/ActiveQtDoc | 1 | ||||
| -rw-r--r-- | src/activeqt/doc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/activeqt/doc/src/activeqt-index.qdoc | 1 |
6 files changed, 8 insertions, 3 deletions
diff --git a/src/activeqt/axbase/qaxtypefunctions.cpp b/src/activeqt/axbase/qaxtypefunctions.cpp index baeaef7..678e2fc 100644 --- a/src/activeqt/axbase/qaxtypefunctions.cpp +++ b/src/activeqt/axbase/qaxtypefunctions.cpp @@ -63,7 +63,7 @@ QColor OLEColorToQColor(uint col) return QColor(GetRValue(col),GetGValue(col),GetBValue(col)); } -/*! +/* Copies the data in \a var into \a data. Used by diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index e97dd91..4944c3b 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -819,7 +819,7 @@ QVariant QAxBasePrivate::VARIANTToQVariant(const VARIANT &arg, const QByteArray */ /*! - \typedef QAxBase::PropertyBag + \typealias QAxBase::PropertyBag A QMap<QString,QVariant> that can store properties as name:value pairs. */ diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp index 08263e3..7b0f2df 100644 --- a/src/activeqt/container/qaxobject.cpp +++ b/src/activeqt/container/qaxobject.cpp @@ -187,6 +187,8 @@ void QAxObjectPrivate::emitSignal(const QString &name, int argc, void *argv) /*! Creates an empty COM object and propagates \a parent to the QObject constructor. To initialize the object, call setControl(). + + \sa {control}{setControl()} */ QAxObject::QAxObject(QObject *parent) : QAxBaseObject(*new QAxObjectPrivate, parent) @@ -199,7 +201,7 @@ QAxObject::QAxObject(QObject *parent) Creates a QAxObject that wraps the COM object \a c. \a parent is propagated to the QObject constructor. - \sa setControl() + \sa {control}{setControl()} */ QAxObject::QAxObject(const QString &c, QObject *parent) : QAxBaseObject(*new QAxObjectPrivate, parent) diff --git a/src/activeqt/doc/ActiveQtDoc b/src/activeqt/doc/ActiveQtDoc index 4a2b06b..57bcc57 100644 --- a/src/activeqt/doc/ActiveQtDoc +++ b/src/activeqt/doc/ActiveQtDoc @@ -7,6 +7,7 @@ #include "qaxbindable.h" #include "qaxfactory.h" #include "qaxobject.h" +#include "qaxobjectinterface.h" #include "qaxscript.h" #include "qaxselect.h" #include "qaxtypefunctions.h" diff --git a/src/activeqt/doc/CMakeLists.txt b/src/activeqt/doc/CMakeLists.txt index ef28015..94b3c4d 100644 --- a/src/activeqt/doc/CMakeLists.txt +++ b/src/activeqt/doc/CMakeLists.txt @@ -1,4 +1,5 @@ # special case skip regeneration add_library(ActiveQt INTERFACE) +target_link_libraries(ActiveQt INTERFACE Qt::Core) qt_internal_add_docs(ActiveQt activeqt.qdocconf) diff --git a/src/activeqt/doc/src/activeqt-index.qdoc b/src/activeqt/doc/src/activeqt-index.qdoc index ff4f404..12077da 100644 --- a/src/activeqt/doc/src/activeqt-index.qdoc +++ b/src/activeqt/doc/src/activeqt-index.qdoc @@ -135,6 +135,7 @@ \li \l{QAxServer C++ Classes} \endlist + \target ActiveQt Examples \section1 Examples \list \li \l{Multiple Example (ActiveQt)} |