summaryrefslogtreecommitdiff
path: root/src/activeqt/shared
diff options
context:
space:
mode:
authorjian liang <jianliang79@gmail.com>2012-03-01 23:29:09 +0800
committerQt by Nokia <qt-info@nokia.com>2012-03-05 08:54:02 +0100
commit7cd0cfdaf7379c82d852b9fa3f32d163ed8d38c5 (patch)
tree20ef96c49392f144da8619dd7ffdfdf2c48c7d32 /src/activeqt/shared
parent8e8f5991f755f473ba109e0cc4cc0ee927620ed9 (diff)
downloadqtactiveqt-7cd0cfdaf7379c82d852b9fa3f32d163ed8d38c5.tar.gz
Use winId() to retrieve native window handle when necessary.
Use winId() to retrieve window handle where it wants to enforce window handle and use hwndForWidget() where its native parent window's handle can also be used. Change-Id: I87e7818cc5f2e6e3e8367f981e4857e63411fb9d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/activeqt/shared')
-rw-r--r--src/activeqt/shared/qaxutils.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index 0c0dabb..51bd6ea 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -67,8 +67,6 @@ static inline QWindow *windowForWidget(QWidget *widget)
HWND hwndForWidget(QWidget *widget)
{
- QWindow *window = widget->windowHandle();
- return static_cast<HWND> (QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window));
if (QWindow *window = windowForWidget(widget))
return static_cast<HWND> (QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window));
return 0;