diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:14 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 16:14:14 +0200 |
| commit | 82b2e1a176ac7f7ff4cce2f8ca614310beead624 (patch) | |
| tree | 48e1f66ae93bd01518d94d245b8aa7d3af1285c8 /src/activeqt/control/qaxserverbase.cpp | |
| parent | 37fface0a97cb8518b3bdb1e79b4cc81cc7fd215 (diff) | |
| parent | 93179ee7ec87864681e40ba43d66c84cd9080eef (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Diffstat (limited to 'src/activeqt/control/qaxserverbase.cpp')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 16 |
1 files changed, 0 insertions, 16 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) |