Merge remote branch 'origin/1.3'

Trailing whitespace removal re-applied manually.

6 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/debugger/shared/backtrace.cpp b/src/plugins/debugger/shared/backtrace.cpp
index 6b81e9339e..c535b023f9 100644
--- a/src/plugins/debugger/shared/backtrace.cpp
+++ b/src/plugins/debugger/shared/backtrace.cpp
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <signal.h>
 #include <execinfo.h>
-#endif 
+#endif
 
 namespace Debugger {
 namespace Internal {
diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h
index 771ec2a3d1..88d80bb08e 100644
--- a/src/plugins/debugger/shared/backtrace.h
+++ b/src/plugins/debugger/shared/backtrace.h
@@ -37,7 +37,7 @@ namespace Internal {
 
 void dumpBacktrace(int maxdepth = -1);
 
-} // namespace Internal 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // DEBUGGER_BACKTRACE_H
diff --git a/src/plugins/debugger/shared/dbgwinutils.cpp b/src/plugins/debugger/shared/dbgwinutils.cpp
index 842c9631b2..09ab75fd83 100644
--- a/src/plugins/debugger/shared/dbgwinutils.cpp
+++ b/src/plugins/debugger/shared/dbgwinutils.cpp
@@ -37,7 +37,7 @@
 
 namespace Debugger {
 namespace Internal {
-   
+
 #ifdef USE_PSAPI
 static inline QString imageName(DWORD processId)
 {
diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp
index 0fb5350fbb..6c9fd3e717 100644
--- a/src/plugins/debugger/shared/peutils.cpp
+++ b/src/plugins/debugger/shared/peutils.cpp
@@ -160,7 +160,7 @@ static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders,
 #endif
     // Empty. This is the case for MinGW binaries
     if (debugDirSize == 0)
-        return true;    
+        return true;
     // Look up in  file
     DWORD debugDirOffset;
     if (!getFileOffsetFromRVA(ntHeaders, debugDirRva, &debugDirOffset)) {
@@ -221,7 +221,7 @@ static void collectPDBfiles(void *fileMemory, IMAGE_DEBUG_DIRECTORY *directoryBa
 
 namespace Debugger {
 namespace Internal {
-   
+
 bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage)
 {
     HANDLE hFile = NULL;
diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h
index c2deef4a51..5a6fadaf58 100644
--- a/src/plugins/debugger/shared/peutils.h
+++ b/src/plugins/debugger/shared/peutils.h
@@ -45,7 +45,7 @@ namespace Internal {
 // Return a list of Program-Database (*.pdb) files a PE executable refers to. */
 bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString *errorMessage);
 
-} // namespace Internal 
+} // namespace Internal
 } // namespace Debugger
 
 #endif // DEBUGGER_PEUTILS_H
diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri
index bd69e956ce..760b012a44 100644
--- a/src/plugins/debugger/shared/shared.pri
+++ b/src/plugins/debugger/shared/shared.pri
@@ -1,7 +1,7 @@
 
 
 SOURCES += $$PWD/backtrace.cpp
-HEADERS += $$PWD/backtrace.h 
+HEADERS += $$PWD/backtrace.h
 
 win32 {
 
@@ -19,6 +19,6 @@ contains(QMAKE_CXX, cl) {
 #   For the Privilege manipulation functions in sharedlibraryinjector.cpp.
 #   Not required for MinGW.
     LIBS += advapi32.lib
-}       
+}
 
 }