diff options
| author | mread <qt-info@nokia.com> | 2009-08-28 11:34:31 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-28 11:34:31 (GMT) |
| commit | b165e6a8f86efb8aebdca44c092907d2750533d4 (patch) | |
| tree | 0b70cfc8602aab9320b0a60a63e8fedf6c67857c /src/activeqt/container/qaxwidget.cpp | |
| parent | 719d5ac4220744d17344ff07ffaa9e86c01ac412 (diff) | |
| parent | 7449a69e39b3ccd877da3e5ad7a9154ab7751dec (diff) | |
| download | Qt-b165e6a8f86efb8aebdca44c092907d2750533d4.zip Qt-b165e6a8f86efb8aebdca44c092907d2750533d4.tar.gz Qt-b165e6a8f86efb8aebdca44c092907d2750533d4.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/activeqt/container/qaxwidget.cpp')
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index e4c9d42..621c836 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -1535,9 +1535,10 @@ HRESULT WINAPI QAxClientSite::SetBorderSpace(LPCBORDERWIDTHS pborderwidths) HRESULT WINAPI QAxClientSite::SetActiveObject(IOleInPlaceActiveObject *pActiveObject, LPCOLESTR pszObjName) { AX_DEBUG(QAxClientSite::SetActiveObject); - - if (pszObjName && widget) - widget->setWindowTitle(QString::fromWCharArray(pszObjName)); + + Q_UNUSED(pszObjName); + // we are ignoring the name of the object, as suggested by MSDN documentation + // for IOleInPlaceUIWindow::SetActiveObject(). if (m_spInPlaceActiveObject) { if (!inPlaceModelessEnabled) |