From dddc04f2bcd83a3a5027165b96f81d92675137ee Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 2 Mar 2011 11:10:28 +0100
Subject: [PATCH] Debugger: Compile plugin with -no-stl.

Task-number: QTCREATORBUG-3917
---
 src/plugins/debugger/registerpostmortemaction.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/debugger/registerpostmortemaction.cpp b/src/plugins/debugger/registerpostmortemaction.cpp
index 5efd58be82b..85c4a0200e4 100644
--- a/src/plugins/debugger/registerpostmortemaction.cpp
+++ b/src/plugins/debugger/registerpostmortemaction.cpp
@@ -55,9 +55,9 @@ namespace Internal {
 void RegisterPostMortemAction::registerNow(const QVariant &value)
 {
     const bool boolValue = value.toBool();
-    const QString debuggerExe = QCoreApplication::applicationDirPath() + QLatin1Char('/')
-                                + debuggerApplicationFileC + QLatin1String(".exe");
-    const std::wstring debuggerWString = QDir::toNativeSeparators(debuggerExe).toStdWString();
+    const QString debuggerExe = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + QLatin1Char('/')
+                                + debuggerApplicationFileC + QLatin1String(".exe"));
+    const ushort *debuggerWString = debuggerExe.utf16();
 
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
     SHELLEXECUTEINFO shExecInfo;
@@ -65,7 +65,7 @@ void RegisterPostMortemAction::registerNow(const QVariant &value)
     shExecInfo.fMask  = SEE_MASK_NOCLOSEPROCESS;
     shExecInfo.hwnd   = NULL;
     shExecInfo.lpVerb = L"runas";
-    shExecInfo.lpFile = debuggerWString.data();
+    shExecInfo.lpFile = reinterpret_cast<LPCWSTR>(debuggerWString);
     shExecInfo.lpParameters = boolValue ? L"-register" : L"-unregister";
     shExecInfo.lpDirectory  = NULL;
     shExecInfo.nShow        = SW_SHOWNORMAL;