diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2021-02-18 11:57:31 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-19 10:04:59 +0000 |
| commit | 5fdef054da6ca3cf99b9c455dcf7fc870e3b242c (patch) | |
| tree | 8694dc845874771e974c6b72abb4bb291862ff2c /src | |
| parent | bb5a83c0249cfbe0d0b0dceeca18180050219f9b (diff) | |
Fix access to Q*ApplicationPrivate APIs
A change in qtbase removed the friend declaration of
QClassFactory in QCoreApplication. We can avoid the need
for this declaration by accessing the functionality
differently.
Pick-to: 6.1
Change-Id: Ia2bd7d9ee8dc8eff4e3a9afba9cf889dc27ddfb4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 13ab5ee..b877419 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -75,8 +75,8 @@ #include <qpa/qplatformnativeinterface.h> #include <qabstractnativeeventfilter.h> -#include <qcoreapplication.h> #include <qlist.h> +#include <private/qguiapplication_p.h> #include <private/qthread_p.h> #include "qaxfactory.h" @@ -938,7 +938,7 @@ HRESULT QClassFactory::CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, voi if (qAxOutProcServer) QAbstractEventDispatcher::instance()->installNativeEventFilter(qax_winEventFilter()); else - QApplication::instance()->d_func()->in_exec = true; + QGuiApplicationPrivate::instance()->in_exec = true; // hook into eventloop; this allows a server to create his own QApplication object if (!qax_hhook && qax_ownQApp) { @@ -1031,7 +1031,8 @@ HRESULT QClassFactory::CreateInstanceLic(IUnknown *pUnkOuter, IUnknown * /* pUnk void QClassFactory::cleanupCreatedApplication(QCoreApplication &app) { // Cleanup similar to QCoreApplication::exec() - app.d_func()->execCleanup(); + QCoreApplicationPrivate *priv = static_cast<QCoreApplicationPrivate *>(QObjectPrivate::get(&app)); + priv->execCleanup(); } |