summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf2
-rw-r--r--src/activeqt/doc/src/qtaxserver.qdoc4
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