diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
| commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
| tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/activeqt | |
| parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
| parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) | |
| download | qt4-tools-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/activeqt')
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index d3f736bdc5..15d586b5b5 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; } |