diff options
| author | Orgad Shaneh <[email protected]> | 2017-06-12 10:00:50 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2017-06-12 10:01:16 +0300 |
| commit | 6b0e1bc5f805071da37e36807da6d5c6cffc39d2 (patch) | |
| tree | 2356ed170b92d2472026414a632ee91296d80f38 /src/plugins/debugger/watchhandler.cpp | |
| parent | 1d921ae0444f8fa9cf0ef7a26f342001112f243f (diff) | |
| parent | 98c35d6cd9fea6b5f28316b8fc5e1ac9b1efd321 (diff) | |
Merge remote-tracking branch 'origin/4.3' into master
Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
| -rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 2a46f95eff3..32aaa3bbc02 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -2278,7 +2278,7 @@ void WatchModel::showEditValue(const WatchItem *item) str = QString::fromUtf8(ba.constData(), ba.size()); else if (format == DisplayUtf16String) str = QString::fromUtf16((ushort *)ba.constData(), ba.size() / 2); - else if (format == DisplayUtf16String) + else if (format == DisplayUcs4String) str = QString::fromUcs4((uint *)ba.constData(), ba.size() / 4); m_separatedView->prepareObject<TextEdit>(item)->setPlainText(str); } else if (format == DisplayPlotData) { |