Mercurial > hg > octave-avbm
changeset 13901:36f90899e058 gui
[Win32] For compilation on MinGW due to wchar_t* conversion.
* src/terminal/win32/QConsole.cpp (QConsolePrivate::QConsolePrivate): Call
QString::fromWCharArray instead of QString::fromUtf16.
(QConsolePrivate::monitorConsole): Likewise.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Mon, 21 Nov 2011 09:38:45 +0000 |
parents | 22e16fd68b8a |
children | dd1f5493fff4 |
files | gui/src/terminal/win32/QConsole.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/terminal/win32/QConsole.cpp +++ b/gui/src/terminal/win32/QConsole.cpp @@ -217,7 +217,7 @@ wchar_t titleBuf[260]; GetConsoleTitleW (titleBuf, sizeof (titleBuf)); - q->setWindowTitle (QString::fromUtf16 (titleBuf)); + q->setWindowTitle (QString::fromWCharArray (titleBuf)); m_font.setFamily ("Lucida Console"); m_font.setPointSize (9); @@ -530,7 +530,7 @@ static wchar_t titleBuf[260]; GetConsoleTitleW (titleBuf, sizeof (titleBuf)); - QString title = QString::fromUtf16 (titleBuf); + QString title = QString::fromWCharArray (titleBuf); if (title != m_title) {