Merge remote-tracking branch 'origin/4.14'

Change-Id: I70504e096be620434f38cd990c593950da8b24ba

1 files changed, 3 insertions, 5 deletions

diff --git a/src/libs/qtcreatorcdbext/pycdbextmodule.cpp b/src/libs/qtcreatorcdbext/pycdbextmodule.cpp
index 49eed21616..6207667d4a 100644
--- a/src/libs/qtcreatorcdbext/pycdbextmodule.cpp
+++ b/src/libs/qtcreatorcdbext/pycdbextmodule.cpp
@@ -446,12 +446,10 @@ std::string collectOutput()
     // Add a child to messages for every line.
     while (std::getline(pyStdout, line)) {
         // there are two kinds of messages we want to handle here:
-        if (line.find("bridgemessage=") == 0) { // preformatted gdmi bridgemessages from warn()
+        if (line.find("bridgemessage=") == 0) // preformatted gdmi bridgemessages from warn()
             ret << line << ',';
-        } else { // and a line of "normal" python output
-            replace(line, '"', '$'); // otherwise creators gdbmi parser would fail
-            ret << "line=\"" << line << "\",";
-        }
+        else // and a line of "normal" python output
+            ret << "line=\"" << gdbmiStringFormat(line) << "\",";
     }
     ret << "]," << results << "]";
     results.clear();