summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
commit50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch)
tree7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/activeqt
parent61f013168e5ef5111948a1ae0a1464753986adb2 (diff)
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
downloadQt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/activeqt')
-rw-r--r--src/activeqt/container/qaxwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index d3f736b..15d586b 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -1008,7 +1008,7 @@ HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, DWORD /*grfModif
}
}
// ActiveQt based in-processes-servers will handle the event properly, so
- // we dont need to send this key event to the host.
+ // we don't need to send this key event to the host.
return S_OK;
}