diff options
| author | Fredrik Orderud <fredrik.orderud@ge.com> | 2019-01-31 15:07:03 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2019-02-06 13:44:00 +0000 |
| commit | 5329fb3a907a099f46483548b43247fb1b8982d0 (patch) | |
| tree | 9bf849d52ee738cbb09367cf5b15ef78adb67a55 /src/activeqt/doc/src/qtaxserver.qdoc | |
| parent | 0640959940dac968069f8527ac6fa9f9f11e2362 (diff) | |
Extend QAxFactory documentation with QAXFACTORY_DEFAULT alternatives
Extend documentation to also mention the QAXFACTORY_BEGIN() and/or QAXCLASS()
alternatives to QAXFACTORY_DEFAULT() for configuring COM classes.
Task-number: QTBUG-73056
Change-Id: Ic6c719889dfa7150d3e8db3354419a7495efecde
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/activeqt/doc/src/qtaxserver.qdoc')
| -rw-r--r-- | src/activeqt/doc/src/qtaxserver.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc index c9f4adc..afd4c06 100644 --- a/src/activeqt/doc/src/qtaxserver.qdoc +++ b/src/activeqt/doc/src/qtaxserver.qdoc @@ -513,9 +513,9 @@ \section3 "No overloaded function takes 2 parameters" - When the error occurs in code that uses the QAXFACTORY_DEFAULT() - macro, the widget class had no constructor that can be used by the - default factory. Either add a standard widget constructor or + When the error occurs in code that uses the QAXCLASS() or + QAXFACTORY_DEFAULT() macro, the widget class had no constructor that can be + used by the default factory. Either add a standard widget constructor or implement a custom factory that doesn't require one. When the error occurs in code that uses the QAXFACTORY_EXPORT() @@ -529,21 +529,21 @@ \section3 "Syntax error: bad suffix on number" The unique identifiers have not been passed as strings into the - QAXFACTORY_EXPORT() or QAXFACTORY_DEFAULT() macro. + QAXFACTORY_EXPORT(), QAXFACTORY_BEGIN() or QAXFACTORY_DEFAULT() macro. \section3 "Unresolved external symbol _ucm_instantiate" The server does not export an implementation of a QAxFactory. Use the QAXFACTORY_EXPORT() macro in one of the project's implementation files to instantiate and export a factory, or use - the QAXFACTORY_DEFAULT() macro to use the default factory. + the QAXCLASS() or QAXFACTORY_DEFAULT() macro to use the default factory. \section3 "_ucm_initialize already defined in ..." The server exports more than one implementation of a QAxFactory, or exports the same implementation twice. If you use the default - factory, the QAXFACTORY_DEFAULT() macro must only be used once in - the project. Use a custom QAxFactory implementation and the + factory, the QAXFACTORY_BEGIN() or QAXFACTORY_DEFAULT() macro must only be + used once in the project. Use a custom QAxFactory implementation and the QAXFACTORY_EXPORT() macro if the server provides multiple ActiveX controls. |