diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:53 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:53 +0300 |
| commit | 065ae50f6bf947f11b7bcaa3199df99a83667574 (patch) | |
| tree | 340661486c090aa10472f7c1df1a37dbff2e607d | |
| parent | 2c53a16f431bbb950bfca8ac32ddabf217a0bf04 (diff) | |
| parent | efac3f8ee70230d00285258521a429467d5dc518 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl
Change-Id: I8be9575ca0e35109fbe59fa9a3660aaf2da6c70b
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/activeqt/doc/src/qtaxserver.qdoc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 5fb75cf..163ffef 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.3 +MODULE_VERSION = 5.15.4 diff --git a/src/activeqt/doc/src/qtaxserver.qdoc b/src/activeqt/doc/src/qtaxserver.qdoc index f73f41d..419d694 100644 --- a/src/activeqt/doc/src/qtaxserver.qdoc +++ b/src/activeqt/doc/src/qtaxserver.qdoc @@ -96,7 +96,9 @@ compiler installation) \li Attach the resulting type library as a binary resource to the server binary (again using the \l idc tool) - \li Register the server + \li Register the server. This step may require administrative privileges + and can be skipped by setting the \c qaxserver_no_register + configuration. \endlist To skip the post-processing step, also set the \c qaxserver_no_postlink |