From 2a9f07be9df30c9b0ab298ce717eead350d92ed5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 3 Mar 2021 15:05:53 +0200 Subject: Bump version Change-Id: Ida8bdb9874ecfaf4b322182e2063ec5d34786e56 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From efac3f8ee70230d00285258521a429467d5dc518 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 1 Apr 2021 09:57:28 +0200 Subject: Document the qaxserver_no_register configuration Fixes: QTBUG-92237 Change-Id: I9b93e557b67f8bd1ac2a5ea34ebb3f4c375b7f9e Reviewed-by: Volker Hilsheimer Reviewed-by: Oliver Wolff (cherry picked from commit 363068f57525e808aa20cb8dbcffdc13f6712df1) Reviewed-by: Qt Cherry-pick Bot --- src/activeqt/doc/src/qtaxserver.qdoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3