diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 7b952585dcc28d15af2ff4c347bda5de84b5fab1..6c58fa0f58806fc81938ae7bcb9e37b304456891 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -448,7 +448,9 @@ static inline QString formattedValue(const WatchData &data, int format)
             return reformatInteger(data.value.toULongLong(), format);
         return reformatInteger(data.value.toLongLong(), format);
     }
-    return data.value;
+    QString result = data.value;
+    result.replace(QLatin1Char('\n'), QLatin1String("\\n"));
+    return result;
 }
 
 bool WatchModel::canFetchMore(const QModelIndex &index) const
diff --git a/tests/manual/gdbdebugger/boost/main.cpp b/tests/manual/gdbdebugger/boost/main.cpp
index ada9697e32b759a7871b2dc203774931bbaa6d22..8aafda0e8a0426cccfcb954d6c89e717dae6cfb9 100644
--- a/tests/manual/gdbdebugger/boost/main.cpp
+++ b/tests/manual/gdbdebugger/boost/main.cpp
@@ -21,9 +21,11 @@ void testOptional()
     optional<double> d;
     optional<Large> l;
     optional<std::string &> sr;
+    optional<std::string> s;
     std::string as = "hallo";
     i = 1;
     sr = as;
+    s = as;
     l = Large();
     i = 2;
     i = 3;
diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp
index e6286ef922c7571aace762426189a73bfa75660f..13c71bf80a72debc278ba86a2e34e9ca1fbc27b7 100644
--- a/tests/manual/gdbdebugger/simple/app.cpp
+++ b/tests/manual/gdbdebugger/simple/app.cpp
@@ -1939,7 +1939,7 @@ int main(int argc, char *argv[])
     testQHash1();
     testSignalSlot(argc, argv);
 
-    QString hallo = "hallo";
+    QString hallo = "hallo\nwelt";
     QStringList list;
     list << "aaa" << "bbb" << "cc";