diff options
| author | miniak <milan.burda@gmail.com> | 2009-07-01 09:50:23 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:23 (GMT) |
| commit | 5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 (patch) | |
| tree | 22b8a82d8ea31ad1df0d8806394d03e23079c5fa /tools/designer/src | |
| parent | 24e7a5f983ead3fe722703851cf59cd0943e3964 (diff) | |
| download | Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.zip Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.gz Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.bz2 | |
tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'tools/designer/src')
| -rw-r--r-- | tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index 1158e35..1cbf1c1 100644 --- a/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -162,7 +162,7 @@ void QAxWidgetTaskMenu::setActiveXControl() tr("The control requires a design-time license")); clsid = QUuid(); } else { - key = QString::fromUtf16((ushort *)bKey); + key = QString::fromWCharArray(bKey); } cf2->Release(); |