diff options
Diffstat (limited to 'src/activeqt/container')
-rw-r--r-- | src/activeqt/container/qaxscript.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp index 1d1711b..cb1a2c5 100644 --- a/src/activeqt/container/qaxscript.cpp +++ b/src/activeqt/container/qaxscript.cpp @@ -327,7 +327,7 @@ QWidget *QAxScriptSite::window() const if (w) w = w->window(); if (!w && qApp) - w = qApp->activeWindow(); + w = QApplication::activeWindow(); return w; } diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index ae3e3e1..4da3871 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -517,7 +517,7 @@ bool QAxNativeEventFilter::nativeEventFilter(const QByteArray &, void *m, long * QMouseEvent e(type, pos, gpos, (Qt::MouseButton)button, translateMouseButtonState(msg->wParam), translateModifierState(msg->wParam)); - QApplication::sendEvent(ax, &e); + QCoreApplication::sendEvent(ax, &e); } } } @@ -1391,7 +1391,7 @@ HRESULT WINAPI QAxClientSite::RemoveMenus(HMENU /*hmenuShared*/) HRESULT WINAPI QAxClientSite::SetStatusText(LPCOLESTR pszStatusText) { QStatusTipEvent tip(QString::fromWCharArray(pszStatusText)); - QApplication::sendEvent(widget, &tip); + QCoreApplication::sendEvent(widget, &tip); return S_OK; } |