diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 12:33:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-14 12:33:05 (GMT) |
| commit | 8d8be9b9d73783ef69c7c93313b4bf248fc84f23 (patch) | |
| tree | 312b23509d2d0eeab2b504af252fa2d9bb7f3c3c | |
| parent | 9ac103ac7806348385bdb10dcd1eaff39134071f (diff) | |
| parent | b3eca5777543fb6fc97e025b03fe07ed9541c0a5 (diff) | |
| download | Qt-8d8be9b9d73783ef69c7c93313b4bf248fc84f23.zip Qt-8d8be9b9d73783ef69c7c93313b4bf248fc84f23.tar.gz Qt-8d8be9b9d73783ef69c7c93313b4bf248fc84f23.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix bug in QStringToBSTR.
| -rw-r--r-- | src/gui/accessible/qaccessible_win.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp index c1bb54b..f404535 100644 --- a/src/gui/accessible/qaccessible_win.cpp +++ b/src/gui/accessible/qaccessible_win.cpp @@ -691,14 +691,7 @@ private: static inline BSTR QStringToBSTR(const QString &str) { - BSTR bstrVal; - - int wlen = str.length()+1; - bstrVal = SysAllocStringByteLen(0, wlen*2); - memcpy(bstrVal, str.unicode(), sizeof(QChar)*(wlen)); - bstrVal[wlen] = 0; - - return bstrVal; + return SysAllocStringLen((OLECHAR*)str.unicode(), str.length()); } /* |