Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

5 files changed, 14 insertions, 14 deletions

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index c10437e69c..d70932a556 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -999,7 +999,7 @@ class Dumper:
                     self.putNumChild(0)
                     isHandled = True
 
-                #warn("TARGET: %s " % target) 
+                #warn("TARGET: %s " % target)
                 if (not isHandled) and (target == "char"
                         or target == "signed char" or target == "unsigned char"):
                     # Display values up to given length directly
diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp
index 58fe779706..ee75ff511c 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.cpp
+++ b/share/qtcreator/gdbmacros/gdbmacros.cpp
@@ -1078,7 +1078,7 @@ static void qDumpQAbstractItem(QDumper &d)
     {
        ModelIndex *mm = reinterpret_cast<ModelIndex *>(&mi);
        mm->r = mm->c = 0;
-       mm->p = mm->m = 0;       
+       mm->p = mm->m = 0;
        static const char *printFormat = sizeof(void *) == sizeof(long) ?
                                         "%d,%d,0x%lx,0x%lx" : "%d,%d,0x%llx,0x%llx";
        sscanf(d.templateParameters[0], printFormat, &mm->r, &mm->c, &mm->p, &mm->m);
@@ -2150,7 +2150,7 @@ static void qDumpQVariantHelper(const QVariant *v, QString *value,
     case QVariant::KeySequence:
         #ifndef QT_NO_SHORTCUT
         *value = qvariant_cast<QKeySequence>(*v).toString();
-        #else 
+        #else
         *value = QString::fromLatin1("Disabled by QT_NO_SHORTCUT");
         #endif
         break;
@@ -2803,7 +2803,7 @@ static void qDumpQSharedPointer(QDumper &d)
     const QSharedPointer<int> &ptr =
         *reinterpret_cast<const QSharedPointer<int> *>(d.data);
 
-    if (ptr.isNull()) { 
+    if (ptr.isNull()) {
         d.putItem("value", "<null>");
         d.putItem("valueeditable", "false");
         d.putItem("numchild", 0);
@@ -3746,9 +3746,9 @@ static inline void dumpSizes(QDumper &d)
     const SizeMap::const_iterator  cend = sizeMap.constEnd();
     for (SizeMap::const_iterator it = sizeMap.constBegin(); it != cend; ++it) {
         // new size list
-        if (it.key() != lastSize) {            
+        if (it.key() != lastSize) {
             if (lastSize)
-                d.put("],");            
+                d.put("],");
             d.put("[\"");
             d.put(it.key());
             lastSize = it.key();
@@ -3758,7 +3758,7 @@ static inline void dumpSizes(QDumper &d)
         d.put(it.value());
         d.put('"');
     }
-    d.put("]]");    
+    d.put("]]");
 }
 
 extern "C" Q_DECL_EXPORT
diff --git a/share/qtcreator/gdbmacros/gdbmacros.pro b/share/qtcreator/gdbmacros/gdbmacros.pro
index 0f1bc0f77e..812b1fe262 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.pro
+++ b/share/qtcreator/gdbmacros/gdbmacros.pro
@@ -1,15 +1,15 @@
 TEMPLATE = lib
 CONFIG += shared
-linux-* { 
+linux-* {
     CONFIG -= release
     CONFIG += debug
 }
 SOURCES = gdbmacros.cpp
-false { 
+false {
     DEFINES += USE_QT_GUI=0
     QT = core
 }
-else { 
+else {
     DEFINES += USE_QT_GUI=1
     QT = core \
         gui
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index daa85417dc..24ffdd245e 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -225,10 +225,10 @@ def qdump__QFileInfo(d, item):
 
 
 def qdump__QFlags(d, item):
-    #warn("QFLAGS: %s" % item.value) 
+    #warn("QFLAGS: %s" % item.value)
     i = item.value["i"]
     enumType = item.value.type.template_argument(0)
-    #warn("QFLAGS: %s" % item.value["i"].cast(enumType)) 
+    #warn("QFLAGS: %s" % item.value["i"].cast(enumType))
     d.putValue("%s (%s)" % (i.cast(enumType), i))
     d.putNumChild(0)
 
diff --git a/share/qtcreator/gdbmacros/test/main.cpp b/share/qtcreator/gdbmacros/test/main.cpp
index f77486fae4..65cd27f8a6 100644
--- a/share/qtcreator/gdbmacros/test/main.cpp
+++ b/share/qtcreator/gdbmacros/test/main.cpp
@@ -248,7 +248,7 @@ static int dumpQMapQStringString()
         test.insert(QLatin1String("42s"), QLatin1String("fortytwo"));
         test.insert(QLatin1String("423"), QLatin1String("fortytree"));
     }
-    prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");    
+    prepareInBuffer("QMap", "local.qmapqstringqstring", "local.qmapqstringqstring", "QString@QString");
     qDumpObjectData440(2, 42, testAddress(&test), 1, sizeof(QString), sizeof(QString), sizeof(mapNode), valueOffset);
     fputs(qDumpOutBuffer, stdout);
     fputc('\n', stdout);
@@ -454,7 +454,7 @@ static int dumpStdQStringSet()
 
 static int dumpStdMapIntString()
 {
-    std::map<int,std::string> test;    
+    std::map<int,std::string> test;
     std::map<int,std::string>::value_type entry(42, std::string("fortytwo"));
     if (!optEmptyContainers) {
         test.insert(entry);