3 files changed, 9 insertions, 20 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index d92b9b1..38177a6 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -56,8 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-extern HHOOK qax_hhook;
-
 // in qaxserver.cpp
 extern ITypeLib *qAxTypeLibrary;
 extern unsigned long qAxLock();
@@ -756,15 +754,6 @@ private:
     LONG ref = 1;
 };
 
-// callback for DLL server to hook into non-Qt eventloop
-LRESULT QT_WIN_CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)
-{
-    if (qApp && !invokeCount)
-        QCoreApplication::sendPostedEvents();
-
-    return CallNextHookEx(qax_hhook, nCode, wParam, lParam);
-}
-
 // filter for executable case to hook into Qt eventloop
 // for DLLs the client calls TranslateAccelerator
 class QAxWinEventFilter : public QAbstractNativeEventFilter
@@ -888,11 +877,6 @@ HRESULT QClassFactory::CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, voi
     else
         QGuiApplicationPrivate::instance()->in_exec = true;
 
-    // hook into eventloop; this allows a server to create his own QApplication object
-    if (!qax_hhook && qax_ownQApp) {
-        qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, nullptr, GetCurrentThreadId());
-    }
-
     // If we created QApplication instance, ensure native event loop starts properly
     // by calling processEvents.
     if (qax_ownQApp)
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 38169db..cf6f9ca 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -13,7 +13,6 @@
 QT_BEGIN_NAMESPACE
 
 bool qax_ownQApp = false;
-HHOOK qax_hhook = nullptr;
 
 // in qaxserver.cpp
 extern wchar_t qAxModuleFilename[MAX_PATH];
@@ -90,9 +89,6 @@ STDAPI DllCanUnloadNow()
         return S_FALSE;
 
     // no widgets left - destroy qApp
-    if (qax_hhook)
-        UnhookWindowsHookEx(qax_hhook);
-
     QClassFactory::cleanupCreatedApplication(*qApp);
     delete qApp;
     qax_ownQApp = false;
diff --git a/src/activeqt/doc/CMakeLists.txt b/src/activeqt/doc/CMakeLists.txt
index e3c1b33..2e50d77 100644
--- a/src/activeqt/doc/CMakeLists.txt
+++ b/src/activeqt/doc/CMakeLists.txt
@@ -2,4 +2,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_library(ActiveQt INTERFACE)
+
+# ensure that QtCore include path is passed to QDoc on documentation builds
+# on non-Windows platforms
+if(NOT WIN32)
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19")
+    target_link_libraries(ActiveQt INTERFACE Qt::Core)
+  endif()
+endif()
+
 qt_internal_add_docs(ActiveQt activeqt.qdocconf)