Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 1aabf139f90..d0dfcd888e5 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -329,7 +329,7 @@ static void blockRecursion(const CPlusPlus::Overview &overview,
                 it = seenHash->insert(name, 0);
             } else {
                 ++(it.value());
-            }            
+            }
             // Is the declaration on or past the current line, that is,
             // the variable not initialized.
             if (symbol->line() >= line)
@@ -1396,7 +1396,7 @@ static void gbdMiToWatchData(const GdbMi &root,
 {
     if (debug > 1)
         qDebug() << Q_FUNC_INFO << '\n' << root.toString(false, 0);
-    WatchData w;    
+    WatchData w;
     QString v;
     QByteArray b;
     // Check for name/iname and use as expression default
@@ -1438,7 +1438,7 @@ static void gbdMiToWatchData(const GdbMi &root,
         w.exp = b;
     gdbMiGetByteArrayValue(&w.addr, root, "addr");
     gdbMiGetByteArrayValue(&w.saddr, root, "saddr");
-    gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");    
+    gdbMiGetBoolValue(&w.valueEnabled, root, "valueenabled");
     gdbMiGetBoolValue(&w.valueEditable, root, "valueeditable");
     if (gdbMiGetStringValue(&v, root, "valuetooltip", "valuetooltipencoded"))
         w.setValue(v);