Whitespace cleanup: remove trailing whitespace

Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.

Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp

Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.

Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

594 files changed, 3536 insertions, 3559 deletions

diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.cpp b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
index 27a653600c..7b7d92bef5 100644
--- a/config.tests/unix/clock-monotonic/clock-monotonic.cpp
+++ b/config.tests/unix/clock-monotonic/clock-monotonic.cpp
@@ -50,7 +50,7 @@ int main(int, char **)
 #else
 #  error "Feature _POSIX_MONOTONIC_CLOCK not available"
     // MIPSpro doesn't understand #error, so force a compiler error
-    force_compiler_error = true; 
+    force_compiler_error = true;
 #endif
     return 0;
 }
diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
index d8dc343f2e..c8c8eb41da 100644
--- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
+++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
@@ -59,6 +59,6 @@ int main()
     if (getaddrinfo("foo", 0, 0, &res) == 0)
         freeaddrinfo(res);
     gai_strerror(0);
-    
+
     return 0;
 }
diff --git a/doc/src/examples/customtypesending.qdoc b/doc/src/examples/customtypesending.qdoc
index 6cb28b1bd4..695ac2e057 100644
--- a/doc/src/examples/customtypesending.qdoc
+++ b/doc/src/examples/customtypesending.qdoc
@@ -61,7 +61,7 @@
     message to be sent.
 
     The \c Message class is defined in the following way:
-    
+
     \snippet examples/tools/customtypesending/message.h custom type definition
 
     The type is declared to the meta-type system with the Q_DECLARE_METATYPE()
diff --git a/examples/dbus/complexpingpong/complexping.cpp b/examples/dbus/complexpingpong/complexping.cpp
index b094bfd247..61c918534f 100644
--- a/examples/dbus/complexpingpong/complexping.cpp
+++ b/examples/dbus/complexpingpong/complexping.cpp
@@ -82,7 +82,7 @@ void Ping::start(const QString &name, const QString &oldValue, const QString &ne
             if (!reply.isNull())
                 printf("value = %s\n", qPrintable(reply.toString()));
         } else if (line.startsWith("value=")) {
-            iface->setProperty("value", line.mid(6));            
+            iface->setProperty("value", line.mid(6));
         } else {
             QDBusReply<QDBusVariant> reply = iface->call("query", line);
             if (reply.isValid())
@@ -92,7 +92,7 @@ void Ping::start(const QString &name, const QString &oldValue, const QString &ne
         if (iface->lastError().isValid())
             fprintf(stderr, "Call failed: %s\n", qPrintable(iface->lastError().message()));
     }
-}    
+}
 
 int main(int argc, char **argv)
 {
diff --git a/examples/dbus/complexpingpong/complexpong.cpp b/examples/dbus/complexpingpong/complexpong.cpp
index 3e4ba84001..fe122345f0 100644
--- a/examples/dbus/complexpingpong/complexpong.cpp
+++ b/examples/dbus/complexpingpong/complexpong.cpp
@@ -94,10 +94,10 @@ int main(int argc, char **argv)
 
     if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) {
         fprintf(stderr, "%s\n",
-                qPrintable(QDBusConnection::sessionBus().lastError().message()));        
+                qPrintable(QDBusConnection::sessionBus().lastError().message()));
         exit(1);
     }
-    
+
     app.exec();
     return 0;
 }
diff --git a/examples/dbus/pingpong/pong.cpp b/examples/dbus/pingpong/pong.cpp
index 203bf53e0e..5f242569f1 100644
--- a/examples/dbus/pingpong/pong.cpp
+++ b/examples/dbus/pingpong/pong.cpp
@@ -67,13 +67,13 @@ int main(int argc, char **argv)
 
     if (!QDBusConnection::sessionBus().registerService(SERVICE_NAME)) {
         fprintf(stderr, "%s\n",
-                qPrintable(QDBusConnection::sessionBus().lastError().message()));        
+                qPrintable(QDBusConnection::sessionBus().lastError().message()));
         exit(1);
     }
 
     Pong pong;
     QDBusConnection::sessionBus().registerObject("/", &pong, QDBusConnection::ExportAllSlots);
-    
+
     app.exec();
     return 0;
 }
diff --git a/examples/ipc/sharedmemory/dialog.cpp b/examples/ipc/sharedmemory/dialog.cpp
index 3b41c22d3f..2be62b1b47 100644
--- a/examples/ipc/sharedmemory/dialog.cpp
+++ b/examples/ipc/sharedmemory/dialog.cpp
@@ -182,7 +182,7 @@ void Dialog::loadFromMemory()
  */
 void Dialog::detach()
 {
-    if (!sharedMemory.detach()) 
+    if (!sharedMemory.detach())
         ui.label->setText(tr("Unable to detach from shared memory."));
 }
 
diff --git a/examples/network/doc/src/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc
index bff2e29ea5..2d77d3fcba 100644
--- a/examples/network/doc/src/blockingfortuneclient.qdoc
+++ b/examples/network/doc/src/blockingfortuneclient.qdoc
@@ -43,7 +43,7 @@
     QTcpSocket::connectToHost() returns immediately, and when the connection
     has been established, QTcpSocket emits
     \l{QTcpSocket::connected()}{connected()}.
-    
+
     \li \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
     applications, you can call the \c waitFor...() functions (e.g.,
     QTcpSocket::waitForConnected()) to suspend the calling thread until the
@@ -208,7 +208,7 @@
     \snippet blockingfortuneclient/blockingclient.cpp 3
     \codeline
     \snippet blockingfortuneclient/blockingclient.cpp 4
-    
+
     Here, we simply display the fortune we received as the argument.
 
     \sa {Fortune Client Example}, {Fortune Server Example}
diff --git a/examples/network/doc/src/threadedfortuneserver.qdoc b/examples/network/doc/src/threadedfortuneserver.qdoc
index fe627d0141..1b64e30226 100644
--- a/examples/network/doc/src/threadedfortuneserver.qdoc
+++ b/examples/network/doc/src/threadedfortuneserver.qdoc
@@ -48,8 +48,8 @@
 
     FortuneServer inherits QTcpServer and reimplements
     QTcpServer::incomingConnection(). We also use it for storing the list of
-    random fortunes. 
-    
+    random fortunes.
+
     \snippet threadedfortuneserver/fortuneserver.cpp 0
 
     We use FortuneServer's constructor to simply generate the list of
@@ -71,7 +71,7 @@
     QThread::run(), and it has a signal for reporting errors.
 
     \snippet threadedfortuneserver/fortunethread.cpp 0
-    
+
     FortuneThread's constructor simply stores the socket descriptor and
     fortune text, so that they are available for run() later on.
 
@@ -101,7 +101,7 @@
     But unlike the previous example, we finish off by calling
     QTcpSocket::waitForDisconnected(), which blocks the calling thread until
     the socket has disconnected. Because we are running in a separate thread,
-    the GUI will remain responsive.  
+    the GUI will remain responsive.
 
     \sa {Fortune Server Example}, {Fortune Client Example}, {Blocking Fortune
     Client Example}
diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index 2f795ebe7f..2b689c7770 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -180,7 +180,7 @@ void HttpWindow::httpFinished()
                                  tr("Download failed: %1.")
                                  .arg(reply->errorString()));
         downloadButton->setEnabled(true);
-    } else if (!redirectionTarget.isNull()) {        
+    } else if (!redirectionTarget.isNull()) {
         QUrl newUrl = url.resolved(redirectionTarget.toUrl());
         if (QMessageBox::question(this, tr("HTTP"),
                                   tr("Redirect to %1 ?").arg(newUrl.toString()),
@@ -256,7 +256,7 @@ void HttpWindow::sslErrors(QNetworkReply*,const QList<QSslError> &errors)
             errorString += ", ";
         errorString += error.errorString();
     }
-    
+
     if (QMessageBox::warning(this, tr("HTTP"),
                              tr("One or more SSL errors has occurred: %1").arg(errorString),
                              QMessageBox::Ignore | QMessageBox::Abort) == QMessageBox::Ignore) {
diff --git a/examples/network/securesocketclient/sslclient.h b/examples/network/securesocketclient/sslclient.h
index 3caf6e2af1..8ebf2cc536 100644
--- a/examples/network/securesocketclient/sslclient.h
+++ b/examples/network/securesocketclient/sslclient.h
@@ -57,7 +57,7 @@ class SslClient : public QWidget
 public:
     SslClient(QWidget *parent = 0);
     ~SslClient();
-    
+
 private slots:
     void updateEnabledState();
     void secureConnect();
diff --git a/examples/network/torrent/addtorrentdialog.cpp b/examples/network/torrent/addtorrentdialog.cpp
index fac75ba465..d168633df3 100644
--- a/examples/network/torrent/addtorrentdialog.cpp
+++ b/examples/network/torrent/addtorrentdialog.cpp
@@ -117,14 +117,14 @@ void AddTorrentDialog::setTorrent(const QString &torrentFile)
 
     if (lastDestinationDirectory.isEmpty())
         lastDestinationDirectory = lastDirectory;
-    
+
     MetaInfo metaInfo;
     QFile torrent(torrentFile);
     if (!torrent.open(QFile::ReadOnly) || !metaInfo.parse(torrent.readAll())) {
         enableOkButton();
         return;
     }
-    
+
     ui.torrentFile->setText(torrentFile);
     ui.announceUrl->setText(metaInfo.announceUrl());
     if (metaInfo.comment().isEmpty())
diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp
index 2abc41a852..6ef7234539 100644
--- a/examples/network/torrent/bencodeparser.cpp
+++ b/examples/network/torrent/bencodeparser.cpp
@@ -81,26 +81,26 @@ bool BencodeParser::getByteString(QByteArray *byteString)
     const int contentSize = content.size();
     int size = -1;
     do {
-	char c = content.at(index);
-	if (c < '0' || c > '9') {
-	    if (size == -1)
-		return false;
-	    if (c != ':') {
-		errString = QString("Unexpected character at pos %1: %2")
-		    .arg(index).arg(c);
-		return false;
-	    }
-	    ++index;
-	    break;
-	}
-	if (size == -1)
-	    size = 0;
-	size *= 10;
-	size += c - '0';
+        char c = content.at(index);
+        if (c < '0' || c > '9') {
+            if (size == -1)
+                return false;
+            if (c != ':') {
+                errString = QString("Unexpected character at pos %1: %2")
+                        .arg(index).arg(c);
+                return false;
+            }
+            ++index;
+            break;
+        }
+        if (size == -1)
+            size = 0;
+        size *= 10;
+        size += c - '0';
     } while (++index < contentSize);
 
     if (byteString)
-	*byteString = content.mid(index, size);
+        *byteString = content.mid(index, size);
     index += size;
     return true;
 }
@@ -109,38 +109,38 @@ bool BencodeParser::getInteger(qint64 *integer)
 {
     const int contentSize = content.size();
     if (content.at(index) != 'i')
-	return false;
+        return false;
 
     ++index;
     qint64 num = -1;
     bool negative = false;
 
     do {
-	char c = content.at(index);
-	if (c < '0' || c > '9') {
-	    if (num == -1) {
-		if (c != '-' || negative)
-		    return false;
-		negative = true;
-		continue;
-	    } else {
-		if (c != 'e') {
-		    errString = QString("Unexpected character at pos %1: %2")
-			.arg(index).arg(c);
-		    return false;
-		}
-		++index;
-		break;
-	    }
-	}
-	if (num == -1)
-	    num = 0;
-	num *= 10;
-	num += c - '0';
+        char c = content.at(index);
+        if (c < '0' || c > '9') {
+            if (num == -1) {
+                if (c != '-' || negative)
+                    return false;
+                negative = true;
+                continue;
+            } else {
+                if (c != 'e') {
+                    errString = QString("Unexpected character at pos %1: %2")
+                            .arg(index).arg(c);
+                    return false;
+                }
+                ++index;
+                break;
+            }
+        }
+        if (num == -1)
+            num = 0;
+        num *= 10;
+        num += c - '0';
     } while (++index < contentSize);
 
     if (integer)
-	*integer = negative ? -num : num;
+        *integer = negative ? -num : num;
     return true;
 }
 
@@ -148,38 +148,38 @@ bool BencodeParser::getList(QList<QVariant> *list)
 {
     const int contentSize = content.size();
     if (content.at(index) != 'l')
-	return false;
+        return false;
 
-    QList<QVariant> tmp;    
+    QList<QVariant> tmp;
     ++index;
 
     do {
-	if (content.at(index) == 'e') {
-	    ++index;
-	    break;
-	}
-
-	qint64 number;
-	QByteArray byteString;
-	QList<QVariant> tmpList;
-	QMap<QByteArray, QVariant> dictionary;
-
-	if (getInteger(&number))
-	    tmp << number;
-	else if (getByteString(&byteString))
-	    tmp << byteString;
-	else if (getList(&tmpList))
-	    tmp << tmpList;
-	else if (getDictionary(&dictionary))
-	    tmp << QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary);
-	else {
-	    errString = QString("error at index %1").arg(index);
-	    return false;
-	}
+        if (content.at(index) == 'e') {
+            ++index;
+            break;
+        }
+
+        qint64 number;
+        QByteArray byteString;
+        QList<QVariant> tmpList;
+        QMap<QByteArray, QVariant> dictionary;
+
+        if (getInteger(&number))
+            tmp << number;
+        else if (getByteString(&byteString))
+            tmp << byteString;
+        else if (getList(&tmpList))
+            tmp << tmpList;
+        else if (getDictionary(&dictionary))
+            tmp << QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary);
+        else {
+            errString = QString("error at index %1").arg(index);
+            return false;
+        }
     } while (index < contentSize);
 
     if (list)
-	*list = tmp;
+        *list = tmp;
     return true;
 }
 
@@ -187,48 +187,48 @@ bool BencodeParser::getDictionary(QMap<QByteArray, QVariant> *dictionary)
 {
     const int contentSize = content.size();
     if (content.at(index) != 'd')
-	return false;
+        return false;
 
-    QMap<QByteArray, QVariant> tmp;    
+    QMap<QByteArray, QVariant> tmp;
     ++index;
 
     do {
-	if (content.at(index) == 'e') {
-	    ++index;
-	    break;
-	}
-
-	QByteArray key;
-	if (!getByteString(&key))
-	    break;
-
-	if (key == "info")
-	  infoStart = index;
-
-	qint64 number;
-	QByteArray byteString;
-	QList<QVariant> tmpList;
-	QMap<QByteArray, QVariant> dictionary;
-
-	if (getInteger(&number))
-	    tmp.insert(key, number);
-	else if (getByteString(&byteString))
-	    tmp.insert(key, byteString);
-	else if (getList(&tmpList))
-	    tmp.insert(key, tmpList);
-	else if (getDictionary(&dictionary))
-	    tmp.insert(key, QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary));
-	else {
-	    errString = QString("error at index %1").arg(index);
-	    return false;
-	}
-
-	if (key == "info")
-	  infoLength = index - infoStart;
+        if (content.at(index) == 'e') {
+            ++index;
+            break;
+        }
+
+        QByteArray key;
+        if (!getByteString(&key))
+            break;
+
+        if (key == "info")
+            infoStart = index;
+
+        qint64 number;
+        QByteArray byteString;
+        QList<QVariant> tmpList;
+        QMap<QByteArray, QVariant> dictionary;
+
+        if (getInteger(&number))
+            tmp.insert(key, number);
+        else if (getByteString(&byteString))
+            tmp.insert(key, byteString);
+        else if (getList(&tmpList))
+            tmp.insert(key, tmpList);
+        else if (getDictionary(&dictionary))
+            tmp.insert(key, QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary));
+        else {
+            errString = QString("error at index %1").arg(index);
+            return false;
+        }
+
+        if (key == "info")
+            infoLength = index - infoStart;
 
     } while (index < contentSize);
 
     if (dictionary)
-	*dictionary = tmp;
+        *dictionary = tmp;
     return true;
 }
diff --git a/examples/network/torrent/bencodeparser.h b/examples/network/torrent/bencodeparser.h
index 4fcaeab50a..5d3aeada04 100644
--- a/examples/network/torrent/bencodeparser.h
+++ b/examples/network/torrent/bencodeparser.h
@@ -54,7 +54,7 @@ class BencodeParser
 {
 public:
     BencodeParser();
-    
+
     bool parse(const QByteArray &content);
     QString errorString() const;
 
diff --git a/examples/network/torrent/filemanager.h b/examples/network/torrent/filemanager.h
index 721d62210d..41f1aa9a40 100644
--- a/examples/network/torrent/filemanager.h
+++ b/examples/network/torrent/filemanager.h
@@ -65,7 +65,7 @@ public:
 
     inline void setMetaInfo(const MetaInfo &info) { metaInfo = info; }
     inline void setDestinationFolder(const QString &directory) { destinationPath = directory; }
-    
+
     int read(int pieceIndex, int offset, int length);
     void write(int pieceIndex, int offset, const QByteArray &data);
     void verifyPiece(int pieceIndex);
diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp
index 8d664abb93..649dbb0a77 100644
--- a/examples/network/torrent/mainwindow.cpp
+++ b/examples/network/torrent/mainwindow.cpp
@@ -130,7 +130,7 @@ MainWindow::MainWindow(QWidget *parent)
     QAction *newTorrentAction = new QAction(QIcon(":/icons/bottom.png"), tr("Add &new torrent"), this);
     pauseTorrentAction = new QAction(QIcon(":/icons/player_pause.png"), tr("&Pause torrent"), this);
     removeTorrentAction = new QAction(QIcon(":/icons/player_stop.png"), tr("&Remove torrent"), this);
-    
+
     // File menu
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
     fileMenu->addAction(newTorrentAction);
diff --git a/examples/network/torrent/mainwindow.h b/examples/network/torrent/mainwindow.h
index f0c3ea62c9..6ba42be81f 100644
--- a/examples/network/torrent/mainwindow.h
+++ b/examples/network/torrent/mainwindow.h
@@ -65,7 +65,7 @@ public:
 
     QSize sizeHint() const;
     const TorrentClient *clientForRow(int row) const;
-    
+
 protected:
     void closeEvent(QCloseEvent *event);
 
@@ -94,12 +94,12 @@ private slots:
     void about();
     void setActionsEnabled();
     void acceptFileDrop(const QString &fileName);
-    
+
 private:
     int rowOfClient(TorrentClient *client) const;
     bool addTorrent(const QString &fileName, const QString &destinationFolder,
                     const QByteArray &resumeState = QByteArray());
-    
+
     TorrentView *torrentView;
     QAction *pauseTorrentAction;
     QAction *removeTorrentAction;
diff --git a/examples/network/torrent/metainfo.h b/examples/network/torrent/metainfo.h
index 741fe69299..17daca559e 100644
--- a/examples/network/torrent/metainfo.h
+++ b/examples/network/torrent/metainfo.h
@@ -100,7 +100,7 @@ public:
     // Total size
     qint64 totalSize() const;
 
-private: 
+private:
     QString errString;
     QByteArray content;
     QByteArray infoData;
diff --git a/examples/network/torrent/peerwireclient.h b/examples/network/torrent/peerwireclient.h
index 391a77b8d8..7cd08d90cb 100644
--- a/examples/network/torrent/peerwireclient.h
+++ b/examples/network/torrent/peerwireclient.h
@@ -63,7 +63,7 @@ struct TorrentBlock
                 && offset == other.offset
                 && length == other.length;
     }
-    
+
     int pieceIndex;
     int offset;
     int length;
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp
index 748e5185fe..b5969e552e 100644
--- a/examples/network/torrent/torrentclient.cpp
+++ b/examples/network/torrent/torrentclient.cpp
@@ -1020,7 +1020,7 @@ void TorrentClient::blockReceived(int pieceIndex, int begin, const QByteArray &d
     if (blocksLeftForPiece(piece) == 0) {
         // Ask the file manager to verify the newly downloaded piece
         d->fileManager.verifyPiece(piece->index);
-        
+
         // Remove this piece from all payloads
         QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.begin();
         while (it != d->payloads.end()) {
@@ -1103,7 +1103,7 @@ void TorrentClient::scheduleUploads()
         }
 
         if ((client->peerWireState() & PeerWireClient::ChokingPeer) == 0) {
-            if ((qrand() % 10) == 0) 
+            if ((qrand() % 10) == 0)
                 client->abort();
             else
                 client->chokePeer();
@@ -1245,7 +1245,7 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client)
             if (d->state == WarmingUp || (qrand() & 4) == 0) {
                 int *occurrences = new int[d->pieceCount];
                 memset(occurrences, 0, d->pieceCount * sizeof(int));
-                
+
                 // Count how many of each piece are available.
                 foreach (PeerWireClient *peer, d->connections) {
                     QBitArray peerPieces = peer->availablePieces();
@@ -1342,7 +1342,7 @@ void TorrentClient::requestMore(PeerWireClient *client)
                          ? MaxBlocksInMultiMode : MaxBlocksInProgress);
     if (numBlocksInProgress == maxInProgress)
         return;
-    
+
     // Starting with the first piece that we're waiting for, request
     // blocks until the quota is filled up.
     foreach (TorrentPiece *piece, piecesInProgress) {
@@ -1446,7 +1446,7 @@ void TorrentClient::addToPeerList(const QList<TorrentPeer> &peerList)
             // Skip our own server.
             continue;
         }
-		
+
         bool known = false;
         foreach (TorrentPeer *knownPeer, d->peers) {
             if (knownPeer->port == peer.port
diff --git a/examples/network/torrent/torrentclient.h b/examples/network/torrent/torrentclient.h
index be50189b53..7f48d1697c 100644
--- a/examples/network/torrent/torrentclient.h
+++ b/examples/network/torrent/torrentclient.h
@@ -124,7 +124,7 @@ public:
     qint64 uploadedBytes() const;
     int connectedPeerCount() const;
     int seedCount() const;
-   
+
     // Accessors for the tracker
     QByteArray peerId() const;
     QByteArray infoHash() const;
@@ -142,7 +142,7 @@ signals:
 
     void downloadCompleted();
     void peerInfoUpdated();
-    
+
     void dataSent(int uploadedBytes);
     void dataReceived(int downloadedBytes);
     void progressUpdated(int percentProgress);
diff --git a/examples/network/torrent/trackerclient.h b/examples/network/torrent/trackerclient.h
index 17d237e665..6647422e3f 100644
--- a/examples/network/torrent/trackerclient.h
+++ b/examples/network/torrent/trackerclient.h
@@ -74,7 +74,7 @@ signals:
 
     void uploadCountUpdated(qint64 newUploadCount);
     void downloadCountUpdated(qint64 newDownloadCount);
-    
+
     void stopped();
 
 protected:
@@ -99,7 +99,7 @@ private:
     qint64 length;
     QString uname;
     QString pwd;
-    
+
     bool firstTrackerRequest;
     bool lastTrackerRequest;
     bool firstSeeding;
diff --git a/examples/opengl/cube/geometryengine.cpp b/examples/opengl/cube/geometryengine.cpp
index d573ade1e7..bf63934656 100644
--- a/examples/opengl/cube/geometryengine.cpp
+++ b/examples/opengl/cube/geometryengine.cpp
@@ -50,7 +50,7 @@ struct VertexData
 };
 
 GeometryEngine::GeometryEngine()
-{    
+{
 }
 
 GeometryEngine::~GeometryEngine()
diff --git a/examples/opengl/cube/mainwidget.cpp b/examples/opengl/cube/mainwidget.cpp
index 0ba859c6b8..8c87de6736 100644
--- a/examples/opengl/cube/mainwidget.cpp
+++ b/examples/opengl/cube/mainwidget.cpp
@@ -68,7 +68,7 @@ void MainWidget::mouseReleaseEvent(QMouseEvent *e)
     // Mouse release position - mouse press position
     QVector2D diff = QVector2D(e->localPos()) - mousePressPosition;
 
-    // Rotation axis is perpendicular to the mouse position difference 
+    // Rotation axis is perpendicular to the mouse position difference
     // vector
     QVector3D n = QVector3D(diff.y(), diff.x(), 0.0).normalized();
 
diff --git a/examples/opengl/grabber/glwidget.cpp b/examples/opengl/grabber/glwidget.cpp
index f9e866b7c8..abe3a8540a 100644
--- a/examples/opengl/grabber/glwidget.cpp
+++ b/examples/opengl/grabber/glwidget.cpp
@@ -116,7 +116,7 @@ void GLWidget::initializeGL()
     gear3 = makeGear(reflectance3, 1.3, 2.0, 0.5, 0.7, 10);
 
     glEnable(GL_NORMALIZE);
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);    
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 }
 
 void GLWidget::paintGL()
diff --git a/examples/opengl/grabber/glwidget.h b/examples/opengl/grabber/glwidget.h
index 91e10edb6e..976d22a421 100644
--- a/examples/opengl/grabber/glwidget.h
+++ b/examples/opengl/grabber/glwidget.h
@@ -90,7 +90,7 @@ private:
     int yRot;
     int zRot;
     int gear1Rot;
-    
+
     QPoint lastPos;
 };
 
diff --git a/examples/opengl/hellogl_es2/bubble.cpp b/examples/opengl/hellogl_es2/bubble.cpp
index 50d64f37da..3e0f053bc8 100644
--- a/examples/opengl/hellogl_es2/bubble.cpp
+++ b/examples/opengl/hellogl_es2/bubble.cpp
@@ -114,7 +114,7 @@ void Bubble::move(const QRect &bbox)
     qreal rightOverflow = position.x() + radius - bbox.right();
     qreal topOverflow = position.y() - radius - bbox.top();
     qreal bottomOverflow = position.y() + radius - bbox.bottom();
-    
+
     if (leftOverflow < 0.0) {
         position.setX(position.x() - 2 * leftOverflow);
         vel.setX(-vel.x());
diff --git a/examples/opengl/hellogl_es2/glwidget.cpp b/examples/opengl/hellogl_es2/glwidget.cpp
index 2727c73fa5..a5c22447f0 100644
--- a/examples/opengl/hellogl_es2/glwidget.cpp
+++ b/examples/opengl/hellogl_es2/glwidget.cpp
@@ -70,7 +70,7 @@ void GLWidget::setScaling(int scale) {
         m_fScale = 1 + qreal(scale -50) / 50 * 0.5;
     else if (scale < 50)
         m_fScale =  1- (qreal(50 - scale) / 50 * 1/2);
-    else 
+    else
       m_fScale = 1;
 }
 
@@ -316,7 +316,7 @@ void GLWidget::paintGL()
     painter.drawText(20, 40, framesPerSecond + " fps");
 
     painter.end();
-    
+
     swapBuffers();
 
     QMutableListIterator<Bubble*> iter(bubbles);
diff --git a/examples/opengl/hellogl_es2/glwidget.h b/examples/opengl/hellogl_es2/glwidget.h
index 4536dc3749..8ed86b1e01 100644
--- a/examples/opengl/hellogl_es2/glwidget.h
+++ b/examples/opengl/hellogl_es2/glwidget.h
@@ -55,7 +55,7 @@ class GLWidget : public QGLWidget {
 public:
     GLWidget(QWidget *parent = 0);
     ~GLWidget();
-public slots: 
+public slots:
     void setScaling(int scale);
     void setLogo();
     void setTexture();
diff --git a/examples/opengl/hellogl_es2/mainwindow.cpp b/examples/opengl/hellogl_es2/mainwindow.cpp
index a9db386c4c..eb4ce0ac3e 100644
--- a/examples/opengl/hellogl_es2/mainwindow.cpp
+++ b/examples/opengl/hellogl_es2/mainwindow.cpp
@@ -57,7 +57,7 @@ MainWindow::MainWindow()
     QTimer *timer = new QTimer(this);
     QSlider *slider = new QSlider(this);
     slider->setOrientation(Qt::Horizontal);
-    
+
     slider->setRange(0, 100);
     slider->setSliderPosition(50);
     timer->setInterval(10);
diff --git a/examples/opengl/overpainting/bubble.cpp b/examples/opengl/overpainting/bubble.cpp
index c64cca7e0d..dbcb72bc93 100644
--- a/examples/opengl/overpainting/bubble.cpp
+++ b/examples/opengl/overpainting/bubble.cpp
@@ -85,7 +85,7 @@ void Bubble::move(const QRect &bbox)
     qreal rightOverflow = position.x() + radius - bbox.right();
     qreal topOverflow = position.y() - radius - bbox.top();
     qreal bottomOverflow = position.y() + radius - bbox.bottom();
-    
+
     if (leftOverflow < 0.0) {
         position.setX(position.x() - 2 * leftOverflow);
         vel.setX(-vel.x());
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp
index 6a0a73e867..01083edb4e 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.cpp
+++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp
@@ -50,8 +50,8 @@ QImage scale(const QString &imageFileName)
     return image.scaled(QSize(imageSize, imageSize), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 }
 
-Images::Images(QWidget *parent) 
-: QWidget(parent)
+Images::Images(QWidget *parent)
+    : QWidget(parent)
 {
     setWindowTitle(tr("Image loading and scaling example"));
     resize(800, 600);
@@ -66,11 +66,11 @@ Images::Images(QWidget *parent)
     cancelButton = new QPushButton(tr("Cancel"));
     cancelButton->setEnabled(false);
     connect(cancelButton, SIGNAL(clicked()), imageScaling, SLOT(cancel()));
-   
+
     pauseButton = new QPushButton(tr("Pause/Resume"));
     pauseButton->setEnabled(false);
     connect(pauseButton, SIGNAL(clicked()), imageScaling, SLOT(togglePaused()));
-   
+
     QHBoxLayout *buttonLayout = new QHBoxLayout();
     buttonLayout->addWidget(openButton);
     buttonLayout->addWidget(cancelButton);
@@ -101,7 +101,7 @@ void Images::open()
     }
 
     // Show a file open dialog at QStandardPaths::PicturesLocation.
-    QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Images"), 
+    QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Images"),
                             QStandardPaths::writableLocation(QStandardPaths::PicturesLocation),
                             "*.jpg *.png");
 
@@ -143,4 +143,3 @@ void Images::finished()
 }
 
 #endif // QT_NO_CONCURRENT
-
diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp
index 155bb2ee11..c646105db6 100644
--- a/examples/qtconcurrent/progressdialog/main.cpp
+++ b/examples/qtconcurrent/progressdialog/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
     // Create a progress dialog.
     QProgressDialog dialog;
     dialog.setLabelText(QString("Progressing using %1 thread(s)...").arg(QThread::idealThreadCount()));
- 
+
     // Create a QFutureWatcher and connect signals and slots.
     QFutureWatcher<void> futureWatcher;
     QObject::connect(&futureWatcher, SIGNAL(finished()), &dialog, SLOT(reset()));
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
 
     // Display the dialog and start the event loop.
     dialog.exec();
-    
+
     futureWatcher.waitForFinished();
 
     // Query the future to check if was canceled.
diff --git a/examples/qtestlib/tutorial5/benchmarking.cpp b/examples/qtestlib/tutorial5/benchmarking.cpp
index 4ad984212b..55d25e8a36 100644
--- a/examples/qtestlib/tutorial5/benchmarking.cpp
+++ b/examples/qtestlib/tutorial5/benchmarking.cpp
@@ -81,7 +81,7 @@ void TestBenchmark::multiple()
     QFETCH(bool, useLocaleCompare);
     QString str1 = QLatin1String("This is a test string");
     QString str2 = QLatin1String("This is a test string");
-    
+
     int result;
     if (useLocaleCompare) {
         QBENCHMARK {
@@ -101,7 +101,7 @@ void TestBenchmark::series_data()
 {
     QTest::addColumn<bool>("useLocaleCompare");
     QTest::addColumn<int>("stringSize");
-    
+
     for (int i = 1; i < 10000; i += 2000) {
         QByteArray size = QByteArray::number(i);
         QTest::newRow(("locale aware compare--" + size).constData()) << true << i;
diff --git a/examples/sql/doc/src/querymodel.qdoc b/examples/sql/doc/src/querymodel.qdoc
index 9d9729192a..b25cc745e3 100644
--- a/examples/sql/doc/src/querymodel.qdoc
+++ b/examples/sql/doc/src/querymodel.qdoc
@@ -32,7 +32,7 @@
 
     \brief The Query Model example shows how to make customized versions of
     data obtained from a SQL query, using a model that encapsulates
-    the query and table views to display the results. 
+    the query and table views to display the results.
 
     \image querymodel-example.png
 */
diff --git a/examples/sql/doc/src/relationaltablemodel.qdoc b/examples/sql/doc/src/relationaltablemodel.qdoc
index cf10322c2d..36fe7e2dfb 100644
--- a/examples/sql/doc/src/relationaltablemodel.qdoc
+++ b/examples/sql/doc/src/relationaltablemodel.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example relationaltablemodel
     \title Relational Table Model Example
     \ingroup sql_examples
diff --git a/examples/sql/doc/src/tablemodel.qdoc b/examples/sql/doc/src/tablemodel.qdoc
index 146025c2d0..be1fb6b488 100644
--- a/examples/sql/doc/src/tablemodel.qdoc
+++ b/examples/sql/doc/src/tablemodel.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example tablemodel
     \title Table Model Example
     \ingroup sql_examples
diff --git a/examples/threads/queuedcustomtype/main.cpp b/examples/threads/queuedcustomtype/main.cpp
index 337970445f..98933c66f3 100644
--- a/examples/threads/queuedcustomtype/main.cpp
+++ b/examples/threads/queuedcustomtype/main.cpp
@@ -81,7 +81,7 @@ QImage createImage(int width, int height)
     int x = 0;
     int y = 0;
     int starWidth = image.width()/3;
-    int starHeight = image.height()/3; 
+    int starHeight = image.height()/3;
 
     QRect rect(x, y, starWidth, starHeight);
 
diff --git a/examples/tools/doc/contiguouscache.qdoc b/examples/tools/doc/contiguouscache.qdoc
index a02c1796c6..2f7ea716e6 100644
--- a/examples/tools/doc/contiguouscache.qdoc
+++ b/examples/tools/doc/contiguouscache.qdoc
@@ -70,7 +70,7 @@
 
     And thats it.  A perfectly reasonable cache, using minimal memory for a very large
     list.  In this case the accessor for getting the words into the cache
-    generates random information rather than fixed information.  This allows you 
+    generates random information rather than fixed information.  This allows you
     to see how the cache range is kept for a local number of rows when running the
     example.
 
diff --git a/examples/tools/doc/src/customtype.qdoc b/examples/tools/doc/src/customtype.qdoc
index a4a05350f3..56172a4e26 100644
--- a/examples/tools/doc/src/customtype.qdoc
+++ b/examples/tools/doc/src/customtype.qdoc
@@ -104,7 +104,7 @@
     With the type fully defined, implemented, and integrated with the
     meta-object system, we can now use it.
 
-    \section1 Using the Message 
+    \section1 Using the Message
 
     In the example's \c{main()} function, we show how a \c Message object can
     be printed to the console by sending it to the debug stream:
diff --git a/examples/touch/pinchzoom/mouse.cpp b/examples/touch/pinchzoom/mouse.cpp
index 9c5ca86e6a..40e6ccb127 100644
--- a/examples/touch/pinchzoom/mouse.cpp
+++ b/examples/touch/pinchzoom/mouse.cpp
@@ -158,7 +158,7 @@ void Mouse::timerEvent(QTimerEvent *)
     foreach (QGraphicsItem *item, dangerMice) {
         if (item == this)
             continue;
-        
+
         QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0));
         qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length());
         if (lineToMouse.dy() < 0)
diff --git a/examples/widgets/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp
index 2184d1bcdf..a65e998b32 100644
--- a/examples/widgets/animation/appchooser/main.cpp
+++ b/examples/widgets/animation/appchooser/main.cpp
@@ -108,7 +108,7 @@ void createStates(const QObjectList &objects,
 void createAnimations(const QObjectList &objects, QStateMachine *machine)
 {
     for (int i=0; i<objects.size(); ++i)
-        machine->addDefaultAnimation(new QPropertyAnimation(objects.at(i), "geometry"));    
+        machine->addDefaultAnimation(new QPropertyAnimation(objects.at(i), "geometry"));
 }
 
 int main(int argc, char **argv)
diff --git a/examples/widgets/animation/easing/window.h b/examples/widgets/animation/easing/window.h
index b47f236d95..d7fa927b49 100644
--- a/examples/widgets/animation/easing/window.h
+++ b/examples/widgets/animation/easing/window.h
@@ -63,11 +63,11 @@ private slots:
     void periodChanged(double);
     void amplitudeChanged(double);
     void overshootChanged(double);
-    
+
 private:
     void createCurveIcons();
     void startAnimation();
-    
+
     Ui::Form m_ui;
     QGraphicsScene m_scene;
     PixmapItem *m_item;
diff --git a/examples/widgets/animation/stickman/animation.cpp b/examples/widgets/animation/stickman/animation.cpp
index ebfbd1b5b8..730ee236e4 100644
--- a/examples/widgets/animation/stickman/animation.cpp
+++ b/examples/widgets/animation/stickman/animation.cpp
@@ -45,13 +45,13 @@
 #include <QIODevice>
 #include <QDataStream>
 
-class Frame 
+class Frame
 {
 public:
     Frame() {
     }
 
-    int nodeCount() const 
+    int nodeCount() const
     {
         return m_nodePositions.size();
     }
@@ -70,7 +70,7 @@ public:
     {
         m_nodePositions[idx] = pos;
     }
-    
+
 private:
     QVector<QPointF> m_nodePositions;
 };
@@ -81,7 +81,7 @@ Animation::Animation()
     m_frames.append(new Frame);
 }
 
-Animation::~Animation() 
+Animation::~Animation()
 {
     qDeleteAll(m_frames);
 }
@@ -89,10 +89,10 @@ Animation::~Animation()
 void Animation::setTotalFrames(int totalFrames)
 {
     while (m_frames.size() < totalFrames)
-        m_frames.append(new Frame);    
+        m_frames.append(new Frame);
 
     while (totalFrames < m_frames.size())
-        delete m_frames.takeLast();    
+        delete m_frames.takeLast();
 }
 
 int Animation::totalFrames() const
@@ -165,15 +165,15 @@ void Animation::load(QIODevice *device)
 
     QDataStream stream(device);
     stream >> m_name;
-    
+
     int frameCount;
     stream >> frameCount;
 
     for (int i=0; i<frameCount; ++i) {
-        
+
         int nodeCount;
         stream >> nodeCount;
-        
+
         Frame *frame = new Frame;
         frame->setNodeCount(nodeCount);
 
diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp
index c49fac7905..09ca45e55b 100644
--- a/examples/widgets/animation/stickman/lifecycle.cpp
+++ b/examples/widgets/animation/stickman/lifecycle.cpp
@@ -65,7 +65,7 @@ public:
         if (QSignalTransition::eventTest(e)) {
             QVariant key = static_cast<QStateMachine::SignalEvent*>(e)->arguments().at(0);
             return (key.toInt() == int(m_key));
-        } 
+        }
 
         return false;
     }
@@ -100,7 +100,7 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
     const int stickManNodeCount = m_stickMan->nodeCount();
     for (int i=0; i<stickManNodeCount; ++i) {
         QPropertyAnimation *pa = new QPropertyAnimation(m_stickMan->node(i), "pos");
-        m_animationGroup->addAnimation(pa);    
+        m_animationGroup->addAnimation(pa);
     }
 
     // Set up initial state graph
@@ -111,14 +111,14 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
 
     m_alive = new QState(m_machine);
     m_alive->setObjectName("alive");
-    
+
     // Make it blink when lightning strikes before entering dead animation
-    QState *lightningBlink = new QState(m_machine);    
+    QState *lightningBlink = new QState(m_machine);
     lightningBlink->assignProperty(m_stickMan->scene(), "backgroundBrush", QColor(Qt::white));
     lightningBlink->assignProperty(m_stickMan, "penColor", QColor(Qt::black));
     lightningBlink->assignProperty(m_stickMan, "fillColor", QColor(Qt::white));
     lightningBlink->assignProperty(m_stickMan, "isDead", true);
-    
+
 //! [5]
     QTimer *timer = new QTimer(lightningBlink);
     timer->setSingleShot(true);
@@ -126,13 +126,13 @@ LifeCycle::LifeCycle(StickMan *stickMan, GraphicsView *keyReceiver)
     QObject::connect(lightningBlink, SIGNAL(entered()), timer, SLOT(start()));
     QObject::connect(lightningBlink, SIGNAL(exited()), timer, SLOT(stop()));
 //! [5]
-  
+
     m_dead = new QState(m_machine);
     m_dead->assignProperty(m_stickMan->scene(), "backgroundBrush", QColor(Qt::black));
     m_dead->assignProperty(m_stickMan, "penColor", QColor(Qt::white));
     m_dead->assignProperty(m_stickMan, "fillColor", QColor(Qt::black));
     m_dead->setObjectName("dead");
-           
+
     // Idle state (sets no properties)
     m_idle = new QState(m_alive);
     m_idle->setObjectName("idle");
@@ -172,7 +172,7 @@ void LifeCycle::addActivity(const QString &fileName, Qt::Key key, QObject *sende
 QState *LifeCycle::makeState(QState *parentState, const QString &animationFileName)
 {
     QState *topLevel = new QState(parentState);
-    
+
     Animation animation;
     {
         QFile file(animationFileName);
@@ -186,7 +186,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa
         animation.setCurrentFrame(i);
 
 //! [1]
-        QState *frameState = new QState(topLevel);                       
+        QState *frameState = new QState(topLevel);
         const int nodeCount = animation.nodeCount();
         for (int j=0; j<nodeCount; ++j)
             frameState->assignProperty(m_stickMan->node(j), "pos", animation.nodePos(j));
@@ -199,7 +199,7 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa
 //! [2]
             previousState->addTransition(previousState, SIGNAL(propertiesAssigned()), frameState);
 //! [2]
-        
+
         previousState = frameState;
     }
 
diff --git a/examples/widgets/animation/stickman/node.cpp b/examples/widgets/animation/stickman/node.cpp
index b47a1e8433..0694ee3a2f 100644
--- a/examples/widgets/animation/stickman/node.cpp
+++ b/examples/widgets/animation/stickman/node.cpp
@@ -62,7 +62,7 @@ QRectF Node::boundingRect() const
 }
 
 void Node::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
-{    
+{
     painter->setPen(Qt::white);
     painter->drawEllipse(QPointF(0.0, 0.0), 5.0, 5.0);
 }
@@ -83,7 +83,7 @@ void Node::mousePressEvent(QGraphicsSceneMouseEvent *)
 void Node::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if (m_dragging)
-        setPos(mapToParent(event->pos()));    
+        setPos(mapToParent(event->pos()));
 }
 
 void Node::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h
index 337fe4a794..08928a48a6 100644
--- a/examples/widgets/animation/stickman/stickman.h
+++ b/examples/widgets/animation/stickman/stickman.h
@@ -62,7 +62,7 @@ public:
     virtual QRectF boundingRect() const;
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 
-    int nodeCount() const; 
+    int nodeCount() const;
     Node *node(int idx) const;
 
     void setDrawSticks(bool on);
@@ -90,7 +90,7 @@ private:
 
     Node *m_nodes[NodeCount];
     qreal m_perfectBoneLengths[BoneCount];
-    
+
     uint m_sticks : 1;
     uint m_isDead : 1;
     uint m_reserved : 30;
diff --git a/examples/widgets/dialogs/classwizard/classwizard.h b/examples/widgets/dialogs/classwizard/classwizard.h
index 751179f81b..34a35a2ce9 100644
--- a/examples/widgets/dialogs/classwizard/classwizard.h
+++ b/examples/widgets/dialogs/classwizard/classwizard.h
@@ -124,7 +124,7 @@ class OutputFilesPage : public QWizardPage
 {
     Q_OBJECT
 
-public:    
+public:
     OutputFilesPage(QWidget *parent = 0);
 
 protected:
diff --git a/examples/widgets/dialogs/classwizard/main.cpp b/examples/widgets/dialogs/classwizard/main.cpp
index 110ada0ed3..4a22dbb212 100644
--- a/examples/widgets/dialogs/classwizard/main.cpp
+++ b/examples/widgets/dialogs/classwizard/main.cpp
@@ -48,7 +48,7 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(classwizard);
-    
+
     QApplication app(argc, argv);
 
 #ifndef QT_NO_TRANSLATION
diff --git a/examples/widgets/dialogs/sipdialog/dialog.cpp b/examples/widgets/dialogs/sipdialog/dialog.cpp
index b3592f3308..c51feac0a5 100644
--- a/examples/widgets/dialogs/sipdialog/dialog.cpp
+++ b/examples/widgets/dialogs/sipdialog/dialog.cpp
@@ -91,7 +91,7 @@ Dialog::Dialog()
 //! [Dialog constructor part5]
     connect(button, SIGNAL(clicked()),
         qApp, SLOT(closeAllWindows()));
-    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), 
+    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
         this, SLOT(desktopResized(int)));
 }
 //! [Dialog constructor part5]
diff --git a/examples/widgets/doc/src/addressbook-fr.qdoc b/examples/widgets/doc/src/addressbook-fr.qdoc
index 0d6ff16b57..9a7bc3a6b7 100644
--- a/examples/widgets/doc/src/addressbook-fr.qdoc
+++ b/examples/widgets/doc/src/addressbook-fr.qdoc
@@ -36,7 +36,7 @@
 
     \image addressbook-tutorial-screenshot.png
 
-    Ce tutoriel va nous amener à découvrir quelques technologies fondamentales fournies 
+    Ce tutoriel va nous amener à découvrir quelques technologies fondamentales fournies
     par Qt, tel que:
 
     \list
@@ -124,7 +124,7 @@
     réutilisé dans d'autres projets
     \endlist
 
-    Comme Qt ne fournit pas de widget standard pour un carnet d'adresses, nous 
+    Comme Qt ne fournit pas de widget standard pour un carnet d'adresses, nous
     partirons d'une classe de widget Qt standard et y ajouterons des fonctionnalités.
     La classe \c AddressBook crée dans ce tutoriel peut être réutilisée si on a besoin d'un
     widget carnet d'adresses basique.
@@ -148,12 +148,12 @@
     dans \c nameLine et \c addressText sont nécessaires à de nombreuses méthodes
     du carnet d'adresses.
 
-    Il n'est pas nécessaire de déclarer les objets QLabel que nous allons utiliser 
+    Il n'est pas nécessaire de déclarer les objets QLabel que nous allons utiliser
     puisque nous n'aurons pas besoin d'y faire référence après leur création.
     La façon dont Qt gère la parenté des objets est traitée dans la section suivante.
 
     La macro Q_OBJECT implémente des fonctionnalités parmi les plus avancées de Qt.
-    Pour le moment, il est bon de voir la macro Q_OBJECT comme un raccourci nous 
+    Pour le moment, il est bon de voir la macro Q_OBJECT comme un raccourci nous
     permettant d'utiliser les méthodes \l{QObject::}{tr()} et \l{QObject::}{connect()}.
 
     Nous en avons maintenant terminé avec le fichier \c addressbook.h et allons
@@ -295,13 +295,13 @@
 
     Le bouton \c addButton est affiché en invoquant la méthode \l{QPushButton::show()}
     {show()}, tandis que \c submitButton et \c cancelButton sont cachés en invoquant
-    \l{QPushButton::hide()}{hide()}. Ces deux boutons ne seront affichés que lorsque 
+    \l{QPushButton::hide()}{hide()}. Ces deux boutons ne seront affichés que lorsque
     l'utilisateur cliquera sur "Add", et ceci est géré par la méthode \c addContact()
     décrite plus loin.
 
     \snippet tutorials/addressbook/part2/addressbook.cpp connecting signals and slots
 
-    Nous connectons le signal \l{QPushButton::clicked()}{clicked()} de chaque bouton 
+    Nous connectons le signal \l{QPushButton::clicked()}{clicked()} de chaque bouton
     au slot qui gèrera l'action.
     L'image ci-dessous illustre ceci:
 
@@ -379,8 +379,8 @@
 
     \snippet tutorials/addressbook/part2/addressbook.cpp cancel
 
-    L'idée générale pour augmenter la flexibilité lors de l'ajout d'un 
-    contact est de donner la possiblité de cliquer sur "Add" 
+    L'idée générale pour augmenter la flexibilité lors de l'ajout d'un
+    contact est de donner la possiblité de cliquer sur "Add"
     ou "Cancel" à n'importe quel moment.
     L'organigramme ci-dessous reprend l'ensemble des interactions dévelopées
     jusqu'ici:
@@ -458,15 +458,15 @@
     \c mainLayout.
     \image addressbook-tutorial-part3-labeled-layout.png
 
-    Dans notre méthode \c addContact(), nous avons desactivé ces boutons 
-    pour être sûr que l'utilisateur n'utilise pas la navigation lors de 
+    Dans notre méthode \c addContact(), nous avons desactivé ces boutons
+    pour être sûr que l'utilisateur n'utilise pas la navigation lors de
     l'ajout d'un contact.
 
     \snippet tutorials/addressbook/part3/addressbook.cpp disabling navigation
 
     Dans notre méthode \c submitContact(), nous activons les boutons de
     navigation, \c nextButton et \c previousButton, en fonction de la
-    taille de \c contacts. Commen mentionné plus tôt, la navigation n'est 
+    taille de \c contacts. Commen mentionné plus tôt, la navigation n'est
     activée que si il y a plus d'un contact dans le carnet d'adresses.
     Les lignes suivantes montrent comment faire cela:
 
@@ -475,13 +475,13 @@
     Nous incluons aussi ces lignes de code dans le bouton \c cancel().
 
     Souvenez vous que nous voulons émuler une liste-liée ciruculaire à
-    l'aide de l'objet QMap, \c contacts. Pour faire cela, nous obtenons un itérateur 
+    l'aide de l'objet QMap, \c contacts. Pour faire cela, nous obtenons un itérateur
     sur \c contact dans la méthode \c next(), et ensuite:
 
     \list
         \li Si l'itérateur n'est pas à la fin de \c contacts, nous l'incrémentons
         \li Si l'itérateur est à la fin de \c contacts, nous changeons sa position
-        jusqu'au début de \c contacts. Cela donne l'illusion que notre QMap 
+        jusqu'au début de \c contacts. Cela donne l'illusion que notre QMap
         fonctionne comme une liste circulaire.
     \endlist
 
@@ -490,7 +490,7 @@
     Une fois que nous avons itéré jusqu'à l'objet recherché dans \c contacts,
     nous affichons son contenu sur \c nameLine et \c addressText.
 
-    De la même façon, pour la méthode \c previous(), nous obtenons un 
+    De la même façon, pour la méthode \c previous(), nous obtenons un
     itérateur sur \c contacts et ensuite:
 
     \list
@@ -522,7 +522,7 @@
     \image addressbook-tutorial-screenshot.png
 
     Nous avons maintenant un carnet d'adresses qui ne se contente pas de
-    lister des contacts de façon ordonnée, mais permet également la 
+    lister des contacts de façon ordonnée, mais permet également la
     navigation. Il serait pratique d'inclure des fonctions telles qu'éditer et
     supprimer, afin que les détails associés à un contact puissent être
     modifiés lorsque c'est nécessaire. Cependant, cela requiert une légère
@@ -563,7 +563,7 @@
     \dots
     \snippet tutorials/addressbook/part4/addressbook.h mode declaration
 
-    Enfin, on déclare \c currentMode pour garder une trace du mode 
+    Enfin, on déclare \c currentMode pour garder une trace du mode
     actuellement utilisé.
 
     \section1 Implémentation de la classe AddressBook
@@ -637,7 +637,7 @@
     avant de tester sa valeur.
 
     Chacun des boutons est ensuite activé ou désactivé, en fonction du mode.
-    Le code source pour les cas \c AddingMode et \c EditingMode est visible 
+    Le code source pour les cas \c AddingMode et \c EditingMode est visible
     ci-dessous:
 
     \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 1
@@ -840,7 +840,7 @@
 
     \section1 Définition de la classe AddressBook
 
-    On déclare deux slots publics, \c saveToFile() et \c loadFromFile(), 
+    On déclare deux slots publics, \c saveToFile() et \c loadFromFile(),
     ainsi que deux objets QPushButton, \c loadButton et \c saveButton.
 
     \snippet tutorials/addressbook/part6/addressbook.h save and load functions declaration
@@ -863,11 +863,11 @@
     \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
 
     Bien qu'on ne cite pas le code correspondant ici, nous ajoutons ces deux boutons au
-    layout de droite, \c button1Layout, comme pour les fonctionnalités précédentes, et 
+    layout de droite, \c button1Layout, comme pour les fonctionnalités précédentes, et
     nous connectons leurs signaux
     \l{QPushButton::clicked()}{clicked()} à leurs slots respectifs.
 
-    Pour la sauvegarde, on commence par récupérer le nom de fichier 
+    Pour la sauvegarde, on commence par récupérer le nom de fichier
     \c fileName, en utilisant QFileDialog::getSaveFileName(). C'est une
     méthode pratique fournie par QFileDialog, qui ouvre une boîte de
     dialogue modale et permet à l'utilisateur d'entrer un nom de fichier ou
@@ -966,7 +966,7 @@
     \section1 Définition de la classe AddressBook
 
     Nous ajoutons un objet QPushButton, \c exportButton, et un slot
-    public correspondant, \c exportAsVCard(), à notre classe \c AddressBook 
+    public correspondant, \c exportAsVCard(), à notre classe \c AddressBook
     dans le fichier \c addressbook.h.
 
     \snippet tutorials/addressbook/part7/addressbook.h exportAsVCard() declaration
@@ -1001,7 +1001,7 @@
     cela échoue, nous affichons un QMessageBox pour informer l'utilisateur
     à propos de l'origine du problème et nous quittons la méthode. Sinon, nous passons le
     fichier comme paramètre pour créer un objet QTextStream, \c out. De la même façon que
-    QDataStream, la classe QTextStream fournit les fonctionnalités pour 
+    QDataStream, la classe QTextStream fournit les fonctionnalités pour
     lire et écrire des fichiers de texte. Grâce à celà, le fichier \c{.vcf}
     généré pourra être ouvert et édité à l'aide d'un simple éditeur de texte.
 
@@ -1014,7 +1014,7 @@
     à un nom de famille défini ou non. Si oui, nous utilions les détails de
     \c nameList pour remplir le champ, dans le cas contraire on écrit uniquement le contenu
     de \c firstName.
- 
+
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part3
 
     Nous continuons en écrivant l'adresse du contact. Les points-virgules
@@ -1026,7 +1026,7 @@
     \snippet tutorials/addressbook/part7/addressbook.cpp export function part4
 
     À la fin de la méthode, un QMessageBox est affiché pour informer l'utilisateur
-    que la vCard a été exportée avec succès. 
+    que la vCard a été exportée avec succès.
 
     \e{vCard est une marque déposée de \l{http://www.imc.org}
     {Internet Mail Consortium}}.
diff --git a/examples/widgets/doc/src/addressbook-tutorial.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc
index db3d785616..089ab2319d 100644
--- a/examples/widgets/doc/src/addressbook-tutorial.qdoc
+++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc
@@ -73,7 +73,7 @@
     have worked through this tutorial, we recommend reading the
     \l{mainwindows/application}{Application} example, which presents a
     small GUI application, with menus, toolbars, a status bar, and so
-    on.  
+    on.
 */
 
 /*!
@@ -199,7 +199,7 @@
 
     Notice that \c addressLabel is positioned using Qt::AlignTop as an
     additional argument. This is to make sure it is not vertically centered in
-    cell (1,0). For a basic overview on Qt Layouts, refer to the 
+    cell (1,0). For a basic overview on Qt Layouts, refer to the
     \l{Layout Management} documentation.
 
     In order to install the layout object onto the widget, we have to invoke
@@ -431,7 +431,7 @@
 
     \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
 
-    The image below is the expected graphical user interface. 
+    The image below is the expected graphical user interface.
 
     \image addressbook-tutorial-part3-screenshot.png
 
diff --git a/examples/widgets/doc/src/addressbook.qdoc b/examples/widgets/doc/src/addressbook.qdoc
index ea0cb46830..becff14f3f 100644
--- a/examples/widgets/doc/src/addressbook.qdoc
+++ b/examples/widgets/doc/src/addressbook.qdoc
@@ -273,7 +273,7 @@
 
     \snippet itemviews/addressbook/addresswidget.cpp 4a
 
-    Next we extract data from the row the user intends to 
+    Next we extract data from the row the user intends to
     edit. This data is displayed in an instance of \c AddDialog
     with a different window title. The \c table is only
     updated if changes have been made to data in \c aDialog.
diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc
index 2848908233..3db55eddc5 100644
--- a/examples/widgets/doc/src/codeeditor.qdoc
+++ b/examples/widgets/doc/src/codeeditor.qdoc
@@ -60,7 +60,7 @@
 
     We will now move on to the definitions and implementations of \c
     CodeEditor and \c LineNumberArea. Let's start with the \c
-    LineNumberArea class. 
+    LineNumberArea class.
 
     \section1 The LineNumberArea Class
 
@@ -130,7 +130,7 @@
     \snippet widgets/codeeditor/codeeditor.cpp resizeEvent
 
     When the size of the editor changes, we also need to resize the
-    line number area. 
+    line number area.
 
     \snippet widgets/codeeditor/codeeditor.cpp cursorPositionChanged
 
@@ -155,7 +155,7 @@
 
     The \c lineNumberAreaPaintEvent() is called from \c LineNumberArea
     whenever it receives a paint event. We start off by painting the
-    widget's background. 
+    widget's background.
 
     \snippet widgets/codeeditor/codeeditor.cpp extraAreaPaintEvent_1
 
@@ -163,11 +163,11 @@
     numbers in the extra area for each line. Notice that in a plain
     text edit each line will consist of one QTextBlock; though, if
     line wrapping is enabled, a line may span several rows in the text
-    edit's viewport. 
+    edit's viewport.
 
     We get the top and bottom y-coordinate of the first text block,
     and adjust these values by the height of the current text block in
-    each iteration in the loop. 
+    each iteration in the loop.
 
     \snippet widgets/codeeditor/codeeditor.cpp extraAreaPaintEvent_2
 
@@ -183,7 +183,7 @@
 
     In addition to line numbers, you can add more to the extra area,
     for instance, break points.
-        
+
     QSyntaxHighlighter gives the possibility to add user data to each
     text block with
     \l{QSyntaxHighlighter::}{setCurrentBlockUserData()}. This can be
diff --git a/examples/widgets/doc/src/coloreditorfactory.qdoc b/examples/widgets/doc/src/coloreditorfactory.qdoc
index 6728d88252..ad4a37492e 100644
--- a/examples/widgets/doc/src/coloreditorfactory.qdoc
+++ b/examples/widgets/doc/src/coloreditorfactory.qdoc
@@ -78,7 +78,7 @@
 
     After the new factory has been set, all standard item delegates
     will use it (i.e, also delegates that were created before the new
-    default factory was set). 
+    default factory was set).
 
     The \c createGUI() function sets up the table and fills it
     with data.
@@ -135,17 +135,17 @@
 
     \list
     \li If the editor widget has no user property defined, the delegate
-	   asks the factory for the property name, which it in turn
-	   asks the item editor creator for. In this case, you can use 
-	   the QItemEditorCreator class, which takes the property 
-	   name to use for editing as a constructor argument.
+        asks the factory for the property name, which it in turn
+        asks the item editor creator for. In this case, you can use
+        the QItemEditorCreator class, which takes the property
+        name to use for editing as a constructor argument.
     \li If the editor requires other constructors or other
-	   initialization than provided by QItemEditorCreatorBase, you
-	   must reimplement
-	   QItemEditorCreatorBase::createWidget().
+        initialization than provided by QItemEditorCreatorBase, you
+        must reimplement
+        QItemEditorCreatorBase::createWidget().
     \li You could also subclass QItemEditorFactory if you only want
-	   to provide editors for certain kinds of data or use another
-	   method of creating the editors than using creator bases.
+        to provide editors for certain kinds of data or use another
+        method of creating the editors than using creator bases.
     \endlist
 
     In this example, we use a standard QVariant data type. You can
diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc
index f05ad42130..92048cdcaf 100644
--- a/examples/widgets/doc/src/diagramscene.qdoc
+++ b/examples/widgets/doc/src/diagramscene.qdoc
@@ -50,7 +50,7 @@
 
     In this example we show how to create such custom graphics
     scenes and items by implementing classes that inherit
-    QGraphicsScene and QGraphicsItem. 
+    QGraphicsScene and QGraphicsItem.
 
     In particular we show how to:
 
@@ -65,21 +65,21 @@
     The example consists of the following classes:
     \list
     \li \c MainWindow creates the widgets and display
-	   them in a QMainWindow. It also manages the interaction 
-	   between the widgets and the graphics scene, view and 
-	   items.
+        them in a QMainWindow. It also manages the interaction
+        between the widgets and the graphics scene, view and
+        items.
     \li \c DiagramItem inherits QGraphicsPolygonItem and
-	   represents a flowchart shape. 
+        represents a flowchart shape.
     \li \c TextDiagramItem inherits QGraphicsTextItem and
-	   represents text items in the diagram. The class adds
-	   support for moving the item with the mouse, which is not
-	   supported by QGraphicsTextItem.
+        represents text items in the diagram. The class adds
+        support for moving the item with the mouse, which is not
+        supported by QGraphicsTextItem.
     \li \c Arrow inherits QGraphicsLineItem and is an arrow
-	   that connect two DiagramItems. 
+        that connect two DiagramItems.
     \li \c DiagramScene inherits QGraphicsDiagramScene and
-	   provides support for \c DiagramItem, \c Arrow and 
-	   \c DiagramTextItem (In addition to the support already
-	   handled by QGraphicsScene).
+        provides support for \c DiagramItem, \c Arrow and
+        \c DiagramTextItem (In addition to the support already
+        handled by QGraphicsScene).
     \endlist
 
     \section1 MainWindow Class Definition
@@ -88,7 +88,7 @@
 
     The \c MainWindow class creates and lays out the widgets in a
     QMainWindow. The class forwards input from the widgets to the
-    DiagramScene. It also updates its widgets when the diagram 
+    DiagramScene. It also updates its widgets when the diagram
     scene's text item changes, or a diagram item or a diagram text item
     is inserted into the scene.
 
@@ -104,8 +104,8 @@
     \snippet graphicsview/diagramscene/mainwindow.cpp 0
 
     In the constructor we call methods to create the widgets and
-    layouts of the example before we create the diagram scene. 
-    The toolbars must be created after the scene as they connect 
+    layouts of the example before we create the diagram scene.
+    The toolbars must be created after the scene as they connect
     to its signals. We then lay the widgets out in the window.
 
     We connect to the \c itemInserted() and \c textInserted() slots of
@@ -115,20 +115,20 @@
     update the widgets that display font properties if the item
     selected is a \c DiagramTextItem.
 
-    The \c createToolBox() function creates and lays out the widgets 
+    The \c createToolBox() function creates and lays out the widgets
     of the \c toolBox QToolBox. We will not examine it with a
-    high level of detail as it does not deal with graphics framework 
+    high level of detail as it does not deal with graphics framework
     specific functionality. Here is its implementation:
 
     \snippet graphicsview/diagramscene/mainwindow.cpp 21
-    
+
     This part of the function sets up the tabbed widget item that
-    contains the flowchart shapes. An exclusive QButtonGroup always 
+    contains the flowchart shapes. An exclusive QButtonGroup always
     keeps one button checked; we want the group to allow all buttons
     to be unchecked.
     We still use a button group since we can associate user
-    data, which we use to store the diagram type, with each button. 
-    The \c createCellWidget() function sets up the buttons in the 
+    data, which we use to store the diagram type, with each button.
+    The \c createCellWidget() function sets up the buttons in the
     tabbed widget item and is examined later.
 
     The buttons of the background tabbed widget item is set up in the
@@ -137,7 +137,7 @@
     \snippet graphicsview/diagramscene/mainwindow.cpp 22
 
     We set the preferred size of the toolbox as its maximum. This
-    way, more space is given to the graphics view. 
+    way, more space is given to the graphics view.
 
     Here is the \c createActions() function:
 
@@ -202,7 +202,7 @@
     with this function is used in the tool box.
 
     Here is the \c createColorMenu() function:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 30
 
     This function creates a color menu that is used as the
@@ -224,7 +224,7 @@
 
     \snippet graphicsview/diagramscene/mainwindow.cpp 32
 
-    This function creates an icon with a filled rectangle in the 
+    This function creates an icon with a filled rectangle in the
     color of \a color. It is used for creating icons for the color
     menus in the \c fillColorToolButton, \c fontColorToolButton, and
     \c lineColorToolButton.
@@ -240,8 +240,8 @@
     with.
 
     When one of the buttons in the background tabbed widget item is
-    clicked we change the brush; we find out which button it is by 
-    checking its text. 
+    clicked we change the brush; we find out which button it is by
+    checking its text.
 
     Here is the implementation of \c buttonGroupClicked():
 
@@ -255,37 +255,37 @@
     checked at a time.
 
     \c QButtonGroup assigns an id to each button. We have set the id
-    of each button to the diagram type, as given by DiagramItem::DiagramType 
-    that will be inserted into the scene when it is clicked. We can 
-    then use the button id when we set the diagram type with 
+    of each button to the diagram type, as given by DiagramItem::DiagramType
+    that will be inserted into the scene when it is clicked. We can
+    then use the button id when we set the diagram type with
     \c setItemType(). In the case of text we assigned an id that has a
     value that is not in the DiagramType enum.
-    
+
     Here is the implementation of \c deleteItem():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 3
-    
+
     This slot deletes the selected item, if any, from the scene. It
     deletes the arrows first in order to avoid to delete them twice. If
     the item to be deleted is a \c DiagramItem, we also need to delete
     arrows connected to it; we don't want arrows in the scene that
     aren't connected to items in both ends.
-    
+
     This is the implementation of pointerGroupClicked():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 4
-    
+
     The \c pointerTypeGroup decides whether the scene is in ItemMove
-    or InsertLine mode. This button group is exclusive, i.e., only 
+    or InsertLine mode. This button group is exclusive, i.e., only
     one button is checked at any time. As with the \c buttonGroup above
     we have assigned an id to the buttons that matches values of the
     DiagramScene::Mode enum, so that we can use the id to set the
     correct mode.
-    
+
     Here is the \c bringToFront() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 5
-    
+
     Several items may collide, i.e., overlap, with each other in
     the scene.  This slot is called when the user requests that an
     item should be placed on top of the items it collides with.
@@ -296,169 +296,169 @@
     lower values. When we bring an item to the front we can loop
     through the items it collides with and set a z-value that is
     higher than all of them.
-    
+
     Here is the \c sendToBack() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 6
-    
+
     This slot works in the same way as \c bringToFront() described
     above, but sets a z-value that is lower than items the item that
     should be send to the back collides with.
-    
+
     This is the implementation of \c itemInserted():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 7
-    
+
     This slot is called from the \c DiagramScene when an item has been
     added to the scene. We set the mode of the scene back to the mode
     before the item was inserted, which is ItemMove or InsertText
-    depending on which button is checked in the \c pointerTypeGroup. 
+    depending on which button is checked in the \c pointerTypeGroup.
     We must also uncheck the button in the in the \c buttonGroup.
-    
+
     Here is the implementation of \c textInserted():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 8
-    
+
     We simply set the mode of the scene back to the mode it had before
     the text was inserted.
-    
+
     Here is the \c currentFontChanged() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 9
-    
+
     When the user requests a font change, by using one of the
     widgets in the \c fontToolBar, we create a new QFont object and
     set its properties to match the state of the widgets. This is done
     in \c handleFontChange(), so we simply call that slot.
-    
+
     Here is the \c fontSizeChanged() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 10
-    
+
     When the user requests a font change, by using one of the
     widgets in the \c fontToolBar, we create a new QFont object and
     set its properties to match the state of the widgets. This is done
     in \c handleFontChange(), so we simply call that slot.
-    
+
     Here is the implementation of \c sceneScaleChanged():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 11
-    
+
     The user can increase or decrease the scale, with the \c
     sceneScaleCombo, the scene is drawn in.
     It is not the scene itself that changes its scale, but only the
-    view.  
-    
+    view.
+
     Here is the \c textColorChanged() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 12
-    
+
     This slot is called when an item in the drop-down menu of the \c
-    fontColorToolButton is pressed. We need to change the icon on 
+    fontColorToolButton is pressed. We need to change the icon on
     the button to the color of the selected QAction. We keep a pointer
     to the selected action in \c textAction. It is in \c
     textButtonTriggered() we change the text color to the color of \c
     textAction, so we call that slot.
-    
+
     Here is the \c itemColorChanged() implementation:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 13
-    
+
     This slot handles requests for changing the color of \c
     DiagramItems in the same manner as \c textColorChanged() does for
     \c DiagramTextItems.
-    
+
     Here is the implementation of \c lineColorChanged():
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 14
-    
+
     This slot handles requests for changing the color of \c Arrows in
     the same manner that \c textColorChanged() does it for \c
     DiagramTextItems.
-    
+
     Here is the \c textButtonTriggered() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 15
-    
+
     \c textAction points to the  QAction of the currently selected menu item
     in the \c fontColorToolButton's color drop-down menu. We have set
     the data of the action to the QColor the action represents, so we
     can simply fetch this when we set the color of text with \c
     setTextColor().
-    
+
     Here is the \c fillButtonTriggered() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 16
-    
+
     \c fillAction points to the selected menu item in the drop-down
     menu of \c fillColorToolButton(). We can therefore use the data of
     this action when we set the item color with \c setItemColor().
-    
+
     Here is the \c lineButtonTriggered() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 17
-    
+
     \c lineAction point to the selected item in the drop-down menu of
-    \c lineColorToolButton. We use its data when we set the arrow 
+    \c lineColorToolButton. We use its data when we set the arrow
     color with \c setLineColor().
-    
+
     Here is the \c handleFontChange() function:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 18
-    
+
     \c handleFontChange() is called when any of the widgets that show
     font properties changes. We create a new QFont object and set its
     properties based on the widgets. We then call the \c setFont()
     function of \c DiagramScene; it is the scene that set the font of
     the \c DiagramTextItems it manages.
-    
+
     Here is the \c itemSelected() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 19
-    
+
     This slot is called when an item in the \c DiagramScene is
     selected. In the case of this example it is only text items that
     emit signals when they are selected, so we do not need to check
     what kind of graphics \a item is.
-    
+
     We set the state of the widgets to match the properties of the
     font of the selected text item.
-    
+
     This is the \c about() slot:
-    
+
     \snippet graphicsview/diagramscene/mainwindow.cpp 20
-    
+
     This slot displays an about box for the example when the user
     selects the about menu item from the help menu.
-    
+
     \section1 DiagramScene Class Definition
-    
+
     The \c DiagramScene class inherits QGraphicsScene and adds
     functionality to handle \c DiagramItems, \c Arrows, and \c
     DiagramTextItems in addition to the items handled by its super
     class.
-    
-    
+
+
     \snippet graphicsview/diagramscene/diagramscene.h 0
-    
+
     In the \c DiagramScene a mouse click can give three different
     actions: the item under the mouse can be moved, an item may be
     inserted, or an arrow may be connected between to diagram items.
     Which action a mouse click has depends on the mode, given by the
     Mode enum, the scene is in. The mode is set with the \c setMode()
     function.
-    
+
     The scene also sets the color of its items and the font of its
     text items.  The colors and font used by the scene can be set with
     the \c setLineColor(), \c setTextColor(), \c setItemColor() and \c
     setFont() functions. The type of \c DiagramItem, given by the
     DiagramItem::DiagramType function, to be created when an item is
     inserted is set with the \c setItemType() slot.
-    
+
     The \c MainWindow and \c DiagramScene share responsibility for
     the examples functionality. \c MainWindow handles the following
     tasks: the deletion of items, text, and arrows; moving diagram
-    items to the back and front; and setting the scale of the scene. 
+    items to the back and front; and setting the scale of the scene.
 
     \section1 DiagramScene Class Implementation
 
@@ -492,12 +492,12 @@
 
     \snippet graphicsview/diagramscene/diagramscene.cpp 3
 
-    This function sets the color the scene will use when creating 
+    This function sets the color the scene will use when creating
     \c DiagramItems. It also changes the color of a selected \c
     DiagramItem.
 
     This is the implementation of \c setFont():
-    
+
     \snippet graphicsview/diagramscene/diagramscene.cpp 4
 
     Set the font to use for new and selected, if a text item is
@@ -511,15 +511,15 @@
     connected to this slot. We remove the item if it has no text.
     If not, we would leak memory and confuse the user as the items
     will be edited when pressed on by the mouse.
-    
+
     The \c mousePressEvent() function handles mouse press event's
     different depending on which mode the \c DiagramScene is in. We
     examine its implementation for each mode:
-    
+
     \snippet graphicsview/diagramscene/diagramscene.cpp 6
 
     We simply create a new \c DiagramItem and add it to the scene at
-    the position the mouse was pressed. Note that the origin of its 
+    the position the mouse was pressed. Note that the origin of its
     local coordinate system will be under the mouse pointer position.
 
     \snippet graphicsview/diagramscene/diagramscene.cpp 7
@@ -534,7 +534,7 @@
     line.
 
     \snippet graphicsview/diagramscene/diagramscene.cpp 8
-    
+
     The \c DiagramTextItem is editable when the
     Qt::TextEditorInteraction flag is set, else it is movable by the
     mouse. We always want the text to be drawn on top of the other
@@ -547,12 +547,12 @@
     can then call the QGraphicsScene implementation, which
     handles movement of items with the mouse. We make this call even
     if we are in another mode making it possible to add an item and
-    then keep the mouse button pressed down and start moving 
+    then keep the mouse button pressed down and start moving
     the item. In the case of text items, this is not possible as they
     do not propagate mouse events when they are editable.
 
     This is the \c mouseMoveEvent() function:
-    
+
     \snippet graphicsview/diagramscene/diagramscene.cpp 10
 
     We must draw the line if we are in InsertMode and the mouse button
@@ -567,7 +567,7 @@
     should be added to the scene:
 
     \snippet graphicsview/diagramscene/diagramscene.cpp 11
-    
+
     First we need to get the items (if any) under the line's start
     and end points. The line itself is the first item at these points,
     so we remove it from the lists. As a precaution, we check if the
@@ -603,7 +603,7 @@
     DiagramScene. It inherits QGraphicsPolygonItem and has a polygon
     for each shape. The enum DiagramType has a value for each of the
     flowchart shapes.
-    
+
     The class has a list of the arrows that are connected to it.
     This is necessary because only the item knows when it is being
     moved (with the \c itemChanged() function) at which time the
@@ -612,7 +612,7 @@
     buttons in \c MainWindow, see \c createColorToolButtonIcon() in
     \c MainWindow.
 
-    The Type enum is a unique identifier of the class. It is used by 
+    The Type enum is a unique identifier of the class. It is used by
     \c qgraphicsitem_cast(), which does dynamic casts of graphics
     items. The UserType constant is the minimum value a custom
     graphics item type can be.
@@ -646,7 +646,7 @@
     item.
 
     Here is the \c addArrow() function:
-    
+
     \snippet graphicsview/diagramscene/diagramitem.cpp 3
 
     This function simply adds the \a arrow to the items \c arrows list.
@@ -695,7 +695,7 @@
     possible to alter the mouse behavior of QGraphicsTextItem.
 
     \section1 DiagramTextItem Implementation
-    
+
     We start with the constructor:
 
     \snippet graphicsview/diagramscene/diagramtextitem.cpp 0
@@ -717,7 +717,7 @@
 
     \c DiagramScene uses the signal emitted when the text item looses
     focus to remove the item if it is empty, i.e., it contains no
-    text. 
+    text.
 
     This is the implementation of \c mouseDoubleClickEvent():
 
@@ -740,7 +740,7 @@
 
     The item's color can be set with \c setColor().
 
-    \c boundingRect() and \c shape() are reimplemented 
+    \c boundingRect() and \c shape() are reimplemented
     from QGraphicsLineItem and are used by the scene
     to check for collisions and selections.
 
@@ -769,7 +769,7 @@
     We need to reimplement this function because the arrow is
     larger than the bounding rectangle of the QGraphicsLineItem. The
     graphics scene uses the bounding rectangle to know which regions
-    of the scene to update. 
+    of the scene to update.
 
     Here is the \c shape() function:
 
@@ -779,14 +779,14 @@
     shape of the item. The QGraphicsLineItem::shape() returns a path
     with a line drawn with the current pen, so we only need to add
     the arrow head. This function is used to check for collisions and
-    selections with the mouse. 
+    selections with the mouse.
 
     Here is the \c updatePosition() slot:
 
     \snippet graphicsview/diagramscene/arrow.cpp 3
 
     This slot updates the arrow by setting the start and end
-    points of its line to the center of the items it connects. 
+    points of its line to the center of the items it connects.
 
     Here is the \c paint() function:
 
@@ -809,7 +809,7 @@
     one of the lines of the polygon. Note that the points in the
     polygon are relative to the local coordinate system of the item.
     We must therefore add the position of the end item to make the
-    coordinates relative to the scene. 
+    coordinates relative to the scene.
 
     \snippet graphicsview/diagramscene/arrow.cpp 6
 
diff --git a/examples/widgets/doc/src/dockwidgets.qdoc b/examples/widgets/doc/src/dockwidgets.qdoc
index 7f08572a30..2987ec1211 100644
--- a/examples/widgets/doc/src/dockwidgets.qdoc
+++ b/examples/widgets/doc/src/dockwidgets.qdoc
@@ -133,7 +133,7 @@
     that the entire name and address insertion is treated as a single
     operation by the QTextEdit, so a single undo will revert all the
     insertions.
-    
+
     \snippet mainwindows/dockwidgets/mainwindow.cpp 7
 
     This function works in a similar way to \c insertCustomer(). First
@@ -141,7 +141,7 @@
     replace it with the standard paragraph that the user clicked. Again
     we use a \c beginEditBlock() ... \c endEditBlock() pair so that the
     insertion can be undone as a single operation.
-    
+
     \snippet mainwindows/dockwidgets/mainwindow.cpp 3
 
     Qt's QTextDocument class makes printing documents easy. We simply
diff --git a/examples/widgets/doc/src/easing.qdoc b/examples/widgets/doc/src/easing.qdoc
index 392cb4e826..1b5f0c8077 100644
--- a/examples/widgets/doc/src/easing.qdoc
+++ b/examples/widgets/doc/src/easing.qdoc
@@ -31,7 +31,7 @@
 
     \brief The Easing Curves example shows how to use easing curves to
     control the speed of an animation.
-    
+
     \image easing-example.png
 
 */
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc
index eae5269d62..7b7aa9b868 100644
--- a/examples/widgets/doc/src/echoplugin.qdoc
+++ b/examples/widgets/doc/src/echoplugin.qdoc
@@ -46,7 +46,7 @@
     System}{meta-object system}. The plugin \l{How to Create Qt
     Plugins}{overview document} gives a high-level introduction to
     plugins.
-    
+
     We have implemented a plugin, the \c EchoPlugin, which implements
     the \c EchoInterface. The interface consists of \c echo(), which
     takes a QString as argument. The \c EchoPlugin returns the string
@@ -68,8 +68,8 @@
     \snippet tools/echoplugin/echowindow/echowindow.h 0
 
     We load the plugin in \c loadPlugin() and cast it to \c
-    EchoInterface. When the user clicks the \c button we take the 
-    text in \c lineEdit and call the interface's \c echo() with it. 
+    EchoInterface. When the user clicks the \c button we take the
+    text in \c lineEdit and call the interface's \c echo() with it.
 
 
     \section1 EchoWindow Class Implementation
@@ -136,15 +136,15 @@
     System}{Qt's meta object system} aware of the interface. We do
     this so that it will be possible to identify plugins that
     implements the interface at run-time. The second argument is a
-    string that must identify the interface in a unique way. 
+    string that must identify the interface in a unique way.
 
 
     \section1 EchoPlugin Class Definition
 
     We inherit both QObject and \c EchoInterface to make this class a
     plugin. The Q_INTERFACES macro tells Qt which interfaces the class
-    implements. In our case we only implement the \c EchoInterface. 
-    If a class implements more than one interface, they are given as 
+    implements. In our case we only implement the \c EchoInterface.
+    If a class implements more than one interface, they are given as
     a comma separated list. The Q_PLUGIN_METADATA macro is included next
     to the Q_OBJECT macro. It contains the plugins IID and a filename
     pointing to a json file containing the metadata for the plugin.
@@ -158,7 +158,7 @@
 
     \snippet tools/echoplugin/plugin/echoplugin.cpp 0
 
-    We simply return the functions parameter. 
+    We simply return the functions parameter.
 
     \section1 The \c main() function
 
@@ -169,7 +169,7 @@
     \section1 The Profiles
 
     When creating plugins the profiles need to be adjusted.
-    We show here what changes need to be done. 
+    We show here what changes need to be done.
 
     The profile in the echoplugin directory uses the \c subdirs
     template and simply includes includes to directories in which
@@ -196,7 +196,7 @@
 
     You can find an overview of the macros needed to create plugins
     \l{Macros for Defining Plugins}{here}.
-    
+
     We give an example of a plugin that extend Qt in the \l{Style
     Plugin Example}{style plugin} example. The \l{Plug & Paint
     Example}{plug and paint} example shows how to create static
diff --git a/examples/widgets/doc/src/fetchmore.qdoc b/examples/widgets/doc/src/fetchmore.qdoc
index 2f32a5d43d..1b1e87e06b 100644
--- a/examples/widgets/doc/src/fetchmore.qdoc
+++ b/examples/widgets/doc/src/fetchmore.qdoc
@@ -62,7 +62,7 @@
     \l{QAbstractItemModel::}{fetchMore()} and
     \l{QAbstractItemModel::}{canFetchMore()} from QAbstractItemModel.
     These functions are called by the item view when it needs more
-    items. 
+    items.
 
     The \c setDirPath() function sets the directory the model will
     work on. We emit \c numberPopulated() each time we add a batch of
diff --git a/examples/widgets/doc/src/flowlayout.qdoc b/examples/widgets/doc/src/flowlayout.qdoc
index f7f5496d07..b482edf946 100644
--- a/examples/widgets/doc/src/flowlayout.qdoc
+++ b/examples/widgets/doc/src/flowlayout.qdoc
@@ -35,27 +35,27 @@
     \image flowlayout-example.png Screenshot of the Flow Layout example
 
     The items are first laid out horizontally and then vertically when each line
-    in the layout runs out of space. 
+    in the layout runs out of space.
 
-	The Flowlayout class mainly uses QLayout and QWidgetItem, while the
-	Window uses QWidget and QLabel. We will only document the definition 
-	and implementation of \c FlowLayout below.
+    The Flowlayout class mainly uses QLayout and QWidgetItem, while the
+    Window uses QWidget and QLabel. We will only document the definition
+    and implementation of \c FlowLayout below.
 
     \section1 FlowLayout Class Definition
-    
-    The \c FlowLayout class inherits QLayout. It is a custom layout class 
-    that arranges its child widgets horizontally and vertically. 
+
+    The \c FlowLayout class inherits QLayout. It is a custom layout class
+    that arranges its child widgets horizontally and vertically.
 
     \snippet layouts/flowlayout/flowlayout.h 0
 
     We reimplement functions inherited from QLayout. These functions add items to
-    the layout and handle their orientation and geometry. 
-    
+    the layout and handle their orientation and geometry.
+
     We also declare two private methods, \c doLayout() and \c smartSpacing().
     \c doLayout() lays out the layout items, while the \c
     smartSpacing() function calculates the spacing between them.
 
-    \section1 FlowLayout Class Implementation 
+    \section1 FlowLayout Class Implementation
 
     We start off by looking at the constructor:
 
@@ -63,32 +63,32 @@
 
     In the constructor we call \c setContentsMargins() to set the left, top,
     right and bottom margin. By default, QLayout uses values provided by
-    the current style (see QStyle::PixelMetric). 
+    the current style (see QStyle::PixelMetric).
 
     \snippet layouts/flowlayout/flowlayout.cpp 2
 
-    In this example we reimplement \c addItem(), which is a pure virtual 
-    function. When using \c addItem() the ownership of the layout items is 
-    transferred to the layout, and it is therefore the layout's 
-    responsibility to delete them. 
-    
+    In this example we reimplement \c addItem(), which is a pure virtual
+    function. When using \c addItem() the ownership of the layout items is
+    transferred to the layout, and it is therefore the layout's
+    responsibility to delete them.
+
     \snippet layouts/flowlayout/flowlayout.cpp 3
-    
-    \c addItem() is implemented to add items to the layout. 
+
+    \c addItem() is implemented to add items to the layout.
 
     \snippet layouts/flowlayout/flowlayout.cpp 4
 
     We implement \c horizontalSpacing() and \c verticalSpacing() to get
-    hold of the spacing between the widgets inside the layout. If the value 
-    is less than or equal to 0, this value will be used. If not, 
+    hold of the spacing between the widgets inside the layout. If the value
+    is less than or equal to 0, this value will be used. If not,
     \c smartSpacing() will be called to calculate the spacing.
 
     \snippet layouts/flowlayout/flowlayout.cpp 5
-    
-    We then implement \c count() to return the number of items in the 
-    layout. To navigate the list of items we use \c itemAt() and 
-    takeAt() to remove and return items from the list. If an item is 
-    removed, the remaining items will be renumbered. All three 
+
+    We then implement \c count() to return the number of items in the
+    layout. To navigate the list of items we use \c itemAt() and
+    takeAt() to remove and return items from the list. If an item is
+    removed, the remaining items will be renumbered. All three
     functions are pure virtual functions from QLayout.
 
     \snippet layouts/flowlayout/flowlayout.cpp 6
@@ -103,7 +103,7 @@
     dependency, and \c heightForWidth() passes the width on to \c doLayout() which
     in turn uses the width as an argument for the layout rect, i.e., the bounds in
     which the items are laid out. This rect does not include the layout margin().
-    
+
     \snippet layouts/flowlayout/flowlayout.cpp 8
 
     \c setGeometry() is normally used to do the actual layout, i.e., calculate
@@ -116,30 +116,30 @@
     \snippet layouts/flowlayout/flowlayout.cpp 9
 
     \c doLayout() handles the layout if \c horizontalSpacing() or \c
-    verticalSpacing() don't return the default value. It uses 
-    \c getContentsMargins() to calculate the area available to the 
-    layout items. 
- 
+    verticalSpacing() don't return the default value. It uses
+    \c getContentsMargins() to calculate the area available to the
+    layout items.
+
     \snippet layouts/flowlayout/flowlayout.cpp 10
 
-	It then sets the proper amount of spacing for each widget in the 
-	layout, based on the current style. 
-	
+    It then sets the proper amount of spacing for each widget in the
+    layout, based on the current style.
+
     \snippet layouts/flowlayout/flowlayout.cpp 11
 
-	The position of each item in the layout is then calculated by 
-	adding the items width and the line height to the initial x and y 
-	coordinates. This in turn lets us find out whether the next item 
-	will fit on the current line or if it must be moved down to the next. 
-	We also find the height of the current line based on the widgets height. 
-	
+    The position of each item in the layout is then calculated by
+    adding the items width and the line height to the initial x and y
+    coordinates. This in turn lets us find out whether the next item
+    will fit on the current line or if it must be moved down to the next.
+    We also find the height of the current line based on the widgets height.
+
     \snippet layouts/flowlayout/flowlayout.cpp 12
 
-	\c smartSpacing() is designed to get the default spacing for either 
-	the top-level layouts or the sublayouts. The default spacing for 
-	top-level layouts, when the parent is a QWidget, will be determined 
-	by querying the style. The default spacing for sublayouts, when 
-	the parent is a QLayout, will be determined by querying the spacing 
-	of the parent layout.
+    \c smartSpacing() is designed to get the default spacing for either
+    the top-level layouts or the sublayouts. The default spacing for
+    top-level layouts, when the parent is a QWidget, will be determined
+    by querying the style. The default spacing for sublayouts, when
+    the parent is a QLayout, will be determined by querying the spacing
+    of the parent layout.
 
 */
diff --git a/examples/widgets/doc/src/fontsampler.qdoc b/examples/widgets/doc/src/fontsampler.qdoc
index b833390def..8a2678e2f8 100644
--- a/examples/widgets/doc/src/fontsampler.qdoc
+++ b/examples/widgets/doc/src/fontsampler.qdoc
@@ -30,7 +30,7 @@
   \title Font Sampler Example
   \ingroup examples-painting
   \brief The Font Sampler example shows how to preview and print multi-page documents.
-  
+
   The Font Sampler example shows how to preview and print multi-page documents.
 
   \image fontsampler-example.png
diff --git a/examples/widgets/doc/src/fridgemagnets.qdoc b/examples/widgets/doc/src/fridgemagnets.qdoc
index 5db2cd586c..abaeb2c52a 100644
--- a/examples/widgets/doc/src/fridgemagnets.qdoc
+++ b/examples/widgets/doc/src/fridgemagnets.qdoc
@@ -230,7 +230,7 @@
     top-level corner of the drag pixmap, to be the point we calculated
     above. This makes the process of dragging the label feel more natural
     because the cursor always points to the same place on the label
-    during the drag operation. 
+    during the drag operation.
 
     We start the drag operation using QDrag's \l{QDrag::}{exec()} function,
     requesting that the magnet is copied when the drag is completed.
diff --git a/examples/widgets/doc/src/mdi.qdoc b/examples/widgets/doc/src/mdi.qdoc
index b35975d50c..c3f74f7a9f 100644
--- a/examples/widgets/doc/src/mdi.qdoc
+++ b/examples/widgets/doc/src/mdi.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example mainwindows/mdi
     \title MDI Example
     \ingroup examples-mainwindow
diff --git a/examples/widgets/doc/src/moveblocks.qdoc b/examples/widgets/doc/src/moveblocks.qdoc
index c9eecc9769..b41b16519d 100644
--- a/examples/widgets/doc/src/moveblocks.qdoc
+++ b/examples/widgets/doc/src/moveblocks.qdoc
@@ -43,7 +43,7 @@
         \li \c StateSwitcher inherits QState and can add
               \c {StateSwitchTransition}s to other states.
               When entered, it will randomly transition to one of these
-              states. 
+              states.
         \li \c StateSwitchTransition is a custom transition that
            triggers on \c{StateSwitchEvent}s.
         \li \c StateSwitchEvent is a QEvent that triggers \c{StateSwitchTransition}s.
@@ -152,7 +152,7 @@
     \c StateSwitcher is a state designed for a particular purpose and
     will always be a top-level state. We use \c m_stateCount to keep
     track of how many states we are managing, and \c m_lastIndex to
-    remember which state was the last state to which we transitioned. 
+    remember which state was the last state to which we transitioned.
 
     \snippet animation/moveblocks/main.cpp 11
 
diff --git a/examples/widgets/doc/src/pixelator.qdoc b/examples/widgets/doc/src/pixelator.qdoc
index 1e9af00361..c8b04bb4bc 100644
--- a/examples/widgets/doc/src/pixelator.qdoc
+++ b/examples/widgets/doc/src/pixelator.qdoc
@@ -216,7 +216,7 @@
 
     This enables the items to be drawn without any gaps between them. Removing
     the headers also prevents the user from adjusting the sizes of individual
-    rows and columns. 
+    rows and columns.
 
     We also set the minimum section size to 1 on the headers. If we
     didn't, the headers would default to a larger size, preventing
diff --git a/examples/widgets/doc/src/recentfiles.qdoc b/examples/widgets/doc/src/recentfiles.qdoc
index 939ef8b939..58f28b2832 100644
--- a/examples/widgets/doc/src/recentfiles.qdoc
+++ b/examples/widgets/doc/src/recentfiles.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example mainwindows/recentfiles
     \title Recent Files Example
     \ingroup examples-mainwindow
diff --git a/examples/widgets/doc/src/regexp.qdoc b/examples/widgets/doc/src/regexp.qdoc
index 9dc3878c10..0523204fce 100644
--- a/examples/widgets/doc/src/regexp.qdoc
+++ b/examples/widgets/doc/src/regexp.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example tools/regexp
     \title Regular Expressions Example
     \ingroup examples-widgets-tools
diff --git a/examples/widgets/doc/src/rogue.qdoc b/examples/widgets/doc/src/rogue.qdoc
index 81f34edc68..1690a351fb 100644
--- a/examples/widgets/doc/src/rogue.qdoc
+++ b/examples/widgets/doc/src/rogue.qdoc
@@ -151,7 +151,7 @@
 
     When we enter \c quitState, we update the status bar of the
     window.
-    
+
     \c QKeyEventTransition is a utility class that removes the hassle
     of implementing transitions for \l{QKeyEvent}s. We simply need to
     specify the key on which the transition should trigger and the
@@ -161,7 +161,7 @@
 
     The transition from \c inputState allows triggering the quit state
     when the player types \c {q}.
-    
+
     \snippet statemachine/rogue/window.cpp 5
 
     The machine is set up, so it's time to start it.
diff --git a/examples/widgets/doc/src/sdi.qdoc b/examples/widgets/doc/src/sdi.qdoc
index 3e703a0ba8..3e8780423a 100644
--- a/examples/widgets/doc/src/sdi.qdoc
+++ b/examples/widgets/doc/src/sdi.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example mainwindows/sdi
     \title SDI Example
     \ingroup examples-mainwindow
diff --git a/examples/widgets/doc/src/settingseditor.qdoc b/examples/widgets/doc/src/settingseditor.qdoc
index b53b0389cc..f1e84b7eb6 100644
--- a/examples/widgets/doc/src/settingseditor.qdoc
+++ b/examples/widgets/doc/src/settingseditor.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example tools/settingseditor
     \title Settings Editor Example
     \ingroup examples-widgets-tools
diff --git a/examples/widgets/doc/src/simplewidgetmapper.qdoc b/examples/widgets/doc/src/simplewidgetmapper.qdoc
index 0b92c3a4b4..771ac982b5 100644
--- a/examples/widgets/doc/src/simplewidgetmapper.qdoc
+++ b/examples/widgets/doc/src/simplewidgetmapper.qdoc
@@ -61,7 +61,7 @@
 
     The constructor of the \c Window class can be explained in three parts.
     In the first part, we set up the widgets used for the user interface:
-    
+
     \snippet itemviews/simplewidgetmapper/window.cpp Set up widgets
 
     We also set up the buddy relationships between various labels and the
diff --git a/examples/widgets/doc/src/spinboxes.qdoc b/examples/widgets/doc/src/spinboxes.qdoc
index 86cc246419..998a6d2636 100644
--- a/examples/widgets/doc/src/spinboxes.qdoc
+++ b/examples/widgets/doc/src/spinboxes.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example widgets/spinboxes
     \title Spin Boxes Example
     \ingroup examples-widgets
diff --git a/examples/widgets/doc/src/standarddialogs.qdoc b/examples/widgets/doc/src/standarddialogs.qdoc
index 57c3281ae8..26c2548611 100644
--- a/examples/widgets/doc/src/standarddialogs.qdoc
+++ b/examples/widgets/doc/src/standarddialogs.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example dialogs/standarddialogs
     \title Standard Dialogs Example
     \ingroup examples-dialogs
diff --git a/examples/widgets/doc/src/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc
index dae7ac9c80..4ee452d866 100644
--- a/examples/widgets/doc/src/stardelegate.qdoc
+++ b/examples/widgets/doc/src/stardelegate.qdoc
@@ -257,7 +257,7 @@
     \l{QAbstractItemView::editTriggers()}{edit triggers}, so that the
     editor is opened with a single click when the star rating item is
     selected.
-    
+
     The \c populateTableWidget() function fills the QTableWidget with
     data:
 
diff --git a/examples/widgets/doc/src/styleplugin.qdoc b/examples/widgets/doc/src/styleplugin.qdoc
index 51d1e5e73e..e65ded36a4 100644
--- a/examples/widgets/doc/src/styleplugin.qdoc
+++ b/examples/widgets/doc/src/styleplugin.qdoc
@@ -43,7 +43,7 @@
     from that class, and adding a macro. In this example we extend Qt
     by adding a new GUI look and feel (i.e., making a new QStyle
     available). A high-level introduction to plugins is given in the
-    plugin \l{How to Create Qt Plugins}{overview document}. 
+    plugin \l{How to Create Qt Plugins}{overview document}.
 
     Plugins that provide new styles inherit the QStylePlugin base
     class. Style plugins are loaded by Qt and made available through
@@ -72,7 +72,7 @@
     \section1 SimpleStylePlugin Class Definition
 
     \c SimpleStylePlugin inherits QStylePlugin and is the plugin
-    class. 
+    class.
 
     \snippet tools/styleplugin/plugin/simplestyleplugin.h 0
 
diff --git a/examples/widgets/doc/src/stylesheet.qdoc b/examples/widgets/doc/src/stylesheet.qdoc
index 79d9b35082..ee08b7b88a 100644
--- a/examples/widgets/doc/src/stylesheet.qdoc
+++ b/examples/widgets/doc/src/stylesheet.qdoc
@@ -30,7 +30,7 @@
     \title Style Sheet Example
     \ingroup examples-widgets
     \brief The Style Sheet Example shows how to use style sheets.
-    
+
     \image stylesheet-pagefold.png Screen Shot of the Pagefold style sheet
 */
 
diff --git a/examples/widgets/doc/src/sub-attaq.qdoc b/examples/widgets/doc/src/sub-attaq.qdoc
index 1472412855..3b0070b28a 100644
--- a/examples/widgets/doc/src/sub-attaq.qdoc
+++ b/examples/widgets/doc/src/sub-attaq.qdoc
@@ -31,7 +31,7 @@
 
     \brief This example shows Qt's ability to combine \l{The Animation Framework}{the animation framework}
     and \l{The State Machine Framework}{the state machine framework} to create a game.
-    
+
     \image sub-attaq-demo.png
 
     The purpose of the game is to destroy all submarines to win the current level.
diff --git a/examples/widgets/doc/src/tablet.qdoc b/examples/widgets/doc/src/tablet.qdoc
index 6cb9ef5057..4fa67b85d3 100644
--- a/examples/widgets/doc/src/tablet.qdoc
+++ b/examples/widgets/doc/src/tablet.qdoc
@@ -41,7 +41,7 @@
     it is close but not pressed down on it), when a device is pushed
     down and released from it, and when a device is moved on the
     tablet.
-  
+
     The information available in QTabletEvent depends on the device
     used. The tablet in this example has two different devices for
     drawing: a stylus and an airbrush. For both devices the event
@@ -61,23 +61,23 @@
     The example consists of the following:
 
     \list
-        \li The \c MainWindow class inherits QMainWindow and creates
-           the examples menus and connect their slots and signals.
+    \li The \c MainWindow class inherits QMainWindow and creates
+        the examples menus and connect their slots and signals.
     \li The \c TabletCanvas class inherits QWidget and
-	   receives tablet events. It uses the events to paint on a
-           offscreen pixmap, which it draws onto itself.
+        receives tablet events. It uses the events to paint on a
+        offscreen pixmap, which it draws onto itself.
     \li The \c TabletApplication class inherits QApplication. This
-	   class handles tablet events that are not sent to \c tabletEvent(). 
-	   We will look at this later.
+        class handles tablet events that are not sent to \c tabletEvent().
+        We will look at this later.
     \li The \c main() function creates a \c MainWindow and shows it
-	   as a top level window.
+        as a top level window.
     \endlist
 
 
     \section1 MainWindow Class Definition
 
-    The \c MainWindow creates a \c TabletCanvas and sets it as its 
-    center widget. 
+    The \c MainWindow creates a \c TabletCanvas and sets it as its
+    center widget.
 
     \snippet widgets/tablet/mainwindow.h 0
 
@@ -115,10 +115,10 @@
 
     \snippet widgets/tablet/mainwindow.cpp 2
 
-    The \c TabletCanvas class supports two ways by which the alpha 
+    The \c TabletCanvas class supports two ways by which the alpha
     channel of the drawing color can be changed: tablet pressure and
     tilt. We have one action for each and an action if the alpha
-    channel should not be changed. 
+    channel should not be changed.
 
     Here is the implementation of \c lineWidthActionTriggered():
 
@@ -155,12 +155,12 @@
 
     \snippet widgets/tablet/mainwindow.cpp 7
 
-    We show a message box with a short description of the example. 
+    We show a message box with a short description of the example.
 
     \c createActions() creates all actions and action groups of
     the example. We look at the creation of one action group and its
     actions. See the \l{Application Example}{application example} if
-    you want a high-level introduction to QActions. 
+    you want a high-level introduction to QActions.
 
     Here is the implementation of \c createActions:
 
@@ -189,7 +189,7 @@
     \section1 TabletCanvas Class Definition
 
     The \c TabletCanvas class provides a surface on which the
-    user can draw with a tablet. 
+    user can draw with a tablet.
 
     \snippet widgets/tablet/tabletcanvas.h 0
 
@@ -198,7 +198,7 @@
     these; their values decide if it is the tablet pressure or tilt
     that will alter them. We keep a private variable for each, the \c
     alphaChannelType, \c colorSturationType, and \c penWidthType,
-    which we provide access functions for. 
+    which we provide access functions for.
 
     We draw on a QPixmap with \c myPen and \c myBrush using \c
     myColor. The \c saveImage() and \c loadImage() saves and loads
@@ -291,7 +291,7 @@
     -60, 127 equals 0, and 255 equals 60 degrees. The angle measured
     is between the device and the perpendicular of the tablet (see
     QTabletEvent for an illustration).
-         
+
     \snippet widgets/tablet/tabletcanvas.cpp 8
 
     The alpha channel of QColor is given as a number between 0
@@ -301,8 +301,8 @@
     taking the absolute value we get the smallest alpha values (i.e.,
     the color is most transparent) when the pen is perpendicular to
     the tablet. We select the largest of the vertical and horizontal
-    tilt value. 
- 
+    tilt value.
+
     \snippet widgets/tablet/tabletcanvas.cpp 9
 
     The colorsaturation is given as a number between 0 and 255. It is
@@ -317,7 +317,7 @@
     the angle between the device and the perpendicular of the tablet.
 
     \snippet widgets/tablet/tabletcanvas.cpp 11
-   
+
     We finally check whether the pointer is the stylus or the eraser.
     If it is the eraser, we set the color to the background color of
     the pixmap an let the pressure decide the pen width, else we set
@@ -327,7 +327,7 @@
     \section1 TabletApplication Class Definition
 
     We inherit QApplication in this class because we want to
-    reimplement the \l{QApplication::}{event()} function. 
+    reimplement the \l{QApplication::}{event()} function.
 
     \snippet widgets/tablet/tabletapplication.h 0
 
@@ -336,7 +336,7 @@
     and TabletLeaveProximity events are not sendt to the QApplication
     object, while other tablet events are sendt to the QWidget's
     \c event(), which sends them on to \l{QWidget::}{tabletEvent()}.
-    Since we want to handle these events we have implemented \c 
+    Since we want to handle these events we have implemented \c
     TabletApplication.
 
 
@@ -352,7 +352,7 @@
     events is to do work that is dependent on what kind of device is
     used on the tablet. This way, you don't have to do this work
     when other events are generated, which is more frequently than the
-    leave and enter proximity events. We call \c setTabletDevice() in 
+    leave and enter proximity events. We call \c setTabletDevice() in
     \c TabletCanvas.
 
     \section1 The \c main() function
diff --git a/examples/widgets/doc/src/tetrix.qdoc b/examples/widgets/doc/src/tetrix.qdoc
index 599323deb0..7527d6758f 100644
--- a/examples/widgets/doc/src/tetrix.qdoc
+++ b/examples/widgets/doc/src/tetrix.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \example widgets/tetrix
     \title Tetrix Example
     \ingroup examples-widgets
diff --git a/examples/widgets/doc/src/undo.qdoc b/examples/widgets/doc/src/undo.qdoc
index 07f586b8f3..fc89751e90 100644
--- a/examples/widgets/doc/src/undo.qdoc
+++ b/examples/widgets/doc/src/undo.qdoc
@@ -35,7 +35,7 @@
     \image undodemo.png
 
     Qt's undo framework is an implementation of the Command
-    pattern, which provides advanced undo/redo functionality. 
+    pattern, which provides advanced undo/redo functionality.
 
     To show the abilities of the framework, we have implemented a
     small diagram application in which the diagram items are geometric
diff --git a/examples/widgets/doc/src/undoframework.qdoc b/examples/widgets/doc/src/undoframework.qdoc
index ba146e65b9..1710ab9132 100644
--- a/examples/widgets/doc/src/undoframework.qdoc
+++ b/examples/widgets/doc/src/undoframework.qdoc
@@ -61,9 +61,9 @@
 
     The example consists of the following classes:
 
-    \list 
+    \list
         \li \c MainWindow is the main window and arranges the
-              example's widgets. It creates the commands based 
+              example's widgets. It creates the commands based
               on user input and keeps them on the command stack.
         \li \c AddCommand adds an item to the scene.
         \li \c DeleteCommand deletes an item from the scene.
@@ -85,23 +85,23 @@
     \l{QUndoCommand}s and pushes and pops them from the stack when it
     receives the \c triggered() signal from \c undoAction and \c
     redoAction.
-    
+
     \section1 MainWindow Class Implementation
 
-    We will start with a look at the constructor:    
+    We will start with a look at the constructor:
 
     \snippet tools/undoframework/mainwindow.cpp 0
 
-    In the constructor, we set up the DiagramScene and QGraphicsView. 
+    In the constructor, we set up the DiagramScene and QGraphicsView.
 
-    Here is the \c createUndoView() function:    
+    Here is the \c createUndoView() function:
 
     \snippet tools/undoframework/mainwindow.cpp 1
 
     The QUndoView is a widget that display the text, which is set with
     the \l{QUndoCommand::}{setText()} function, for each QUndoCommand
     in the undo stack in a list.
-    
+
     Here is the \c createActions() function:
 
     \snippet tools/undoframework/mainwindow.cpp 2
@@ -130,7 +130,7 @@
 
     We have to use the QMenu \c aboutToShow() and \c aboutToHide()
     signals since we only want \c deleteAction to be enabled when we
-    have selected an item.     
+    have selected an item.
 
     Here is the \c itemMoved() slot:
 
@@ -155,9 +155,9 @@
     \snippet tools/undoframework/mainwindow.cpp 12
 
     We implement \c itemMenuAboutToShow() and \c itemMenuAboutToHide()
-    to get a dynamic item menu. These slots are connected to the 
+    to get a dynamic item menu. These slots are connected to the
     \l{QMenu::}{aboutToShow()} and \l{QMenu::}{aboutToHide()} signals.
-    We need this to disable or enable the \c deleteAction. 
+    We need this to disable or enable the \c deleteAction.
 
     Here is the \c addBox() slot:
 
@@ -171,21 +171,21 @@
     \snippet tools/undoframework/mainwindow.cpp 14
 
     The \c addTriangle() function creates an AddCommand and pushes it
-    on the undo stack.    
+    on the undo stack.
 
     Here is the implementation of \c about():
 
     \snippet tools/undoframework/mainwindow.cpp 15
-    
+
     The about slot is triggered by the \c aboutAction and displays an
     about box for the example.
 
     \section1 AddCommand Class Definition
-    
+
     \snippet tools/undoframework/commands.h 2
 
     The \c AddCommand class adds DiagramItem graphics items to the
-    DiagramScene.  
+    DiagramScene.
 
     \section1 AddCommand Class Implementation
 
@@ -208,20 +208,20 @@
     constructor.
 
     \section1 DeleteCommand Class Definition
-    
+
     \snippet tools/undoframework/commands.h 1
 
     The DeleteCommand class implements the functionality to remove an
     item from the scene.
-    
+
     \section1 DeleteCommand Class Implementation
 
     \snippet tools/undoframework/commands.cpp 4
 
     We know that there must be one selected item as it is not possible
     to create a DeleteCommand unless the item to be deleted is
-    selected and that only one item can be selected at any time. 
-    The item must be unselected if it is inserted back into the 
+    selected and that only one item can be selected at any time.
+    The item must be unselected if it is inserted back into the
     scene.
 
     \snippet tools/undoframework/commands.cpp 5
@@ -242,7 +242,7 @@
 
     \section1 MoveCommand Class Implementation
 
-    
+
     The constructor of MoveCommand looks like this:
 
     \snippet tools/undoframework/commands.cpp 0
@@ -252,12 +252,12 @@
 
     \snippet tools/undoframework/commands.cpp 2
 
-    We simply set the items old position and update the scene.    
+    We simply set the items old position and update the scene.
 
     \snippet tools/undoframework/commands.cpp 3
 
     We set the item to its new position.
-    
+
     \snippet tools/undoframework/commands.cpp 1
 
     Whenever a MoveCommand is created, this function is called to
@@ -268,7 +268,7 @@
     We first check whether it is the same item that has been moved
     twice, in which case we merge the commands. We update the position
     of the item so that it will take the last position in the move
-    sequence when undone. 
+    sequence when undone.
 
     \section1 DiagramScene Class Definition
 
@@ -281,7 +281,7 @@
     as it only deals with graphics framework issues.
 
     \section1 The \c main() Function
-    
+
     The \c main() function of the program looks like this:
 
     \snippet tools/undoframework/main.cpp 0
diff --git a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
index b13d571a26..5d01ee7619 100644
--- a/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
+++ b/examples/widgets/draganddrop/draggableicons/dragwidget.cpp
@@ -103,7 +103,7 @@ void DragWidget::dropEvent(QDropEvent *event)
     if (event->mimeData()->hasFormat("application/x-dnditemdata")) {
         QByteArray itemData = event->mimeData()->data("application/x-dnditemdata");
         QDataStream dataStream(&itemData, QIODevice::ReadOnly);
-        
+
         QPixmap pixmap;
         QPoint offset;
         dataStream >> pixmap >> offset;
@@ -143,7 +143,7 @@ void DragWidget::mousePressEvent(QMouseEvent *event)
     QMimeData *mimeData = new QMimeData;
     mimeData->setData("application/x-dnditemdata", itemData);
 //! [2]
-        
+
 //! [3]
     QDrag *drag = new QDrag(this);
     drag->setMimeData(mimeData);
diff --git a/examples/widgets/draganddrop/dropsite/droparea.cpp b/examples/widgets/draganddrop/dropsite/droparea.cpp
index 8662ec80b3..fcabeb3b62 100644
--- a/examples/widgets/draganddrop/dropsite/droparea.cpp
+++ b/examples/widgets/draganddrop/dropsite/droparea.cpp
@@ -87,7 +87,7 @@ void DropArea::dropEvent(QDropEvent *event)
         setText(mimeData->html());
         setTextFormat(Qt::RichText);
     } else if (mimeData->hasText()) {
-        setText(mimeData->text());    
+        setText(mimeData->text());
         setTextFormat(Qt::PlainText);
     } else if (mimeData->hasUrls()) {
         QList<QUrl> urlList = mimeData->urls();
@@ -102,7 +102,7 @@ void DropArea::dropEvent(QDropEvent *event)
     }
 //! [dropEvent() function part2]
 
-//! [dropEvent() function part3]    
+//! [dropEvent() function part3]
     setBackgroundRole(QPalette::Dark);
     event->acceptProposedAction();
 }
diff --git a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
index 9b7f0c3de9..d69f4ee2a8 100644
--- a/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
+++ b/examples/widgets/draganddrop/dropsite/dropsitewindow.cpp
@@ -103,7 +103,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData)
         return;
 //! [updateFormatsTable() part1]
 
-//! [updateFormatsTable() part2]        
+//! [updateFormatsTable() part2]
     foreach (QString format, mimeData->formats()) {
         QTableWidgetItem *formatItem = new QTableWidgetItem(format);
         formatItem->setFlags(Qt::ItemIsEnabled);
@@ -129,7 +129,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData)
                 text.append(hex + " ");
             }
         }
-//! [updateFormatsTable() part3]   
+//! [updateFormatsTable() part3]
 
 //! [updateFormatsTable() part4]
         int row = formatsTable->rowCount();
@@ -137,7 +137,7 @@ void DropSiteWindow::updateFormatsTable(const QMimeData *mimeData)
         formatsTable->setItem(row, 0, new QTableWidgetItem(format));
         formatsTable->setItem(row, 1, new QTableWidgetItem(text));
     }
-    
+
     formatsTable->resizeColumnToContents(0);
 }
-//! [updateFormatsTable() part4] 
+//! [updateFormatsTable() part4]
diff --git a/examples/widgets/graphicsview/boxes/scene.cpp b/examples/widgets/graphicsview/boxes/scene.cpp
index c907070db8..11e9f4ea5a 100644
--- a/examples/widgets/graphicsview/boxes/scene.cpp
+++ b/examples/widgets/graphicsview/boxes/scene.cpp
@@ -567,7 +567,7 @@ void Scene::initGL()
     m_environmentProgram->link();
 
     const int NOISE_SIZE = 128; // for a different size, B and BM in fbm.c must also be changed
-    m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE); 
+    m_noise = new GLTexture3D(NOISE_SIZE, NOISE_SIZE, NOISE_SIZE);
     QRgb *data = new QRgb[NOISE_SIZE * NOISE_SIZE * NOISE_SIZE];
     memset(data, 0, NOISE_SIZE * NOISE_SIZE * NOISE_SIZE * sizeof(QRgb));
     QRgb *p = data;
diff --git a/examples/widgets/graphicsview/chip/main.cpp b/examples/widgets/graphicsview/chip/main.cpp
index a0c1b919d1..c0f271a83c 100644
--- a/examples/widgets/graphicsview/chip/main.cpp
+++ b/examples/widgets/graphicsview/chip/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
     app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 
     MainWindow window;
-    window.show();   
+    window.show();
 
     return app.exec();
 }
diff --git a/examples/widgets/graphicsview/chip/mainwindow.cpp b/examples/widgets/graphicsview/chip/mainwindow.cpp
index 0925e9c9cb..510dd2e5c9 100644
--- a/examples/widgets/graphicsview/chip/mainwindow.cpp
+++ b/examples/widgets/graphicsview/chip/mainwindow.cpp
@@ -53,7 +53,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     h1Splitter = new QSplitter;
     h2Splitter = new QSplitter;
-    
+
     QSplitter *vSplitter = new QSplitter;
     vSplitter->setOrientation(Qt::Vertical);
     vSplitter->addWidget(h1Splitter);
diff --git a/examples/widgets/graphicsview/chip/mainwindow.h b/examples/widgets/graphicsview/chip/mainwindow.h
index 876a9f7d77..d4a9dfda85 100644
--- a/examples/widgets/graphicsview/chip/mainwindow.h
+++ b/examples/widgets/graphicsview/chip/mainwindow.h
@@ -54,11 +54,11 @@ class MainWindow : public QWidget
     Q_OBJECT
 public:
     MainWindow(QWidget *parent = 0);
-    
+
 private:
     void setupMatrix();
     void populateScene();
-    
+
     QGraphicsScene *scene;
     QSplitter *h1Splitter;
     QSplitter *h2Splitter;
diff --git a/examples/widgets/graphicsview/collidingmice/mouse.cpp b/examples/widgets/graphicsview/collidingmice/mouse.cpp
index e44d5549b3..d22e935828 100644
--- a/examples/widgets/graphicsview/collidingmice/mouse.cpp
+++ b/examples/widgets/graphicsview/collidingmice/mouse.cpp
@@ -159,7 +159,7 @@ void Mouse::advance(int step)
     foreach (QGraphicsItem *item, dangerMice) {
         if (item == this)
             continue;
-        
+
         QLineF lineToMouse(QPointF(0, 0), mapFromItem(item, 0, 0));
         qreal angleToMouse = ::acos(lineToMouse.dx() / lineToMouse.length());
         if (lineToMouse.dy() < 0)
diff --git a/examples/widgets/graphicsview/dragdroprobot/robot.cpp b/examples/widgets/graphicsview/dragdroprobot/robot.cpp
index 90ae4e9e22..4bfcac4800 100644
--- a/examples/widgets/graphicsview/dragdroprobot/robot.cpp
+++ b/examples/widgets/graphicsview/dragdroprobot/robot.cpp
@@ -162,7 +162,7 @@ void RobotTorso::paint(QPainter *painter,
 {
     Q_UNUSED(option);
     Q_UNUSED(widget);
-    
+
     painter->setBrush(dragOver ? color.light(130) : color);
     painter->drawRoundedRect(-20, -20, 40, 60, 25, 25, Qt::RelativeSize);
     painter->drawEllipse(-25, -20, 20, 20);
diff --git a/examples/widgets/graphicsview/dragdroprobot/robot.h b/examples/widgets/graphicsview/dragdroprobot/robot.h
index bb61bfe54b..a0c842e72c 100644
--- a/examples/widgets/graphicsview/dragdroprobot/robot.h
+++ b/examples/widgets/graphicsview/dragdroprobot/robot.h
@@ -109,7 +109,7 @@ class Robot : public RobotPart
 {
 public:
     Robot(QGraphicsItem *parent = 0);
-    
+
     QRectF boundingRect() const;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
 };
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.cpp b/examples/widgets/graphicsview/elasticnodes/edge.cpp
index 8561983db9..1923550fd3 100644
--- a/examples/widgets/graphicsview/elasticnodes/edge.cpp
+++ b/examples/widgets/graphicsview/elasticnodes/edge.cpp
@@ -136,7 +136,7 @@ void Edge::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
     QPointF sourceArrowP1 = sourcePoint + QPointF(sin(angle + Pi / 3) * arrowSize,
                                                   cos(angle + Pi / 3) * arrowSize);
     QPointF sourceArrowP2 = sourcePoint + QPointF(sin(angle + Pi - Pi / 3) * arrowSize,
-                                                  cos(angle + Pi - Pi / 3) * arrowSize);   
+                                                  cos(angle + Pi - Pi / 3) * arrowSize);
     QPointF destArrowP1 = destPoint + QPointF(sin(angle - Pi / 3) * arrowSize,
                                               cos(angle - Pi / 3) * arrowSize);
     QPointF destArrowP2 = destPoint + QPointF(sin(angle - Pi + Pi / 3) * arrowSize,
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.h b/examples/widgets/graphicsview/elasticnodes/edge.h
index 5800ca0d32..6ab71e3478 100644
--- a/examples/widgets/graphicsview/elasticnodes/edge.h
+++ b/examples/widgets/graphicsview/elasticnodes/edge.h
@@ -58,11 +58,11 @@ public:
 
     enum { Type = UserType + 2 };
     int type() const { return Type; }
-    
+
 protected:
     QRectF boundingRect() const;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    
+
 private:
     Node *source, *dest;
 
diff --git a/examples/widgets/graphicsview/elasticnodes/node.h b/examples/widgets/graphicsview/elasticnodes/node.h
index 703b99801a..813dbb1c54 100644
--- a/examples/widgets/graphicsview/elasticnodes/node.h
+++ b/examples/widgets/graphicsview/elasticnodes/node.h
@@ -74,7 +74,7 @@ protected:
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-    
+
 private:
     QList<Edge *> edgeList;
     QPointF newPos;
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
index 5e7577f28b..fa108a21b3 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
@@ -64,7 +64,7 @@ void CustomProxy::paintWindowFrame(QPainter *painter, const QStyleOptionGraphics
                                    QWidget *widget)
 {
     const QColor color(0, 0, 0, 64);
-   
+
     QRectF r = windowFrameRect();
     QRectF right(r.right(), r.top() + 10, 10, r.height() - 10);
     QRectF bottom(r.left() + 10, r.bottom(), r.width(), 10);
@@ -159,7 +159,7 @@ void CustomProxy::zoomIn()
 {
     if (timeLine->direction() != QTimeLine::Forward)
         timeLine->setDirection(QTimeLine::Forward);
-    if (timeLine->state() == QTimeLine::NotRunning) 
+    if (timeLine->state() == QTimeLine::NotRunning)
         timeLine->start();
 }
 
@@ -167,6 +167,6 @@ void CustomProxy::zoomOut()
 {
     if (timeLine->direction() != QTimeLine::Backward)
         timeLine->setDirection(QTimeLine::Backward);
-    if (timeLine->state() == QTimeLine::NotRunning) 
+    if (timeLine->state() == QTimeLine::NotRunning)
         timeLine->start();
 }
diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
index 3f7b540d2b..7257a90b12 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.h
@@ -54,7 +54,7 @@ public:
 
     QRectF boundingRect() const;
     void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option,
-                          QWidget *widget);                          
+                          QWidget *widget);
 
 protected:
     void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
diff --git a/examples/widgets/itemviews/addressbook/adddialog.cpp b/examples/widgets/itemviews/addressbook/adddialog.cpp
index f68cacc2e5..bb31fd60c4 100644
--- a/examples/widgets/itemviews/addressbook/adddialog.cpp
+++ b/examples/widgets/itemviews/addressbook/adddialog.cpp
@@ -50,31 +50,31 @@ AddDialog::AddDialog(QWidget *parent)
     addressLabel = new QLabel("Address");
     okButton = new QPushButton("OK");
     cancelButton = new QPushButton("Cancel");
-    
+
     nameText = new QLineEdit;
     addressText = new QTextEdit;
-    
+
     QGridLayout *gLayout = new QGridLayout;
     gLayout->setColumnStretch(1, 2);
     gLayout->addWidget(nameLabel, 0, 0);
     gLayout->addWidget(nameText, 0, 1);
-    
+
     gLayout->addWidget(addressLabel, 1, 0, Qt::AlignLeft|Qt::AlignTop);
     gLayout->addWidget(addressText, 1, 1, Qt::AlignLeft);
-    
+
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addWidget(okButton);
     buttonLayout->addWidget(cancelButton);
-    
+
     gLayout->addLayout(buttonLayout, 2, 1, Qt::AlignRight);
-    
+
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(gLayout);
     setLayout(mainLayout);
-    
+
     connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
-            
+
     setWindowTitle(tr("Add a Contact"));
 }
 //! [0]
diff --git a/examples/widgets/itemviews/addressbook/adddialog.h b/examples/widgets/itemviews/addressbook/adddialog.h
index 8412664287..78f56ef744 100644
--- a/examples/widgets/itemviews/addressbook/adddialog.h
+++ b/examples/widgets/itemviews/addressbook/adddialog.h
@@ -54,7 +54,7 @@ QT_END_NAMESPACE
 class AddDialog : public QDialog
 {
     Q_OBJECT
-    
+
 public:
     AddDialog(QWidget *parent = 0);
     QLineEdit *nameText;
diff --git a/examples/widgets/itemviews/addressbook/addresswidget.cpp b/examples/widgets/itemviews/addressbook/addresswidget.cpp
index 2c05e0e059..cd6f4a5534 100644
--- a/examples/widgets/itemviews/addressbook/addresswidget.cpp
+++ b/examples/widgets/itemviews/addressbook/addresswidget.cpp
@@ -52,7 +52,7 @@ AddressWidget::AddressWidget(QWidget *parent)
     connect(newAddressTab, SIGNAL(sendDetails(QString, QString)),
         this, SLOT(addEntry(QString, QString)));
 
-    addTab(newAddressTab, "Address Book");    
+    addTab(newAddressTab, "Address Book");
 
     setupTabs();
 }
@@ -60,13 +60,13 @@ AddressWidget::AddressWidget(QWidget *parent)
 
 //! [2]
 void AddressWidget::addEntry()
-{    
+{
     AddDialog aDialog;
 
     if (aDialog.exec()) {
         QString name = aDialog.nameText->text();
         QString address = aDialog.addressText->toPlainText();
-        
+
         addEntry(name, address);
     }
 }
@@ -74,7 +74,7 @@ void AddressWidget::addEntry()
 
 //! [3]
 void AddressWidget::addEntry(QString name, QString address)
-{    
+{
     QList<QPair<QString, QString> >list = table->getList();
     QPair<QString, QString> pair(name, address);
 
@@ -110,14 +110,14 @@ void AddressWidget::editEntry()
         QModelIndex nameIndex = table->index(row, 0, QModelIndex());
         QVariant varName = table->data(nameIndex, Qt::DisplayRole);
         name = varName.toString();
-    
+
         QModelIndex addressIndex = table->index(row, 1, QModelIndex());
         QVariant varAddr = table->data(addressIndex, Qt::DisplayRole);
         address = varAddr.toString();
     }
 //! [4a]
-    
-//! [4b]    
+
+//! [4b]
     AddDialog aDialog;
     aDialog.setWindowTitle(tr("Edit a Contact"));
 
@@ -141,7 +141,7 @@ void AddressWidget::removeEntry()
     QTableView *temp = static_cast<QTableView*>(currentWidget());
     QSortFilterProxyModel *proxy = static_cast<QSortFilterProxyModel*>(temp->model());
     QItemSelectionModel *selectionModel = temp->selectionModel();
-    
+
     QModelIndexList indexes = selectionModel->selectedRows();
 
     foreach (QModelIndex index, indexes) {
@@ -163,7 +163,7 @@ void AddressWidget::setupTabs()
 
     for (int i = 0; i < groups.size(); ++i) {
         QString str = groups.at(i);
-        
+
         proxyModel = new QSortFilterProxyModel(this);
         proxyModel->setSourceModel(table);
 
@@ -181,7 +181,7 @@ void AddressWidget::setupTabs()
         proxyModel->setFilterRegExp(QRegExp(newStr, Qt::CaseInsensitive));
         proxyModel->setFilterKeyColumn(0);
         proxyModel->sort(0, Qt::AscendingOrder);
-    
+
         connect(tableView->selectionModel(),
             SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SIGNAL(selectionChanged(QItemSelection)));
diff --git a/examples/widgets/itemviews/addressbook/mainwindow.cpp b/examples/widgets/itemviews/addressbook/mainwindow.cpp
index 8f1ea81763..8e66e9cb49 100644
--- a/examples/widgets/itemviews/addressbook/mainwindow.cpp
+++ b/examples/widgets/itemviews/addressbook/mainwindow.cpp
@@ -58,7 +58,7 @@ MainWindow::MainWindow()
 void MainWindow::createMenus()
 {
     fileMenu = menuBar()->addMenu(tr("&File"));
-    
+
     openAct = new QAction(tr("&Open..."), this);
     fileMenu->addAction(openAct);
     connect(openAct, SIGNAL(triggered()), this, SLOT(openFile()));
@@ -79,7 +79,7 @@ void MainWindow::createMenus()
     addAct = new QAction(tr("&Add Entry..."), this);
     toolMenu->addAction(addAct);
     connect(addAct, SIGNAL(triggered()), addressWidget, SLOT(addEntry()));
-    
+
 //! [1b]
     editAct = new QAction(tr("&Edit Entry..."), this);
     editAct->setEnabled(false);
@@ -120,7 +120,7 @@ void MainWindow::saveFile()
 void MainWindow::updateActions(const QItemSelection &selection)
 {
     QModelIndexList indexes = selection.indexes();
-    
+
     if (!indexes.isEmpty()) {
         removeAct->setEnabled(true);
         editAct->setEnabled(true);
diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.cpp b/examples/widgets/itemviews/addressbook/newaddresstab.cpp
index b443d9cf96..a8e770cab8 100644
--- a/examples/widgets/itemviews/addressbook/newaddresstab.cpp
+++ b/examples/widgets/itemviews/addressbook/newaddresstab.cpp
@@ -50,15 +50,15 @@ NewAddressTab::NewAddressTab(QWidget *parent)
 
     descriptionLabel = new QLabel(tr("There are currently no contacts in your address book. "
                                       "\nClick Add to add new contacts."));
-    
+
     addButton = new QPushButton(tr("Add"));
-    
+
     connect(addButton, SIGNAL(clicked()), this, SLOT(addEntry()));
-    
+
     mainLayout = new QVBoxLayout;
     mainLayout->addWidget(descriptionLabel);
     mainLayout->addWidget(addButton, 0, Qt::AlignCenter);
-    
+
     setLayout(mainLayout);
 }
 //! [0]
@@ -67,11 +67,11 @@ NewAddressTab::NewAddressTab(QWidget *parent)
 void NewAddressTab::addEntry()
 {
     AddDialog aDialog;
-    
+
     if (aDialog.exec()) {
         QString name = aDialog.nameText->text();
         QString address = aDialog.addressText->toPlainText();
-        
+
         emit sendDetails(name, address);
     }
 }
diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.h b/examples/widgets/itemviews/addressbook/newaddresstab.h
index 51e75aa366..2db7302e75 100644
--- a/examples/widgets/itemviews/addressbook/newaddresstab.h
+++ b/examples/widgets/itemviews/addressbook/newaddresstab.h
@@ -53,7 +53,7 @@ QT_END_NAMESPACE
 class NewAddressTab : public QWidget
 {
     Q_OBJECT
-    
+
 public:
     NewAddressTab(QWidget *parent = 0);
 
@@ -67,7 +67,7 @@ private:
     QLabel *descriptionLabel;
     QPushButton *addButton;
     QVBoxLayout *mainLayout;
-    
+
 };
 //! [0]
 
diff --git a/examples/widgets/itemviews/addressbook/tablemodel.h b/examples/widgets/itemviews/addressbook/tablemodel.h
index 0ef54fae6a..e282defa1b 100644
--- a/examples/widgets/itemviews/addressbook/tablemodel.h
+++ b/examples/widgets/itemviews/addressbook/tablemodel.h
@@ -49,7 +49,7 @@
 class TableModel : public QAbstractTableModel
 {
     Q_OBJECT
-    
+
 public:
     TableModel(QObject *parent = 0);
     TableModel(QList<QPair<QString, QString> > listofPairs, QObject *parent = 0);
diff --git a/examples/widgets/itemviews/combowidgetmapper/window.cpp b/examples/widgets/itemviews/combowidgetmapper/window.cpp
index 39ba428ced..3dfb2834a8 100644
--- a/examples/widgets/itemviews/combowidgetmapper/window.cpp
+++ b/examples/widgets/itemviews/combowidgetmapper/window.cpp
@@ -101,7 +101,7 @@ void Window::setupModel()
     QStringList items;
     items << tr("Home") << tr("Work") << tr("Other");
     typeModel = new QStringListModel(items, this);
-    
+
     model = new QStandardItemModel(5, 3, this);
     QStringList names;
     names << "Alice" << "Bob" << "Carol" << "Donald" << "Emma";
@@ -115,7 +115,7 @@ void Window::setupModel()
 
     QStringList types;
     types << "0" << "1" << "2" << "0" << "2";
-    
+
     for (int row = 0; row < 5; ++row) {
       QStandardItem *item = new QStandardItem(names[row]);
       model->setItem(row, 0, item);
diff --git a/examples/widgets/itemviews/fetchmore/filelistmodel.cpp b/examples/widgets/itemviews/fetchmore/filelistmodel.cpp
index 5e7ba2c754..6532189b06 100644
--- a/examples/widgets/itemviews/fetchmore/filelistmodel.cpp
+++ b/examples/widgets/itemviews/fetchmore/filelistmodel.cpp
@@ -60,10 +60,10 @@ QVariant FileListModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid())
         return QVariant();
-    
+
     if (index.row() >= fileList.size() || index.row() < 0)
         return QVariant();
-    
+
     if (role == Qt::DisplayRole) {
         return fileList.at(index.row());
     } else if (role == Qt::BackgroundRole) {
@@ -94,7 +94,7 @@ void FileListModel::fetchMore(const QModelIndex & /* index */)
     int itemsToFetch = qMin(100, remainder);
 
     beginInsertRows(QModelIndex(), fileCount, fileCount+itemsToFetch-1);
-    
+
     fileCount += itemsToFetch;
 
     endInsertRows();
diff --git a/examples/widgets/itemviews/fetchmore/window.cpp b/examples/widgets/itemviews/fetchmore/window.cpp
index ed2d2a2260..f35593923d 100644
--- a/examples/widgets/itemviews/fetchmore/window.cpp
+++ b/examples/widgets/itemviews/fetchmore/window.cpp
@@ -65,7 +65,7 @@ Window::Window(QWidget *parent)
             logViewer, SLOT(clear()));
     connect(model, SIGNAL(numberPopulated(int)),
             this, SLOT(updateLog(int)));
-    
+
     QGridLayout *layout = new QGridLayout;
     layout->addWidget(label, 0, 0);
     layout->addWidget(lineEdit, 0, 1);
diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp
index 0d34dbf190..1f6a403efc 100644
--- a/examples/widgets/itemviews/pixelator/mainwindow.cpp
+++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp
@@ -226,7 +226,7 @@ void MainWindow::printImage()
             tr("The printing process was canceled."), QMessageBox::Cancel);
     }
 #else
-    QMessageBox::information(this, tr("Printing canceled"), 
+    QMessageBox::information(this, tr("Printing canceled"),
         tr("Printing is not supported on this Qt build"), QMessageBox::Cancel);
 #endif
 }
diff --git a/examples/widgets/itemviews/simplewidgetmapper/window.cpp b/examples/widgets/itemviews/simplewidgetmapper/window.cpp
index 7699bcc929..0e3314601a 100644
--- a/examples/widgets/itemviews/simplewidgetmapper/window.cpp
+++ b/examples/widgets/itemviews/simplewidgetmapper/window.cpp
@@ -109,7 +109,7 @@ void Window::setupModel()
 
     QStringList ages;
     ages << "20" << "31" << "32" << "19" << "26";
-    
+
     for (int row = 0; row < 5; ++row) {
       QStandardItem *item = new QStandardItem(names[row]);
       model->setItem(row, 0, item);
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.h b/examples/widgets/itemviews/spreadsheet/spreadsheet.h
index c81af6666a..279146552a 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.h
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.h
@@ -77,7 +77,7 @@ public slots:
     void actionSubtract();
     void actionAdd();
     void actionMultiply();
-    void actionDivide();  
+    void actionDivide();
 
 protected:
     void setupContextMenu();
diff --git a/examples/widgets/painting/deform/pathdeform.cpp b/examples/widgets/painting/deform/pathdeform.cpp
index 3c0624ac76..9f9a88700c 100644
--- a/examples/widgets/painting/deform/pathdeform.cpp
+++ b/examples/widgets/painting/deform/pathdeform.cpp
@@ -289,7 +289,7 @@ void PathDeformWidget::setStyle( QStyle * style )
         return;
 
     m_controls->setStyle(style);
-        
+
     QList<QWidget *> widgets = m_controls->findChildren<QWidget *>();
     foreach (QWidget *w, widgets)
         w->setStyle(style);
@@ -481,7 +481,7 @@ void PathDeformRenderer::mousePressEvent(QMouseEvent *e)
         m_offset = m_pos - e->pos();
 
     m_mousePress = e->pos();
-    
+
     // If we're not running in small screen mode, always assume we're dragging
     m_mouseDrag = !m_smallScreen;
 
diff --git a/examples/widgets/painting/gradients/gradients.cpp b/examples/widgets/painting/gradients/gradients.cpp
index f3da5f3de5..ffca9f5560 100644
--- a/examples/widgets/painting/gradients/gradients.cpp
+++ b/examples/widgets/painting/gradients/gradients.cpp
@@ -362,7 +362,7 @@ GradientWidget::GradientWidget(QWidget *parent)
     connect(showSourceButton, SIGNAL(clicked()), m_renderer, SLOT(showSource()));
 #ifdef QT_OPENGL_SUPPORT
     connect(enableOpenGLButton, SIGNAL(clicked(bool)), m_renderer, SLOT(enableOpenGL(bool)));
-#endif    
+#endif
     connect(whatsThisButton, SIGNAL(clicked(bool)), m_renderer, SLOT(setDescriptionEnabled(bool)));
     connect(whatsThisButton, SIGNAL(clicked(bool)),
             m_renderer->hoverPoints(), SLOT(setDisabled(bool)));
diff --git a/examples/widgets/painting/pathstroke/pathstroke.cpp b/examples/widgets/painting/pathstroke/pathstroke.cpp
index a8b87f51f4..6807585f57 100644
--- a/examples/widgets/painting/pathstroke/pathstroke.cpp
+++ b/examples/widgets/painting/pathstroke/pathstroke.cpp
@@ -380,7 +380,7 @@ void PathStrokeWidget::setStyle( QStyle * style )
     if (m_controls != 0)
     {
         m_controls->setStyle(style);
-        
+
         QList<QWidget *> widgets = m_controls->findChildren<QWidget *>();
         foreach (QWidget *w, widgets)
             w->setStyle(style);
@@ -544,7 +544,7 @@ void PathStrokeRenderer::mousePressEvent(QMouseEvent *e)
         setAnimation(false);
         mouseMoveEvent(e);
     }
-    
+
     // If we're not running in small screen mode, always assume we're dragging
     m_mouseDrag = !m_smallScreen;
     m_mousePress = e->pos();
diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp
index c7edd1b550..ae2bdedf13 100644
--- a/examples/widgets/richtext/textedit/textedit.cpp
+++ b/examples/widgets/richtext/textedit/textedit.cpp
@@ -197,7 +197,7 @@ void TextEdit::setupFileActions()
 #ifndef QT_NO_PRINTER
     a = new QAction(QIcon::fromTheme("document-print", QIcon(rsrcPath + "/fileprint.png")),
                     tr("&Print..."), this);
-    a->setPriority(QAction::LowPriority);    
+    a->setPriority(QAction::LowPriority);
     a->setShortcut(QKeySequence::Print);
     connect(a, SIGNAL(triggered()), this, SLOT(filePrint()));
     tb->addAction(a);
diff --git a/examples/widgets/richtext/textedit/textedit.qdoc b/examples/widgets/richtext/textedit/textedit.qdoc
index 1695adfb2e..8e7a0bef24 100644
--- a/examples/widgets/richtext/textedit/textedit.qdoc
+++ b/examples/widgets/richtext/textedit/textedit.qdoc
@@ -31,8 +31,8 @@
   \title Text Edit Example
 
   \brief This example displays a text editor with the user interface written
-  in pure C++. 
-  
+  in pure C++.
+
   A similar example which uses Qt Designer to produce the user
   interface is in the \l {Qt Designer Manual}.
 
diff --git a/examples/widgets/statemachine/factorial/main.cpp b/examples/widgets/statemachine/factorial/main.cpp
index 9107fea013..1ad2740563 100644
--- a/examples/widgets/statemachine/factorial/main.cpp
+++ b/examples/widgets/statemachine/factorial/main.cpp
@@ -78,7 +78,7 @@ public:
 
 Q_SIGNALS:
     void xChanged(int value);
-    
+
 private:
     int m_x;
     int m_fac;
diff --git a/examples/widgets/statemachine/rogue/window.cpp b/examples/widgets/statemachine/rogue/window.cpp
index 1e26278051..af8390f928 100644
--- a/examples/widgets/statemachine/rogue/window.cpp
+++ b/examples/widgets/statemachine/rogue/window.cpp
@@ -96,7 +96,7 @@ void Window::paintEvent(QPaintEvent * /* event */)
     painter.setPen(Qt::white);
 
     painter.drawText(QPoint(0, yPos), status());
-    
+
     for (int y = 0; y < HEIGHT; ++y) {
         yPos += fontHeight;
         xPos = 0;
@@ -184,7 +184,7 @@ void Window::buildMachine()
 
 //![3]
     QState *quitState = new QState(machine);
-    quitState->assignProperty(this, "status", "Really quit(y/n)?"); 
+    quitState->assignProperty(this, "status", "Really quit(y/n)?");
 
     QKeyEventTransition *yesTransition = new
         QKeyEventTransition(this, QEvent::KeyPress, Qt::Key_Y);
@@ -218,7 +218,7 @@ void Window::movePlayer(Direction direction)
     switch (direction) {
         case Left:
             if (map[pX - 1][pY] != '#')
-                --pX;            
+                --pX;
             break;
         case Right:
             if (map[pX + 1][pY] != '#')
@@ -231,7 +231,7 @@ void Window::movePlayer(Direction direction)
         case Down:
             if (map[pX][pY + 1] != '#')
                 ++pY;
-            break;        
+            break;
     }
     repaint();
 }
diff --git a/examples/widgets/tools/completer/mainwindow.cpp b/examples/widgets/tools/completer/mainwindow.cpp
index 6730193928..c299d08c17 100644
--- a/examples/widgets/tools/completer/mainwindow.cpp
+++ b/examples/widgets/tools/completer/mainwindow.cpp
@@ -100,7 +100,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 //! [3]
     lineEdit = new QLineEdit;
-    
+
     QGridLayout *layout = new QGridLayout;
     layout->addWidget(modelLabel, 0, 0); layout->addWidget(modelCombo, 0, 1);
     layout->addWidget(modeLabel, 1, 0);  layout->addWidget(modeCombo, 1, 1);
diff --git a/examples/widgets/tools/customcompleter/mainwindow.cpp b/examples/widgets/tools/customcompleter/mainwindow.cpp
index 54033b5dd3..20b5d509ff 100644
--- a/examples/widgets/tools/customcompleter/mainwindow.cpp
+++ b/examples/widgets/tools/customcompleter/mainwindow.cpp
@@ -93,7 +93,7 @@ QAbstractItemModel *MainWindow::modelFromFile(const QString& fileName)
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 #endif
     QStringList words;
-    
+
     while (!file.atEnd()) {
         QByteArray line = file.readLine();
         if (!line.isEmpty())
diff --git a/examples/widgets/tools/customcompleter/textedit.cpp b/examples/widgets/tools/customcompleter/textedit.cpp
index 1fafdcd04d..9b0c1b9c97 100644
--- a/examples/widgets/tools/customcompleter/textedit.cpp
+++ b/examples/widgets/tools/customcompleter/textedit.cpp
@@ -53,7 +53,7 @@ TextEdit::TextEdit(QWidget *parent)
 : QTextEdit(parent), c(0)
 {
     setPlainText(tr("This TextEdit provides autocompletions for words that have more than"
-                    " 3 characters. You can trigger autocompletion using ") + 
+                    " 3 characters. You can trigger autocompletion using ") +
                     QKeySequence("Ctrl+E").toString(QKeySequence::NativeText));
 }
 //! [0]
@@ -133,7 +133,7 @@ void TextEdit::keyPressEvent(QKeyEvent *e)
        case Qt::Key_Escape:
        case Qt::Key_Tab:
        case Qt::Key_Backtab:
-            e->ignore(); 
+            e->ignore();
             return; // let the completer do default behavior
        default:
            break;
@@ -154,7 +154,7 @@ void TextEdit::keyPressEvent(QKeyEvent *e)
     bool hasModifier = (e->modifiers() != Qt::NoModifier) && !ctrlOrShift;
     QString completionPrefix = textUnderCursor();
 
-    if (!isShortcut && (hasModifier || e->text().isEmpty()|| completionPrefix.length() < 3 
+    if (!isShortcut && (hasModifier || e->text().isEmpty()|| completionPrefix.length() < 3
                       || eow.contains(e->text().right(1)))) {
         c->popup()->hide();
         return;
diff --git a/examples/widgets/tools/plugandpaint/mainwindow.cpp b/examples/widgets/tools/plugandpaint/mainwindow.cpp
index cc0ce48be8..fdd3689a1a 100644
--- a/examples/widgets/tools/plugandpaint/mainwindow.cpp
+++ b/examples/widgets/tools/plugandpaint/mainwindow.cpp
@@ -81,7 +81,7 @@ MainWindow::MainWindow() :
 void MainWindow::open()
 {
     const QString fileName = QFileDialog::getOpenFileName(this,
-                                                          tr("Open File"), 
+                                                          tr("Open File"),
                                                           QDir::currentPath());
     if (!fileName.isEmpty()) {
         if (!paintArea->openImage(fileName)) {
diff --git a/examples/widgets/tools/plugandpaint/plugindialog.cpp b/examples/widgets/tools/plugandpaint/plugindialog.cpp
index 2c19d32584..19d2a103fa 100644
--- a/examples/widgets/tools/plugandpaint/plugindialog.cpp
+++ b/examples/widgets/tools/plugandpaint/plugindialog.cpp
@@ -58,7 +58,7 @@ PluginDialog::PluginDialog(const QString &path, const QStringList &fileNames,
     QDialog(parent),
     label(new QLabel),
     treeWidget(new QTreeWidget),
-    okButton(new QPushButton(tr("OK")))    
+    okButton(new QPushButton(tr("OK")))
 {
     treeWidget->setAlternatingRowColors(false);
     treeWidget->setSelectionMode(QAbstractItemView::NoSelection);
diff --git a/examples/widgets/tools/undoframework/diagramscene.cpp b/examples/widgets/tools/undoframework/diagramscene.cpp
index bef3b89df0..1083cba5db 100644
--- a/examples/widgets/tools/undoframework/diagramscene.cpp
+++ b/examples/widgets/tools/undoframework/diagramscene.cpp
@@ -59,8 +59,8 @@ void DiagramScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
     if (movingItem != 0 && event->button() == Qt::LeftButton) {
         oldPos = movingItem->pos();
     }
-    
-    clearSelection();    
+
+    clearSelection();
     QGraphicsScene::mousePressEvent(event);
 }
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part1/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part1/addressbook.cpp
index 4e8c95635b..60acd6bb27 100644
--- a/examples/widgets/tutorials/addressbook-fr/part1/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part1/addressbook.cpp
@@ -60,7 +60,7 @@ AddressBook::AddressBook(QWidget *parent)
     mainLayout->addWidget(addressText, 1, 1);
 //! [layout]
 
-//![setting the layout]    
+//![setting the layout]
     setLayout(mainLayout);
     setWindowTitle(tr("Simple Address Book"));
 }
diff --git a/examples/widgets/tutorials/addressbook-fr/part2/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part2/addressbook.cpp
index bb221d2222..d88716a8c8 100644
--- a/examples/widgets/tutorials/addressbook-fr/part2/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part2/addressbook.cpp
@@ -51,10 +51,10 @@ AddressBook::AddressBook(QWidget *parent)
 //! [setting readonly 1]
     QLabel *addressLabel = new QLabel(tr("Address:"));
     addressText = new QTextEdit;
-//! [setting readonly 2]    
+//! [setting readonly 2]
     addressText->setReadOnly(true);
 //! [setting readonly 2]
-   
+
 //! [pushbutton declaration]
     addButton = new QPushButton(tr("&Add"));
     addButton->show();
@@ -94,7 +94,7 @@ void AddressBook::addContact()
 
     nameLine->clear();
     addressText->clear();
-    
+
     nameLine->setReadOnly(false);
     nameLine->setFocus(Qt::OtherFocusReason);
     addressText->setReadOnly(false);
@@ -110,7 +110,7 @@ void AddressBook::submitContact()
 {
     QString name = nameLine->text();
     QString address = addressText->toPlainText();
-    
+
     if ( name.isEmpty()|| address.isEmpty()) {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
@@ -152,6 +152,6 @@ void AddressBook::cancel()
 
     addButton->setEnabled(true);
     submitButton->hide();
-    cancelButton->hide();    
+    cancelButton->hide();
 }
 //! [cancel]
diff --git a/examples/widgets/tutorials/addressbook-fr/part3/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part3/addressbook.cpp
index 09b1e06bfe..86ff58d015 100644
--- a/examples/widgets/tutorials/addressbook-fr/part3/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part3/addressbook.cpp
@@ -51,7 +51,7 @@ AddressBook::AddressBook(QWidget *parent)
     QLabel *addressLabel = new QLabel(tr("Address:"));
     addressText = new QTextEdit;
     addressText->setReadOnly(true);
-    
+
     addButton = new QPushButton(tr("&Add"));
     addButton->show();
     submitButton = new QPushButton(tr("&Submit"));
@@ -68,7 +68,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
     connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-//! [connecting navigation signals]    
+//! [connecting navigation signals]
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
 //! [connecting navigation signals]
@@ -107,7 +107,7 @@ void AddressBook::addContact()
     nameLine->setReadOnly(false);
     nameLine->setFocus(Qt::OtherFocusReason);
     addressText->setReadOnly(false);
-    
+
     addButton->setEnabled(false);
 //! [disabling navigation]
     nextButton->setEnabled(false);
@@ -121,7 +121,7 @@ void AddressBook::submitContact()
 {
     QString name = nameLine->text();
     QString address = addressText->toPlainText();
-    
+
     if (name.isEmpty() || address.isEmpty()) {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
@@ -159,20 +159,20 @@ void AddressBook::cancel()
 {
     nameLine->setText(oldName);
     addressText->setText(oldAddress);
-   
+
     if (contacts.isEmpty()) {
         nameLine->clear();
         addressText->clear();
     }
-    
+
     nameLine->setReadOnly(true);
     addressText->setReadOnly(true);
     addButton->setEnabled(true);
-    
+
     int number = contacts.size();
     nextButton->setEnabled(number > 1);
     previousButton->setEnabled(number > 1);
-    
+
     submitButton->hide();
     cancelButton->hide();
 }
diff --git a/examples/widgets/tutorials/addressbook-fr/part3/addressbook.h b/examples/widgets/tutorials/addressbook-fr/part3/addressbook.h
index 2458645ab5..3613fedb34 100644
--- a/examples/widgets/tutorials/addressbook-fr/part3/addressbook.h
+++ b/examples/widgets/tutorials/addressbook-fr/part3/addressbook.h
@@ -65,16 +65,16 @@ public slots:
 //! [navigation functions]
     void next();
     void previous();
-//! [navigation functions]    
+//! [navigation functions]
 
 private:
     QPushButton *addButton;
     QPushButton *submitButton;
     QPushButton *cancelButton;
-//! [navigation pushbuttons]    
+//! [navigation pushbuttons]
     QPushButton *nextButton;
     QPushButton *previousButton;
-//! [navigation pushbuttons]    
+//! [navigation pushbuttons]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part4/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part4/addressbook.cpp
index 2d158f3f17..70f5d110db 100644
--- a/examples/widgets/tutorials/addressbook-fr/part4/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part4/addressbook.cpp
@@ -53,17 +53,17 @@ AddressBook::AddressBook(QWidget *parent)
     addressText->setReadOnly(true);
 
     addButton = new QPushButton(tr("&Add"));
-//! [edit and remove buttons] 
+//! [edit and remove buttons]
     editButton = new QPushButton(tr("&Edit"));
     editButton->setEnabled(false);
     removeButton = new QPushButton(tr("&Remove"));
     removeButton->setEnabled(false);
-//! [edit and remove buttons] 
+//! [edit and remove buttons]
     submitButton = new QPushButton(tr("&Submit"));
     submitButton->hide();
     cancelButton = new QPushButton(tr("&Cancel"));
     cancelButton->hide();
-    
+
     nextButton = new QPushButton(tr("&Next"));
     nextButton->setEnabled(false);
     previousButton = new QPushButton(tr("&Previous"));
@@ -71,20 +71,20 @@ AddressBook::AddressBook(QWidget *parent)
 
     connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
     connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-//! [connecting edit and remove] 
+//! [connecting edit and remove]
     connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [connecting edit and remove] 
+//! [connecting edit and remove]
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
 
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
-//! [adding edit and remove to the layout]     
+//! [adding edit and remove to the layout]
     buttonLayout1->addWidget(editButton);
     buttonLayout1->addWidget(removeButton);
-//! [adding edit and remove to the layout]         
+//! [adding edit and remove to the layout]
     buttonLayout1->addWidget(submitButton);
     buttonLayout1->addWidget(cancelButton);
     buttonLayout1->addStretch();
@@ -138,7 +138,7 @@ void AddressBook::submitContact()
     }
 //! [submitContact() function part1]
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -150,7 +150,7 @@ void AddressBook::submitContact()
 //! [submitContact() function part1]
 //! [submitContact() function part2]
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -164,7 +164,7 @@ void AddressBook::submitContact()
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),
                 tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;        
+            contacts[name] = address;
         }
     }
 
@@ -192,7 +192,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -243,7 +243,7 @@ void AddressBook::updateInterface(Mode mode)
     currentMode = mode;
 
     switch (currentMode) {
-        
+
     case AddingMode:
     case EditingMode:
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part4/addressbook.h b/examples/widgets/tutorials/addressbook-fr/part4/addressbook.h
index ff8c4f0318..6430ac3413 100644
--- a/examples/widgets/tutorials/addressbook-fr/part4/addressbook.h
+++ b/examples/widgets/tutorials/addressbook-fr/part4/addressbook.h
@@ -77,10 +77,10 @@ private:
     void updateInterface(Mode mode);
 //! [updateInterface() declaration]
     QPushButton *addButton;
-//! [buttons declaration]    
+//! [buttons declaration]
     QPushButton *editButton;
     QPushButton *removeButton;
-//! [buttons declaration]        
+//! [buttons declaration]
     QPushButton *submitButton;
     QPushButton *cancelButton;
     QPushButton *nextButton;
@@ -91,9 +91,9 @@ private:
     QMap<QString, QString> contacts;
     QString oldName;
     QString oldAddress;
-//! [mode declaration]    
+//! [mode declaration]
     Mode currentMode;
-//! [mode declaration]    
+//! [mode declaration]
 };
 
 #endif
diff --git a/examples/widgets/tutorials/addressbook-fr/part5/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part5/addressbook.cpp
index 02f4788537..33af5f1e4e 100644
--- a/examples/widgets/tutorials/addressbook-fr/part5/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part5/addressbook.cpp
@@ -81,19 +81,19 @@ AddressBook::AddressBook(QWidget *parent)
     connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [signals and slots for find]    
+//! [signals and slots for find]
     connect(findButton, SIGNAL(clicked()), this, SLOT(findContact()));
-//! [signals and slots for find]        
+//! [signals and slots for find]
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
     buttonLayout1->addWidget(removeButton);
-//! [adding findButton to layout]        
+//! [adding findButton to layout]
     buttonLayout1->addWidget(findButton);
-//! [adding findButton to layout]            
+//! [adding findButton to layout]
     buttonLayout1->addWidget(submitButton);
     buttonLayout1->addWidget(cancelButton);
     buttonLayout1->addStretch();
@@ -145,7 +145,7 @@ void AddressBook::submitContact()
    }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -155,7 +155,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -196,7 +196,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -241,7 +241,7 @@ void AddressBook::previous()
     nameLine->setText(i.key());
     addressText->setText(i.value());
 }
-//! [findContact() function] 
+//! [findContact() function]
 void AddressBook::findContact()
 {
     dialog->show();
@@ -261,7 +261,7 @@ void AddressBook::findContact()
 
     updateInterface(NavigationMode);
 }
-//! [findContact() function] 
+//! [findContact() function]
 
 void AddressBook::updateInterface(Mode mode)
 {
@@ -288,7 +288,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
diff --git a/examples/widgets/tutorials/addressbook-fr/part5/addressbook.h b/examples/widgets/tutorials/addressbook-fr/part5/addressbook.h
index 5e2c18e91a..f8a53304ee 100644
--- a/examples/widgets/tutorials/addressbook-fr/part5/addressbook.h
+++ b/examples/widgets/tutorials/addressbook-fr/part5/addressbook.h
@@ -68,9 +68,9 @@ public slots:
     void submitContact();
     void cancel();
     void removeContact();
-//! [findContact() declaration]    
+//! [findContact() declaration]
     void findContact();
-//! [findContact() declaration]    
+//! [findContact() declaration]
     void next();
     void previous();
 
@@ -80,9 +80,9 @@ private:
     QPushButton *addButton;
     QPushButton *editButton;
     QPushButton *removeButton;
-//! [findButton declaration]        
+//! [findButton declaration]
     QPushButton *findButton;
-//! [findButton declaration] 
+//! [findButton declaration]
     QPushButton *submitButton;
     QPushButton *cancelButton;
     QPushButton *nextButton;
@@ -91,9 +91,9 @@ private:
     QTextEdit *addressText;
 
     QMap<QString, QString> contacts;
-//! [FindDialog declaration]     
+//! [FindDialog declaration]
     FindDialog *dialog;
-//! [FindDialog declaration]     
+//! [FindDialog declaration]
     QString oldName;
     QString oldAddress;
     Mode currentMode;
diff --git a/examples/widgets/tutorials/addressbook-fr/part6/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part6/addressbook.cpp
index e8caa628a5..e81c959c2c 100644
--- a/examples/widgets/tutorials/addressbook-fr/part6/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part6/addressbook.cpp
@@ -71,9 +71,9 @@ AddressBook::AddressBook(QWidget *parent)
     previousButton->setEnabled(false);
 
     loadButton = new QPushButton(tr("&Load..."));
-//! [tooltip 1]    
+//! [tooltip 1]
     loadButton->setToolTip(tr("Load contacts from a file"));
-//! [tooltip 1]        
+//! [tooltip 1]
     saveButton = new QPushButton(tr("Sa&ve..."));
 //! [tooltip 2]
     saveButton->setToolTip(tr("Save contacts to a file"));
@@ -92,7 +92,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
     connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
@@ -151,7 +151,7 @@ void AddressBook::submitContact()
     }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -161,7 +161,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -202,7 +202,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -296,7 +296,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
@@ -341,12 +341,12 @@ void AddressBook::saveToFile()
             return;
         }
 
-//! [saveToFile() function part2]        
+//! [saveToFile() function part2]
 //! [saveToFile() function part3]
         QDataStream out(&file);
         out.setVersion(QDataStream::Qt_4_5);
         out << contacts;
-    }       
+    }
 }
 //! [saveToFile() function part3]
 
@@ -362,15 +362,15 @@ void AddressBook::loadFromFile()
     if (fileName.isEmpty())
         return;
     else {
-        
+
         QFile file(fileName);
-        
+
         if (!file.open(QIODevice::ReadOnly)) {
             QMessageBox::information(this, tr("Unable to open file"),
                 file.errorString());
             return;
         }
-        
+
         QDataStream in(&file);
         in.setVersion(QDataStream::Qt_4_5);
         contacts.empty();   // empty existing contacts
diff --git a/examples/widgets/tutorials/addressbook-fr/part6/addressbook.h b/examples/widgets/tutorials/addressbook-fr/part6/addressbook.h
index 99dfd1e404..ce2691ccad 100644
--- a/examples/widgets/tutorials/addressbook-fr/part6/addressbook.h
+++ b/examples/widgets/tutorials/addressbook-fr/part6/addressbook.h
@@ -70,10 +70,10 @@ public slots:
     void findContact();
     void next();
     void previous();
-//! [save and load functions declaration]    
+//! [save and load functions declaration]
     void saveToFile();
     void loadFromFile();
-//! [save and load functions declaration]    
+//! [save and load functions declaration]
 
 private:
     void updateInterface(Mode mode);
@@ -86,10 +86,10 @@ private:
     QPushButton *cancelButton;
     QPushButton *nextButton;
     QPushButton *previousButton;
-//! [save and load buttons declaration]        
+//! [save and load buttons declaration]
     QPushButton *loadButton;
     QPushButton *saveButton;
-//! [save and load buttons declaration]            
+//! [save and load buttons declaration]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
index a91a3bbc12..a0780ae78a 100644
--- a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.cpp
@@ -93,7 +93,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
     connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
@@ -153,7 +153,7 @@ void AddressBook::submitContact()
     }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -163,7 +163,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -204,7 +204,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -298,7 +298,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
@@ -331,7 +331,7 @@ void AddressBook::saveToFile()
     QString fileName = QFileDialog::getSaveFileName(this,
         tr("Save Address Book"), "",
         tr("Address Book (*.abk);;All Files (*)"));
-        
+
     if (fileName.isEmpty())
         return;
     else {
@@ -404,14 +404,14 @@ void AddressBook::exportAsVCard()
     QString fileName = QFileDialog::getSaveFileName(this,
         tr("Export Contact"), "",
         tr("vCard Files (*.vcf);;All Files (*)"));
-        
+
     if (fileName.isEmpty())
         return;
 
     QFile file(fileName);
 //! [export function part1]
-    
-//! [export function part2]    
+
+//! [export function part2]
     if (!file.open(QIODevice::WriteOnly)) {
         QMessageBox::information(this, tr("Unable to open file"),
             file.errorString());
@@ -425,12 +425,12 @@ void AddressBook::exportAsVCard()
     out << "BEGIN:VCARD" << "\n";
     out << "VERSION:2.1" << "\n";
     out << "N:" << lastName << ";" << firstName << "\n";
-        
-    if (!nameList.isEmpty())            
+
+    if (!nameList.isEmpty())
        out << "FN:" << nameList.join(' ') << "\n";
     else
        out << "FN:" << firstName << "\n";
-//! [export function part3] 
+//! [export function part3]
 
 //! [export function part4]
     address.replace(";", "\\;", Qt::CaseInsensitive);
diff --git a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.h b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.h
index a34cf24a23..d672c7a85b 100644
--- a/examples/widgets/tutorials/addressbook-fr/part7/addressbook.h
+++ b/examples/widgets/tutorials/addressbook-fr/part7/addressbook.h
@@ -74,7 +74,7 @@ public slots:
     void loadFromFile();
 //! [exportAsVCard() declaration]
     void exportAsVCard();
-//! [exportAsVCard() declaration]       
+//! [exportAsVCard() declaration]
 
 private:
     void updateInterface(Mode mode);
@@ -89,9 +89,9 @@ private:
     QPushButton *previousButton;
     QPushButton *loadButton;
     QPushButton *saveButton;
-//! [exportButton declaration] 
+//! [exportButton declaration]
     QPushButton *exportButton;
-//! [exportButton declaration]     
+//! [exportButton declaration]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/addressbook/part1/addressbook.cpp b/examples/widgets/tutorials/addressbook/part1/addressbook.cpp
index 4e8c95635b..60acd6bb27 100644
--- a/examples/widgets/tutorials/addressbook/part1/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part1/addressbook.cpp
@@ -60,7 +60,7 @@ AddressBook::AddressBook(QWidget *parent)
     mainLayout->addWidget(addressText, 1, 1);
 //! [layout]
 
-//![setting the layout]    
+//![setting the layout]
     setLayout(mainLayout);
     setWindowTitle(tr("Simple Address Book"));
 }
diff --git a/examples/widgets/tutorials/addressbook/part2/addressbook.cpp b/examples/widgets/tutorials/addressbook/part2/addressbook.cpp
index e6f3409efc..6fd5d03fea 100644
--- a/examples/widgets/tutorials/addressbook/part2/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part2/addressbook.cpp
@@ -51,10 +51,10 @@ AddressBook::AddressBook(QWidget *parent)
 //! [setting readonly 1]
     QLabel *addressLabel = new QLabel(tr("Address:"));
     addressText = new QTextEdit;
-//! [setting readonly 2]    
+//! [setting readonly 2]
     addressText->setReadOnly(true);
 //! [setting readonly 2]
-   
+
 //! [pushbutton declaration]
     addButton = new QPushButton(tr("&Add"));
     addButton->show();
@@ -94,7 +94,7 @@ void AddressBook::addContact()
 
     nameLine->clear();
     addressText->clear();
-    
+
     nameLine->setReadOnly(false);
     nameLine->setFocus(Qt::OtherFocusReason);
     addressText->setReadOnly(false);
@@ -110,7 +110,7 @@ void AddressBook::submitContact()
 {
     QString name = nameLine->text();
     QString address = addressText->toPlainText();
-    
+
     if (name.isEmpty() || address.isEmpty()) {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
@@ -152,6 +152,6 @@ void AddressBook::cancel()
 
     addButton->setEnabled(true);
     submitButton->hide();
-    cancelButton->hide();    
+    cancelButton->hide();
 }
 //! [cancel]
diff --git a/examples/widgets/tutorials/addressbook/part3/addressbook.cpp b/examples/widgets/tutorials/addressbook/part3/addressbook.cpp
index 61c331d1f5..bcf3f63430 100644
--- a/examples/widgets/tutorials/addressbook/part3/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part3/addressbook.cpp
@@ -51,7 +51,7 @@ AddressBook::AddressBook(QWidget *parent)
     QLabel *addressLabel = new QLabel(tr("Address:"));
     addressText = new QTextEdit;
     addressText->setReadOnly(true);
-    
+
     addButton = new QPushButton(tr("&Add"));
     addButton->show();
     submitButton = new QPushButton(tr("&Submit"));
@@ -68,7 +68,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
     connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
-//! [connecting navigation signals]    
+//! [connecting navigation signals]
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
 //! [connecting navigation signals]
@@ -107,7 +107,7 @@ void AddressBook::addContact()
     nameLine->setReadOnly(false);
     nameLine->setFocus(Qt::OtherFocusReason);
     addressText->setReadOnly(false);
-    
+
     addButton->setEnabled(false);
 //! [disabling navigation]
     nextButton->setEnabled(false);
@@ -121,7 +121,7 @@ void AddressBook::submitContact()
 {
     QString name = nameLine->text();
     QString address = addressText->toPlainText();
-    
+
     if (name.isEmpty() || address.isEmpty()) {
         QMessageBox::information(this, tr("Empty Field"),
             tr("Please enter a name and address."));
@@ -159,20 +159,20 @@ void AddressBook::cancel()
 {
     nameLine->setText(oldName);
     addressText->setText(oldAddress);
-   
+
     if (contacts.isEmpty()) {
         nameLine->clear();
         addressText->clear();
     }
-    
+
     nameLine->setReadOnly(true);
     addressText->setReadOnly(true);
     addButton->setEnabled(true);
-    
+
     int number = contacts.size();
     nextButton->setEnabled(number > 1);
     previousButton->setEnabled(number > 1);
-    
+
     submitButton->hide();
     cancelButton->hide();
 }
diff --git a/examples/widgets/tutorials/addressbook/part3/addressbook.h b/examples/widgets/tutorials/addressbook/part3/addressbook.h
index 2458645ab5..3613fedb34 100644
--- a/examples/widgets/tutorials/addressbook/part3/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part3/addressbook.h
@@ -65,16 +65,16 @@ public slots:
 //! [navigation functions]
     void next();
     void previous();
-//! [navigation functions]    
+//! [navigation functions]
 
 private:
     QPushButton *addButton;
     QPushButton *submitButton;
     QPushButton *cancelButton;
-//! [navigation pushbuttons]    
+//! [navigation pushbuttons]
     QPushButton *nextButton;
     QPushButton *previousButton;
-//! [navigation pushbuttons]    
+//! [navigation pushbuttons]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/addressbook/part4/addressbook.cpp b/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
index 6b3731b5f6..66764a2815 100644
--- a/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
@@ -53,17 +53,17 @@ AddressBook::AddressBook(QWidget *parent)
     addressText->setReadOnly(true);
 
     addButton = new QPushButton(tr("&Add"));
-//! [edit and remove buttons] 
+//! [edit and remove buttons]
     editButton = new QPushButton(tr("&Edit"));
     editButton->setEnabled(false);
     removeButton = new QPushButton(tr("&Remove"));
     removeButton->setEnabled(false);
-//! [edit and remove buttons] 
+//! [edit and remove buttons]
     submitButton = new QPushButton(tr("&Submit"));
     submitButton->hide();
     cancelButton = new QPushButton(tr("&Cancel"));
     cancelButton->hide();
-    
+
     nextButton = new QPushButton(tr("&Next"));
     nextButton->setEnabled(false);
     previousButton = new QPushButton(tr("&Previous"));
@@ -71,20 +71,20 @@ AddressBook::AddressBook(QWidget *parent)
 
     connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
     connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-//! [connecting edit and remove] 
+//! [connecting edit and remove]
     connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [connecting edit and remove] 
+//! [connecting edit and remove]
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
 
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
-//! [adding edit and remove to the layout]     
+//! [adding edit and remove to the layout]
     buttonLayout1->addWidget(editButton);
     buttonLayout1->addWidget(removeButton);
-//! [adding edit and remove to the layout]         
+//! [adding edit and remove to the layout]
     buttonLayout1->addWidget(submitButton);
     buttonLayout1->addWidget(cancelButton);
     buttonLayout1->addStretch();
@@ -138,7 +138,7 @@ void AddressBook::submitContact()
     }
 //! [submitContact() function part1]
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -150,7 +150,7 @@ void AddressBook::submitContact()
 //! [submitContact() function part1]
 //! [submitContact() function part2]
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -164,7 +164,7 @@ void AddressBook::submitContact()
         } else if (oldAddress != address) {
             QMessageBox::information(this, tr("Edit Successful"),
                 tr("\"%1\" has been edited in your address book.").arg(name));
-            contacts[name] = address;        
+            contacts[name] = address;
         }
     }
 
@@ -192,7 +192,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -243,7 +243,7 @@ void AddressBook::updateInterface(Mode mode)
     currentMode = mode;
 
     switch (currentMode) {
-        
+
     case AddingMode:
     case EditingMode:
 
diff --git a/examples/widgets/tutorials/addressbook/part4/addressbook.h b/examples/widgets/tutorials/addressbook/part4/addressbook.h
index ff8c4f0318..6430ac3413 100644
--- a/examples/widgets/tutorials/addressbook/part4/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part4/addressbook.h
@@ -77,10 +77,10 @@ private:
     void updateInterface(Mode mode);
 //! [updateInterface() declaration]
     QPushButton *addButton;
-//! [buttons declaration]    
+//! [buttons declaration]
     QPushButton *editButton;
     QPushButton *removeButton;
-//! [buttons declaration]        
+//! [buttons declaration]
     QPushButton *submitButton;
     QPushButton *cancelButton;
     QPushButton *nextButton;
@@ -91,9 +91,9 @@ private:
     QMap<QString, QString> contacts;
     QString oldName;
     QString oldAddress;
-//! [mode declaration]    
+//! [mode declaration]
     Mode currentMode;
-//! [mode declaration]    
+//! [mode declaration]
 };
 
 #endif
diff --git a/examples/widgets/tutorials/addressbook/part5/addressbook.cpp b/examples/widgets/tutorials/addressbook/part5/addressbook.cpp
index 90eb81986a..ca2f72e9e1 100644
--- a/examples/widgets/tutorials/addressbook/part5/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part5/addressbook.cpp
@@ -81,19 +81,19 @@ AddressBook::AddressBook(QWidget *parent)
     connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
     connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
     connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [signals and slots for find]    
+//! [signals and slots for find]
     connect(findButton, SIGNAL(clicked()), this, SLOT(findContact()));
-//! [signals and slots for find]        
+//! [signals and slots for find]
     connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
     buttonLayout1->addWidget(removeButton);
-//! [adding findButton to layout]        
+//! [adding findButton to layout]
     buttonLayout1->addWidget(findButton);
-//! [adding findButton to layout]            
+//! [adding findButton to layout]
     buttonLayout1->addWidget(submitButton);
     buttonLayout1->addWidget(cancelButton);
     buttonLayout1->addStretch();
@@ -145,7 +145,7 @@ void AddressBook::submitContact()
     }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -155,7 +155,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -196,7 +196,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -241,7 +241,7 @@ void AddressBook::previous()
     nameLine->setText(i.key());
     addressText->setText(i.value());
 }
-//! [findContact() function] 
+//! [findContact() function]
 void AddressBook::findContact()
 {
     dialog->show();
@@ -261,7 +261,7 @@ void AddressBook::findContact()
 
     updateInterface(NavigationMode);
 }
-//! [findContact() function] 
+//! [findContact() function]
 
 void AddressBook::updateInterface(Mode mode)
 {
@@ -288,7 +288,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
diff --git a/examples/widgets/tutorials/addressbook/part5/addressbook.h b/examples/widgets/tutorials/addressbook/part5/addressbook.h
index 5e2c18e91a..f8a53304ee 100644
--- a/examples/widgets/tutorials/addressbook/part5/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part5/addressbook.h
@@ -68,9 +68,9 @@ public slots:
     void submitContact();
     void cancel();
     void removeContact();
-//! [findContact() declaration]    
+//! [findContact() declaration]
     void findContact();
-//! [findContact() declaration]    
+//! [findContact() declaration]
     void next();
     void previous();
 
@@ -80,9 +80,9 @@ private:
     QPushButton *addButton;
     QPushButton *editButton;
     QPushButton *removeButton;
-//! [findButton declaration]        
+//! [findButton declaration]
     QPushButton *findButton;
-//! [findButton declaration] 
+//! [findButton declaration]
     QPushButton *submitButton;
     QPushButton *cancelButton;
     QPushButton *nextButton;
@@ -91,9 +91,9 @@ private:
     QTextEdit *addressText;
 
     QMap<QString, QString> contacts;
-//! [FindDialog declaration]     
+//! [FindDialog declaration]
     FindDialog *dialog;
-//! [FindDialog declaration]     
+//! [FindDialog declaration]
     QString oldName;
     QString oldAddress;
     Mode currentMode;
diff --git a/examples/widgets/tutorials/addressbook/part6/addressbook.cpp b/examples/widgets/tutorials/addressbook/part6/addressbook.cpp
index a9bc2cc51c..2ced8e2404 100644
--- a/examples/widgets/tutorials/addressbook/part6/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part6/addressbook.cpp
@@ -71,9 +71,9 @@ AddressBook::AddressBook(QWidget *parent)
     previousButton->setEnabled(false);
 
     loadButton = new QPushButton(tr("&Load..."));
-//! [tooltip 1]    
+//! [tooltip 1]
     loadButton->setToolTip(tr("Load contacts from a file"));
-//! [tooltip 1]        
+//! [tooltip 1]
     saveButton = new QPushButton(tr("&Save..."));
 //! [tooltip 2]
     saveButton->setToolTip(tr("Save contacts to a file"));
@@ -92,7 +92,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
     connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
@@ -151,7 +151,7 @@ void AddressBook::submitContact()
     }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -161,7 +161,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -202,7 +202,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -296,7 +296,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
@@ -341,12 +341,12 @@ void AddressBook::saveToFile()
             return;
         }
 
-//! [saveToFile() function part2]        
+//! [saveToFile() function part2]
 //! [saveToFile() function part3]
         QDataStream out(&file);
         out.setVersion(QDataStream::Qt_4_5);
         out << contacts;
-    }       
+    }
 }
 //! [saveToFile() function part3]
 
@@ -362,15 +362,15 @@ void AddressBook::loadFromFile()
     if (fileName.isEmpty())
         return;
     else {
-        
+
         QFile file(fileName);
-        
+
         if (!file.open(QIODevice::ReadOnly)) {
             QMessageBox::information(this, tr("Unable to open file"),
                 file.errorString());
             return;
         }
-        
+
         QDataStream in(&file);
         in.setVersion(QDataStream::Qt_4_5);
         contacts.clear();   // clear existing contacts
diff --git a/examples/widgets/tutorials/addressbook/part6/addressbook.h b/examples/widgets/tutorials/addressbook/part6/addressbook.h
index 99dfd1e404..ce2691ccad 100644
--- a/examples/widgets/tutorials/addressbook/part6/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part6/addressbook.h
@@ -70,10 +70,10 @@ public slots:
     void findContact();
     void next();
     void previous();
-//! [save and load functions declaration]    
+//! [save and load functions declaration]
     void saveToFile();
     void loadFromFile();
-//! [save and load functions declaration]    
+//! [save and load functions declaration]
 
 private:
     void updateInterface(Mode mode);
@@ -86,10 +86,10 @@ private:
     QPushButton *cancelButton;
     QPushButton *nextButton;
     QPushButton *previousButton;
-//! [save and load buttons declaration]        
+//! [save and load buttons declaration]
     QPushButton *loadButton;
     QPushButton *saveButton;
-//! [save and load buttons declaration]            
+//! [save and load buttons declaration]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
index 6ad7630e8d..2060d97d2f 100644
--- a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp
@@ -93,7 +93,7 @@ AddressBook::AddressBook(QWidget *parent)
     connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile()));
     connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile()));
     connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard()));
-    
+
     QVBoxLayout *buttonLayout1 = new QVBoxLayout;
     buttonLayout1->addWidget(addButton);
     buttonLayout1->addWidget(editButton);
@@ -153,7 +153,7 @@ void AddressBook::submitContact()
     }
 
     if (currentMode == AddingMode) {
-        
+
         if (!contacts.contains(name)) {
             contacts.insert(name, address);
             QMessageBox::information(this, tr("Add Successful"),
@@ -163,7 +163,7 @@ void AddressBook::submitContact()
                 tr("Sorry, \"%1\" is already in your address book.").arg(name));
         }
     } else if (currentMode == EditingMode) {
-        
+
         if (oldName != name) {
             if (!contacts.contains(name)) {
                 QMessageBox::information(this, tr("Edit Successful"),
@@ -204,7 +204,7 @@ void AddressBook::removeContact()
             QMessageBox::Yes | QMessageBox::No);
 
         if (button == QMessageBox::Yes) {
-            
+
             previous();
             contacts.remove(name);
 
@@ -298,7 +298,7 @@ void AddressBook::updateInterface(Mode mode)
         break;
 
     case NavigationMode:
-        
+
         if (contacts.isEmpty()) {
             nameLine->clear();
             addressText->clear();
@@ -331,7 +331,7 @@ void AddressBook::saveToFile()
     QString fileName = QFileDialog::getSaveFileName(this,
         tr("Save Address Book"), "",
         tr("Address Book (*.abk);;All Files (*)"));
-        
+
     if (fileName.isEmpty())
         return;
     else {
@@ -404,14 +404,14 @@ void AddressBook::exportAsVCard()
     QString fileName = QFileDialog::getSaveFileName(this,
         tr("Export Contact"), "",
         tr("vCard Files (*.vcf);;All Files (*)"));
-        
+
     if (fileName.isEmpty())
         return;
 
     QFile file(fileName);
 //! [export function part1]
-    
-//! [export function part2]    
+
+//! [export function part2]
     if (!file.open(QIODevice::WriteOnly)) {
         QMessageBox::information(this, tr("Unable to open file"),
             file.errorString());
@@ -425,12 +425,12 @@ void AddressBook::exportAsVCard()
     out << "BEGIN:VCARD" << "\n";
     out << "VERSION:2.1" << "\n";
     out << "N:" << lastName << ";" << firstName << "\n";
-        
-    if (!nameList.isEmpty())            
+
+    if (!nameList.isEmpty())
        out << "FN:" << nameList.join(' ') << "\n";
     else
        out << "FN:" << firstName << "\n";
-//! [export function part3] 
+//! [export function part3]
 
 //! [export function part4]
     address.replace(";", "\\;", Qt::CaseInsensitive);
diff --git a/examples/widgets/tutorials/addressbook/part7/addressbook.h b/examples/widgets/tutorials/addressbook/part7/addressbook.h
index a34cf24a23..d672c7a85b 100644
--- a/examples/widgets/tutorials/addressbook/part7/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part7/addressbook.h
@@ -74,7 +74,7 @@ public slots:
     void loadFromFile();
 //! [exportAsVCard() declaration]
     void exportAsVCard();
-//! [exportAsVCard() declaration]       
+//! [exportAsVCard() declaration]
 
 private:
     void updateInterface(Mode mode);
@@ -89,9 +89,9 @@ private:
     QPushButton *previousButton;
     QPushButton *loadButton;
     QPushButton *saveButton;
-//! [exportButton declaration] 
+//! [exportButton declaration]
     QPushButton *exportButton;
-//! [exportButton declaration]     
+//! [exportButton declaration]
     QLineEdit *nameLine;
     QTextEdit *addressText;
 
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/main.cpp b/examples/widgets/tutorials/gettingStarted/gsQt/part3/main.cpp
index e780986a53..bd0202c967 100644
--- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/main.cpp
+++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/main.cpp
@@ -67,7 +67,7 @@ Notepad::Notepad()
     layout->addWidget(textEdit);
     layout->addWidget(quitButton);
 
-    setLayout(layout); 
+    setLayout(layout);
 
     setWindowTitle(tr("Notepad"));
 }
@@ -79,7 +79,7 @@ void Notepad::quit()
     messageBox.setText(tr("Do you really want to quit?"));
     messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
     messageBox.setDefaultButton(QMessageBox::No);
-    if (messageBox.exec() == QMessageBox::Yes) 
+    if (messageBox.exec() == QMessageBox::Yes)
         qApp->quit();
 }
 
diff --git a/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp b/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp
index a3567a08ab..317c4760fb 100644
--- a/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp
+++ b/examples/widgets/tutorials/modelview/5_edit/mymodel.cpp
@@ -78,7 +78,7 @@ bool MyModel::setData(const QModelIndex & index, const QVariant & value, int rol
         //save value from editor to member m_gridData
         m_gridData[index.row()][index.column()] = value.toString();
 	//for presentation purposes only: build and emit a joined string
-	QString result; 
+        QString result;
 	for(int row= 0; row < ROWS; row++)
 	{
             for(int col= 0; col < COLS; col++)
diff --git a/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp b/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
index d969582928..0c1eb290fa 100644
--- a/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
+++ b/examples/widgets/tutorials/modelview/7_selections/mainwindow.cpp
@@ -72,7 +72,7 @@ MainWindow::MainWindow(QWidget *parent)
     europeItem->  appendRow(italyItem);
     italyItem->   appendRow(romeItem);
     italyItem->   appendRow(veronaItem);
-    
+
     //register the model
     treeView->setModel(standardModel);
     treeView->expandAll();
diff --git a/examples/widgets/widgets/calculator/button.cpp b/examples/widgets/widgets/calculator/button.cpp
index 70dbd52fca..395f685751 100644
--- a/examples/widgets/widgets/calculator/button.cpp
+++ b/examples/widgets/widgets/calculator/button.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets> 
+#include <QtWidgets>
 
 #include "button.h"
 
diff --git a/examples/widgets/widgets/codeeditor/codeeditor.cpp b/examples/widgets/widgets/codeeditor/codeeditor.cpp
index 2a7865ce6e..7da0930301 100644
--- a/examples/widgets/widgets/codeeditor/codeeditor.cpp
+++ b/examples/widgets/widgets/codeeditor/codeeditor.cpp
@@ -79,7 +79,7 @@ int CodeEditor::lineNumberAreaWidth()
 //![slotUpdateExtraAreaWidth]
 
 void CodeEditor::updateLineNumberAreaWidth(int /* newBlockCount */)
-{ 
+{
     setViewportMargins(lineNumberAreaWidth(), 0, 0, 0);
 }
 
@@ -120,7 +120,7 @@ void CodeEditor::highlightCurrentLine()
 
     if (!isReadOnly()) {
         QTextEdit::ExtraSelection selection;
-        
+
         QColor lineColor = QColor(Qt::yellow).lighter(160);
 
         selection.format.setBackground(lineColor);
diff --git a/examples/widgets/widgets/scribble/scribblearea.cpp b/examples/widgets/widgets/scribble/scribblearea.cpp
index 24e2b2b159..4028263e69 100644
--- a/examples/widgets/widgets/scribble/scribblearea.cpp
+++ b/examples/widgets/widgets/scribble/scribblearea.cpp
@@ -202,7 +202,7 @@ void ScribbleArea::print()
 {
 #if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG)
     QPrinter printer(QPrinter::HighResolution);
- 
+
     QPrintDialog printDialog(&printer, this);
 //! [21] //! [22]
     if (printDialog.exec() == QDialog::Accepted) {
diff --git a/examples/widgets/widgets/styles/widgetgallery.cpp b/examples/widgets/widgets/styles/widgetgallery.cpp
index 604f5af40b..4421bd19c4 100644
--- a/examples/widgets/widgets/styles/widgetgallery.cpp
+++ b/examples/widgets/widgets/styles/widgetgallery.cpp
@@ -215,7 +215,7 @@ void WidgetGallery::createBottomLeftTabWidget()
                               "Like a diamond in the sky.\n"
                               "Twinkle, twinkle, little star,\n"
                               "How I wonder what you are!\n"));
-                     
+
     QHBoxLayout *tab2hbox = new QHBoxLayout;
     tab2hbox->setMargin(5);
     tab2hbox->addWidget(textEdit);
diff --git a/examples/widgets/widgets/styles/widgetgallery.h b/examples/widgets/widgets/styles/widgetgallery.h
index 27e82c4d14..25d4c5881d 100644
--- a/examples/widgets/widgets/styles/widgetgallery.h
+++ b/examples/widgets/widgets/styles/widgetgallery.h
@@ -83,7 +83,7 @@ private:
     void createProgressBar();
 
     QPalette originalPalette;
- 
+
     QLabel *styleLabel;
     QComboBox *styleComboBox;
     QCheckBox *useStylePaletteCheckBox;
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 2676cd6f04..7459be65bf 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -23,7 +23,7 @@
 # a (possibly platform-specific) version of the actual compiler configuration,
 # for example g++-macx.conf.
 #
-# If you are making changes to any of these files, please consider the 
+# If you are making changes to any of these files, please consider the
 # possible effect it may have due to these include-rules, and whether it
 # might make more sense to share the rule or make it more specific.
 #
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
index 7918b14a3f..83096dd3da 100644
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -17,9 +17,9 @@ QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL      = 
+QMAKE_INCDIR_EGL      =
 QMAKE_LIBDIR_EGL      =
-QMAKE_INCDIR_OPENVG   = 
+QMAKE_INCDIR_OPENVG   =
 QMAKE_LIBDIR_OPENVG   =
 
 QMAKE_LIBS            =
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 46f002a360..a0ef0d0c83 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -60,8 +60,8 @@ QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
 QMAKE_LFLAGS_DEBUG	= /DEBUG
 QMAKE_LFLAGS_LTCG       = /LTCG
 QMAKE_LIBS_NETWORK      = ws2.lib
-QMAKE_LIBS_OPENGL       = 
-QMAKE_LIBS_COMPAT       = 
+QMAKE_LIBS_OPENGL       =
+QMAKE_LIBS_COMPAT       =
 
 QMAKE_LIBS_EGL          = libEGL.lib
 QMAKE_LIBS_OPENGL_ES1 = libGLES_CM.lib
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 27e29b21ed..fe9691cf39 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -4,73 +4,73 @@
 # Written for Qt/X11 on Windows using Cygwin's POSIX API
 #
 
-MAKEFILE_GENERATOR	= UNIX
+MAKEFILE_GENERATOR = UNIX
 QMAKE_PLATFORM = cygwin unix posix
 CONFIG += incremental
-QMAKE_INCREMENTAL_STYLE  = sublib
+QMAKE_INCREMENTAL_STYLE = sublib
 
-QMAKE_COMPILER = gcc
+QMAKE_COMPILER          = gcc
 
-QMAKE_CC		= gcc
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		= 
-QMAKE_YACC		= byacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	=
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CC                = gcc
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = byacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            = -pipe
+QMAKE_CFLAGS_DEPS       = -M
+QMAKE_CFLAGS_WARN_ON    = -Wall -W
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLIB      =
+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD     = -D_REENTRANT
 
-QMAKE_CXX		= g++
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXX               = g++
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/X11R6/include
-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        = /usr/X11R6/include
+QMAKE_LIBDIR_X11        = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL     = /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL     = /usr/X11R6/lib
 
-QMAKE_LINK		= g++
-QMAKE_LINK_SHLIB	= g++
-QMAKE_LINK_C		= gcc
-QMAKE_LINK_C_SHLIB	= gcc
-QMAKE_LFLAGS		=
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -shared
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-QMAKE_LFLAGS_THREAD	=
-QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
-QMAKE_CYGWIN_SHLIB	= 1
-QMAKE_CYGWIN_EXE	= 1
- 
-QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD	= -ldl
-QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_OPENGL	= -lGL
-QMAKE_LIBS_THREAD	= -lpthread
+QMAKE_LINK              = g++
+QMAKE_LINK_SHLIB        = g++
+QMAKE_LINK_C            = gcc
+QMAKE_LINK_C_SHLIB      = gcc
+QMAKE_LFLAGS            =
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
+QMAKE_CYGWIN_SHLIB      = 1
+QMAKE_CYGWIN_EXE        = 1
+
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       = -lpthread
 QMAKE_PREFIX_SHLIB      = lib
 QMAKE_PREFIX_STATICLIB  = lib
 QMAKE_EXTENSION_STATICLIB = a
 
-QMAKE_AR		= ar cqs
+QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB		=
+QMAKE_RANLIB            =
 
 include(../common/shell-unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 938337f96e..f6ceb93c23 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -4,109 +4,109 @@
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # From pthread(3t):
-# 	Some documentation will recommend the use of -D_REENTRANT for
-# 	compilation.  While this also functions properly, it is considered
-# 	an obsolescent form.
+#   Some documentation will recommend the use of -D_REENTRANT for
+#   compilation.  While this also functions properly, it is considered
+#   an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
-# 	When +DA2.0W is specified:
-# 	* 64-bit SVR4 Executable and Linking Format (ELF) object files
-# 	  are generated for PA-RISC 2.0. 
-# 	* The preprocessor predefined macro, __LP64__ is defined. 
-# 	* The correct path for 64-bit system and language libraries is
-# 	  selected.
-# 	When +DD32 is specified:
-# 	* The size of an int, long, or pointer data type is 32-bits. 
-# 	  The size of an int data type is 32-bits. The size of a long or
-# 	  pointer data type is 64-bits.
-# 	* This is the default, currently equivalent to +DA1.1 architecture.
-# 	When +DD64 is specified:
-# 	* The size of an int data type is 32-bits. The size of a long or
-# 	  pointer data type is 64-bits.
-# 	* This is currently equivalent to +DA2.OW architecture.
-# 	* The preprocessor predefined macro, __LP64__ is defined.
-# 	Using +DS to Specify Instruction Scheduling:
-# 	* By default, the compiler performs scheduling tuned for the system
-# 	  on which you are compiling, or, if specified, tuned for the setting
-# 	  of the +DA option.
+#   When +DA2.0W is specified:
+#   * 64-bit SVR4 Executable and Linking Format (ELF) object files
+#     are generated for PA-RISC 2.0.
+#   * The preprocessor predefined macro, __LP64__ is defined.
+#   * The correct path for 64-bit system and language libraries is
+#     selected.
+#   When +DD32 is specified:
+#   * The size of an int, long, or pointer data type is 32-bits.
+#     The size of an int data type is 32-bits. The size of a long or
+#     pointer data type is 64-bits.
+#   * This is the default, currently equivalent to +DA1.1 architecture.
+#   When +DD64 is specified:
+#   * The size of an int data type is 32-bits. The size of a long or
+#     pointer data type is 64-bits.
+#   * This is currently equivalent to +DA2.OW architecture.
+#   * The preprocessor predefined macro, __LP64__ is defined.
+#   Using +DS to Specify Instruction Scheduling:
+#   * By default, the compiler performs scheduling tuned for the system
+#     on which you are compiling, or, if specified, tuned for the setting
+#     of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
-#	-Aa
-# 	  Enables strict ANSI C compliance.
-# 	-Ae
-# 	  Enables ANSI C compliance, HP value-added features (as described
-# 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-# 	  to -Aa +e -D_HPUX_SOURCE.
-# 	+e
-# 	  Enables the following HP value added features while compiling in
-# 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
-# 	  defaults for missing arguments to intrinsic calls, and $ in identifier
-# 	  HP C extensions.
+#   -Aa
+#     Enables strict ANSI C compliance.
+#   -Ae
+#     Enables ANSI C compliance, HP value-added features (as described
+#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
+#     to -Aa +e -D_HPUX_SOURCE.
+#   +e
+#     Enables the following HP value added features while compiling in
+#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
+#     defaults for missing arguments to intrinsic calls, and $ in identifier
+#     HP C extensions.
 #
 
-MAKEFILE_GENERATOR	= UNIX
-QMAKE_PLATFORM = hpux
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = hpux
 
-QMAKE_COMPILER = hp_acc
+QMAKE_COMPILER          = hp_acc
 
-QMAKE_CC		= cc
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -Ae +DA2.0 -w
-QMAKE_CFLAGS_WARN_ON	=
-QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= -O +Oentrysched +Onolimit
-QMAKE_CFLAGS_DEBUG	= -y -g
-QMAKE_CFLAGS_SHLIB	= +Z
+QMAKE_CC                = cc
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = yacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            = -Ae +DA2.0 -w
+QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_OFF   =
+QMAKE_CFLAGS_RELEASE    = -O +Oentrysched +Onolimit
+QMAKE_CFLAGS_DEBUG      = -y -g
+QMAKE_CFLAGS_SHLIB      = +Z
 QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC	=
-QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
+QMAKE_CFLAGS_YACC       =
+QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
-QMAKE_CXX		= aCC
-QMAKE_CXXFLAGS		= +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= -g
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXX               = aCC
+QMAKE_CXXFLAGS          = +DA2.0 -w -D__STRICT_ANSI__ -D_HPUX_SOURCE
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = -g
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/include/X11R6
-QMAKE_LIBDIR_X11	= /usr/lib/X11R6
-QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        = /usr/include/X11R6
+QMAKE_LIBDIR_X11        = /usr/lib/X11R6
+QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
+QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
 
-QMAKE_LINK		= aCC
-QMAKE_LINK_SHLIB	= aCC
-QMAKE_LFLAGS		= +DA2.0 -Wl,+s
-QMAKE_LFLAGS_RELEASE	= -O
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -b
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,+h,
-QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH	= -Wl,+b,
-QMAKE_HPUX_SHLIB	= 2
-QMAKE_EXTENSION_SHLIB	= sl
+QMAKE_LINK              = aCC
+QMAKE_LINK_SHLIB        = aCC
+QMAKE_LFLAGS            = +DA2.0 -Wl,+s
+QMAKE_LFLAGS_RELEASE    = -O
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -b
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,+h,
+QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
+QMAKE_LFLAGS_RPATH      = -Wl,+b,
+QMAKE_HPUX_SHLIB        = 2
+QMAKE_EXTENSION_SHLIB   = sl
 
-QMAKE_LIBS		= -lm
-QMAKE_LIBS_DYNLOAD	= -ldld
-QMAKE_LIBS_X11		= -lXext -lX11
+QMAKE_LIBS              = -lm
+QMAKE_LIBS_DYNLOAD      = -ldld
+QMAKE_LIBS_X11          = -lXext -lX11
 
-QMAKE_LIBS_OPENGL	= -lGL
-QMAKE_LIBS_THREAD	= -lpthread
-QMAKE_LIBS_YACC		= -ly
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       = -lpthread
+QMAKE_LIBS_YACC         = -ly
 
-QMAKE_AR		= ar cqs
+QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB		=
+QMAKE_RANLIB            =
 
 include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index e73ed7d165..8d598d7388 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -5,72 +5,72 @@
 # therefore we also need to redefine _HPUX_SOURCE.
 #
 
-MAKEFILE_GENERATOR	= UNIX
-QMAKE_PLATFORM = hpux
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = hpux
 
-QMAKE_COMPILER = gcc
+QMAKE_COMPILER          = gcc
 
-QMAKE_CC		= gcc
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= 
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	= -fPIC
-QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
+QMAKE_CC                = gcc
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = yacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            =
+QMAKE_CFLAGS_DEPS       = -M
+QMAKE_CFLAGS_WARN_ON    = -Wall -W
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -O2
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLIB      = -fPIC
+QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
 
-QMAKE_CXX		= g++
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXX               = g++
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D_HPUX_SOURCE
+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		= /usr/lib/pa20_64
-QMAKE_INCDIR_X11	= /usr/include/X11R6
-QMAKE_LIBDIR_X11	= /usr/lib/X11R6/pa20_64
-QMAKE_INCDIR_OPENGL	= /opt/Mesa/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            = /usr/lib/pa20_64
+QMAKE_INCDIR_X11        = /usr/include/X11R6
+QMAKE_LIBDIR_X11        = /usr/lib/X11R6/pa20_64
+QMAKE_INCDIR_OPENGL     = /opt/Mesa/include /usr/contrib/X11R6/include
+QMAKE_LIBDIR_OPENGL     = /opt/Mesa/lib/pa20_64 /usr/contrib/X11R6/lib/pa20_64
 
-QMAKE_LINK		= g++
-QMAKE_LINK_SHLIB	= g++
-QMAKE_LINK_C		= gcc
-QMAKE_LINK_C_SHLIB	= gcc
-QMAKE_LFLAGS		= -Wl,+s -lpthread
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -fPIC -shared
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,+h,
-QMAKE_LFLAGS_THREAD	=
-QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH	= -Wl,+b,
-QMAKE_HPUX_SHLIB	= 3
-QMAKE_EXTENSION_SHLIB	= sl
+QMAKE_LINK              = g++
+QMAKE_LINK_SHLIB        = g++
+QMAKE_LINK_C            = gcc
+QMAKE_LINK_C_SHLIB      = gcc
+QMAKE_LFLAGS            = -Wl,+s -lpthread
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -fPIC -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,+h,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
+QMAKE_LFLAGS_RPATH      = -Wl,+b,
+QMAKE_HPUX_SHLIB        = 3
+QMAKE_EXTENSION_SHLIB   = sl
 
-QMAKE_LIBS		= -lm
-QMAKE_LIBS_DYNLOAD	= -ldld
-QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_OPENGL	= -lGL
-QMAKE_LIBS_THREAD	= -lpthread
-QMAKE_LIBS_YACC		= -ly
+QMAKE_LIBS              = -lm
+QMAKE_LIBS_DYNLOAD      = -ldld
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       = -lpthread
+QMAKE_LIBS_YACC         = -ly
 
-QMAKE_AR		= ar cqs
+QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB		=
+QMAKE_RANLIB            =
 
 include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index f7cc178d29..e320a83eec 100644
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -4,109 +4,109 @@
 # We define _POSIX_C_SOURCE to 199506L when using threads, therefore
 # we also need to redefine _HPUX_SOURCE.
 # From pthread(3t):
-# 	Some documentation will recommend the use of -D_REENTRANT for
-# 	compilation.  While this also functions properly, it is considered
-# 	an obsolescent form.
+#   Some documentation will recommend the use of -D_REENTRANT for
+#   compilation.  While this also functions properly, it is considered
+#   an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
-# 	When +DA2.0W is specified:
-# 	* 64-bit SVR4 Executable and Linking Format (ELF) object files
-# 	  are generated for PA-RISC 2.0. 
-# 	* The preprocessor predefined macro, __LP64__ is defined. 
-# 	* The correct path for 64-bit system and language libraries is
-# 	  selected.
-# 	When +DD32 is specified:
-# 	* The size of an int, long, or pointer data type is 32-bits. 
-# 	  The size of an int data type is 32-bits. The size of a long or
-# 	  pointer data type is 64-bits.
-# 	* This is the default, currently equivalent to +DA1.1 architecture.
-# 	When +DD64 is specified:
-# 	* The size of an int data type is 32-bits. The size of a long or
-# 	  pointer data type is 64-bits.
-# 	* This is currently equivalent to +DA2.OW architecture.
-# 	* The preprocessor predefined macro, __LP64__ is defined.
-# 	Using +DS to Specify Instruction Scheduling:
-# 	* By default, the compiler performs scheduling tuned for the system
-# 	  on which you are compiling, or, if specified, tuned for the setting
-# 	  of the +DA option.
+#   When +DA2.0W is specified:
+#   * 64-bit SVR4 Executable and Linking Format (ELF) object files
+#     are generated for PA-RISC 2.0.
+#   * The preprocessor predefined macro, __LP64__ is defined.
+#   * The correct path for 64-bit system and language libraries is
+#     selected.
+#   When +DD32 is specified:
+#   * The size of an int, long, or pointer data type is 32-bits.
+#     The size of an int data type is 32-bits. The size of a long or
+#     pointer data type is 64-bits.
+#   * This is the default, currently equivalent to +DA1.1 architecture.
+#   When +DD64 is specified:
+#   * The size of an int data type is 32-bits. The size of a long or
+#     pointer data type is 64-bits.
+#   * This is currently equivalent to +DA2.OW architecture.
+#   * The preprocessor predefined macro, __LP64__ is defined.
+#   Using +DS to Specify Instruction Scheduling:
+#   * By default, the compiler performs scheduling tuned for the system
+#     on which you are compiling, or, if specified, tuned for the setting
+#     of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
-#	-Aa
-# 	  Enables strict ANSI C compliance.
-# 	-Ae
-# 	  Enables ANSI C compliance, HP value-added features (as described
-# 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
-# 	  to -Aa +e -D_HPUX_SOURCE.
-# 	+e
-# 	  Enables the following HP value added features while compiling in
-# 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
-# 	  defaults for missing arguments to intrinsic calls, and $ in identifier
-# 	  HP C extensions.
+#   -Aa
+#     Enables strict ANSI C compliance.
+#   -Ae
+#     Enables ANSI C compliance, HP value-added features (as described
+#     for +e option), and _HPUX_SOURCE name space macro. It is equivalent
+#     to -Aa +e -D_HPUX_SOURCE.
+#   +e
+#     Enables the following HP value added features while compiling in
+#     ANSI C mode: sized enum, long long, long pointers, compiler supplied
+#     defaults for missing arguments to intrinsic calls, and $ in identifier
+#     HP C extensions.
 #
 
-MAKEFILE_GENERATOR	= UNIX
-QMAKE_PLATFORM = hpux
+MAKEFILE_GENERATOR      = UNIX
+QMAKE_PLATFORM          = hpux
 CONFIG += plugin_no_soname
 
-QMAKE_COMPILER = hp_acc
+QMAKE_COMPILER          = hp_acc
 
-QMAKE_CC		= cc
-QMAKE_LEX		= lex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= +DD64 +DSitanium -w
-QMAKE_CFLAGS_WARN_ON	=
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= +O1
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	= +Z
-QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC	=
-QMAKE_CFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -D_REENTRANT -mt
+QMAKE_CC                = cc
+QMAKE_LEX               = lex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = yacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            = +DD64 +DSitanium -w
+QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = +O1
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLI       = +Z
+QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CFLAGS_YACC       =
+QMAKE_CFLAGS_THREAD     = -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE -D_REENTRANT -mt
 
-QMAKE_CXX		= aCC
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS -D__STRICT_ANSI__ -D_HPUX_SOURCE
-QMAKE_CXXFLAGS_DEPS	= +M
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= -D_POSIX_C_SOURCE=199506L -D_REENTRANT -mt
+QMAKE_CXX               = aCC
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS -D__STRICT_ANSI__ -D_HPUX_SOURCE
+QMAKE_CXXFLAGS_DEPS     = +M
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_STATIC_LB = $$QMAKE_CFLAGS_STATIC_LIB
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = -D_POSIX_C_SOURCE=199506L -D_REENTRANT -mt
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/include/X11R6
-QMAKE_LIBDIR_X11	= /usr/lib/hpux64/X11R6
-QMAKE_INCDIR_OPENGL	= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        = /usr/include/X11R6
+QMAKE_LIBDIR_X11        = /usr/lib/hpux64/X11R6
+QMAKE_INCDIR_OPENGL     = /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
+QMAKE_LIBDIR_OPENGL     = /opt/graphics/OpenGL/lib/hpux64 /usr/contrib/X11R6/lib/hpux64
 
-QMAKE_LINK		= aCC
-QMAKE_LINK_SHLIB	= aCC
-QMAKE_LFLAGS		= +DD64 +DSitanium -Wl,+s
-QMAKE_LFLAGS_RELEASE	= -O
-QMAKE_LFLAGS_DEBUG	= -g
-QMAKE_LFLAGS_SHLIB	= -b -Wl,-a,shared
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,+h,
-QMAKE_LFLAGS_THREAD	=
-QMAKE_LFLAGS_NOUNDEF	= -Wl,+noallowunsats
-QMAKE_LFLAGS_RPATH	=
+QMAKE_LINK              = aCC
+QMAKE_LINK_SHLIB        = aCC
+QMAKE_LFLAGS            = +DD64 +DSitanium -Wl,+s
+QMAKE_LFLAGS_RELEASE    = -O
+QMAKE_LFLAGS_DEBUG      = -g
+QMAKE_LFLAGS_SHLIB      = -b -Wl,-a,shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,+h,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_NOUNDEF    = -Wl,+noallowunsats
+QMAKE_LFLAGS_RPATH      =
 
-QMAKE_LIBS		= -lm
-QMAKE_LIBS_DYNLOAD	= -ldl
-QMAKE_LIBS_X11		= -lXext -lX11
-QMAKE_LIBS_OPENGL	= -lGL -lXt
-QMAKE_LIBS_THREAD	= -lpthread
-QMAKE_LIBS_YACC		= -ly
+QMAKE_LIBS              = -lm
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11          = -lXext -lX11
+QMAKE_LIBS_OPENGL       = -lGL -lXt
+QMAKE_LIBS_THREAD       = -lpthread
+QMAKE_LIBS_YACC         = -ly
 
-QMAKE_AR		= ar cqs
+QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB		=
+QMAKE_RANLIB            =
 
 include(../common/unix.conf)
 load(qt_config)
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index 5850055b33..36437ead30 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -20,9 +20,9 @@ QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL      = 
+QMAKE_INCDIR_EGL      =
 QMAKE_LIBDIR_EGL      =
-QMAKE_INCDIR_OPENVG   = 
+QMAKE_INCDIR_OPENVG   =
 QMAKE_LIBDIR_OPENVG   =
 
 QMAKE_LIBS            =
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index d8b0b161b6..353aa8833b 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -81,7 +81,7 @@ QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
 CONFIG += icc_pch_style
 QMAKE_PCH_OUTPUT_EXT    = .pchi
 QMAKE_CXXFLAGS_USE_PRECOMPILE = -pch-use ${QMAKE_PCH_OUTPUT} -include ${QMAKE_PCH_INPUT}
-QMAKE_CXXFLAGS_PRECOMPILE = -c -pch-create ${QMAKE_PCH_OUTPUT} -include ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_TEMP_OBJECT} ${QMAKE_PCH_TEMP_SOURCE} 
+QMAKE_CXXFLAGS_PRECOMPILE = -c -pch-create ${QMAKE_PCH_OUTPUT} -include ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_TEMP_OBJECT} ${QMAKE_PCH_TEMP_SOURCE}
 
 # -Bsymbolic-functions (ld) support
 QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index b85f44d182..45e826ba4c 100644
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -12,61 +12,61 @@
 # warning #1569: potential redeclared typedef
 #
 
-MAKEFILE_GENERATOR	= UNIX
+MAKEFILE_GENERATOR      = UNIX
 CONFIG += app_bundle
 QMAKE_INCREMENTAL_STYLE = sublibs
 QMAKE_COMPILER_DEFINES  += __APPLE__ __GNUC__
 
-QMAKE_COMPILER = gcc intel_icc   # icc pretends to be gcc
+QMAKE_COMPILER          = gcc intel_icc   # icc pretends to be gcc
 
-QMAKE_CC		= icc
-QMAKE_CFLAGS		= -wd858,1572,1569,279
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	=
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	=
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	= -fpic
-QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= 
+QMAKE_CC                = icc
+QMAKE_CFLAGS            = -wd858,1572,1569,279
+QMAKE_CFLAGS_DEPS       = -M
+QMAKE_CFLAGS_WARN_ON    =
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    =
+QMAKE_CFLAGS_DEBUG      = -g
+QMAKE_CFLAGS_SHLIB      = -fpic
+QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD     =
 
 QMAKE_OBJECTIVE_CC      = gcc
-QMAKE_OBJECTIVE_CFLAGS		= -pipe
-QMAKE_OBJECTIVE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_OBJECTIVE_CFLAGS_WARN_OFF	= -w
-QMAKE_OBJECTIVE_CFLAGS_RELEASE	= -Os
-QMAKE_OBJECTIVE_CFLAGS_DEBUG	= -g
-QMAKE_OBJECTIVE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+QMAKE_OBJECTIVE_CFLAGS          = -pipe
+QMAKE_OBJECTIVE_CFLAGS_WARN_ON  = -Wall -W
+QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = -w
+QMAKE_OBJECTIVE_CFLAGS_RELEASE  = -Os
+QMAKE_OBJECTIVE_CFLAGS_DEBUG    = -g
+QMAKE_OBJECTIVE_CFLAGS_HIDESYMS = -fvisibility=hidden
 
-QMAKE_CXX		= icpc
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXX               = icpc
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 
-QMAKE_LINK		= icpc
-QMAKE_LINK_SHLIB	= icpc
-QMAKE_LFLAGS		= -headerpad_max_install_names
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -single_module -dynamiclib 
+QMAKE_LINK              = icpc
+QMAKE_LINK_SHLIB        = icpc
+QMAKE_LFLAGS            = -headerpad_max_install_names
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -ingle_module -dynamiclib
 QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -install_name$${LITERAL_WHITESPACE}
-QMAKE_LFLAGS_THREAD	=
-QMAKE_LFLAGS_RPATH	=
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -install_name$${LITERAL_WHITESPACE}
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_RPATH      =
 
 QMAKE_LFLAGS_VERSION    = -current_version$${LITERAL_WHITESPACE}
 QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
 
-QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
+QMAKE_CLEAN             = -r $(OBJECTS_DIR)/ti_files
 
 include(../common/macx.conf)
 
diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf
index e4ffba0531..131619de32 100644
--- a/mkspecs/macx-xcode/qmake.conf
+++ b/mkspecs/macx-xcode/qmake.conf
@@ -4,23 +4,23 @@
 # Mac OS X + XCode
 #
 
-MAKEFILE_GENERATOR	= XCODE
-CONFIG += lib_version_first incremental plugin_no_soname app_bundle
+MAKEFILE_GENERATOR              = XCODE
+CONFIG                         += lib_version_first incremental plugin_no_soname app_bundle
 
 include(../common/macx.conf)
 include(../common/gcc-base-mac.conf)
 include(../common/g++-macx.conf)
 
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+QMAKE_MACOSX_DEPLOYMENT_TARGET  = 10.6
 
 QMAKE_LINK                      =
 QMAKE_LINK_C                    =
 QMAKE_LINK_C_SHLIB              =
 QMAKE_LINK_SHLIB                =
-QMAKE_CFLAGS_HIDESYMS           = 
+QMAKE_CFLAGS_HIDESYMS           =
 QMAKE_LFLAGS_VERSION            =
 QMAKE_LFLAGS_COMPAT_VERSION     =
 QMAKE_LFLAGS_SONAME             =
-QMAKE_INCDIR		+= /usr/local/include /System/Library/Frameworks/CarbonCore.framework/Headers 
+QMAKE_INCDIR                   += /usr/local/include /System/Library/Frameworks/CarbonCore.framework/Headers
 
 load(qt_config)
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index eabdd41ac6..47579600c1 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -4,9 +4,9 @@
 # This mkspec can be used as the platform mkspec when building
 # Qt in scratchbox. If used as such, qmake and similar host
 # tools will be compiled for the host architecture (E.g. x86)
-# and thus not run in the emulator. This results in a 
+# and thus not run in the emulator. This results in a
 # significant improvement in build times.
-# 
+#
 # Note: The mkspec copied & pasted parts from common/gcc.conf
 #       and common/linux.conf as setBootstrapVariable in
 #       configure has a bug which stops re-assignments working
@@ -89,9 +89,9 @@ QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
 QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
 QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL      = 
+QMAKE_INCDIR_EGL      =
 QMAKE_LIBDIR_EGL      =
-QMAKE_INCDIR_OPENVG   = 
+QMAKE_INCDIR_OPENVG   =
 QMAKE_LIBDIR_OPENVG   =
 
 QMAKE_LIBS            =
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
index 736b69073a..4f339cbea6 100644
--- a/mkspecs/win32-g++/qplatformdefs.h
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -65,16 +65,16 @@
 
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)
 typedef enum {
-    NameUnknown		  = 0, 
-    NameFullyQualifiedDN  = 1, 
-    NameSamCompatible	  = 2, 
-    NameDisplay		  = 3, 
-    NameUniqueId	  = 6, 
-    NameCanonical	  = 7, 
-    NameUserPrincipal	  = 8, 
-    NameCanonicalEx	  = 9, 
-    NameServicePrincipal  = 10, 
-    NameDnsDomain	  = 12
+    NameUnknown           = 0,
+    NameFullyQualifiedDN  = 1,
+    NameSamCompatible     = 2,
+    NameDisplay           = 3,
+    NameUniqueId          = 6,
+    NameCanonical         = 7,
+    NameUserPrincipal     = 8,
+    NameCanonicalEx       = 9,
+    NameServicePrincipal  = 10,
+    NameDnsDomain         = 12
 } EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
 #endif
 
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 6530003c83..0b05873a8b 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -4,72 +4,72 @@
 # Written for Intel C++
 #
 
-MAKEFILE_GENERATOR	= MSVC.NET
-QMAKE_PLATFORM = win32
-CONFIG += incremental flat debug_and_release debug_and_release_target
-DEFINES			+= UNICODE
-QMAKE_COMPILER_DEFINES  += __INTEL_COMPILER WIN32
+MAKEFILE_GENERATOR      = MSVC.NET
+QMAKE_PLATFORM          = win32
+CONFIG                 += incremental flat debug_and_release debug_and_release_target
+DEFINES                += UNICODE
+QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32
 
-QMAKE_COMPILER = msvc intel_icl  # icl pretends to be msvc
+QMAKE_COMPILER          = msvc intel_icl  # icl pretends to be msvc
 
-QMAKE_CC		= icl
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= byacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -nologo -Zm200 /Qprec /Qwd1744,1738
-QMAKE_CFLAGS_WARN_ON	= -W3 /Qwd673
-QMAKE_CFLAGS_WARN_OFF	= -W0 /Qwd673
-QMAKE_CFLAGS_RELEASE	= -O2 -MD 
+QMAKE_CC                = icl
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = byacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            = -nologo -Zm200 /Qprec /Qwd1744,1738
+QMAKE_CFLAGS_WARN_ON    = -W3 /Qwd673
+QMAKE_CFLAGS_WARN_OFF   = -W0 /Qwd673
+QMAKE_CFLAGS_RELEASE    = -O2 -MD
 # Giving -O2 to debug builds should make icc 9.1 happy, but it might make debugging harder, so it might be reverted.
 # This is actually a workaround for a bug in icc 9.1.
-QMAKE_CFLAGS_DEBUG	= -Zi -MDd -O2
-QMAKE_CFLAGS_YACC	=
+QMAKE_CFLAGS_DEBUG      = -Zi -MDd -O2
+QMAKE_CFLAGS_YACC       =
 
-QMAKE_CXX		= $$QMAKE_CC
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS /Zc:forScope
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_STL_ON	= -GX
-QMAKE_CXXFLAGS_STL_OFF	=
-QMAKE_CXXFLAGS_RTTI_ON	= -GR
+QMAKE_CXX               = $$QMAKE_CC
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS /Zc:forScope
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_STL_ON   = -GX
+QMAKE_CXXFLAGS_STL_OFF  =
+QMAKE_CXXFLAGS_RTTI_ON  = -GR
 QMAKE_CXXFLAGS_RTTI_OFF	=
 QMAKE_CXXFLAGS_EXCEPTIONS_ON = -GX
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
 
-QMAKE_INCDIR		=
+QMAKE_INCDIR            =
 
-QMAKE_RUN_CC		= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
-QMAKE_RUN_CC_IMP	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
-QMAKE_RUN_CC_IMP_BATCH	= $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
-QMAKE_RUN_CXX		= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
-QMAKE_RUN_CXX_IMP	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
+QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src
+QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $<
+QMAKE_RUN_CC_IMP_BATCH  = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<<
+QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src
+QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $<
 QMAKE_RUN_CXX_IMP_BATCH	= $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 
-QMAKE_LINK		= xilink
-QMAKE_LFLAGS		= /NOLOGO
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	= /DEBUG
-QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:console
-QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:windows
+QMAKE_LINK              = xilink
+QMAKE_LFLAGS            = /NOLOGO
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      = /DEBUG
+QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:console
+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:windows
 QMAKE_LFLAGS_DLL        = /DLL
 
-QMAKE_LIBS		=
+QMAKE_LIBS              =
 QMAKE_LIBS_CORE         = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib
 QMAKE_LIBS_GUI          = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib ws2_32.lib ole32.lib user32.lib advapi32.lib
 QMAKE_LIBS_NETWORK      = ws2_32.lib
 QMAKE_LIBS_OPENGL       = glu32.lib opengl32.lib gdi32.lib user32.lib delayimp.lib
 QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
-QMAKE_LIBS_QT_ENTRY	= -lqtmain
+QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_IDL		= midl
-QMAKE_LIB		= xilib /NOLOGO
-QMAKE_RC		= rc
+QMAKE_IDL               = midl
+QMAKE_LIB               = xilib /NOLOGO
+QMAKE_RC                = rc
 
 include(../common/shell-win32.conf)
 
-DSP_EXTENSION		= .dsp
+DSP_EXTENSION           = .dsp
 load(qt_config)
diff --git a/mkspecs/wince50standard-x86-msvc2005/qmake.conf b/mkspecs/wince50standard-x86-msvc2005/qmake.conf
index 2fa7556a29..d16d1f0f5b 100644
--- a/mkspecs/wince50standard-x86-msvc2005/qmake.conf
+++ b/mkspecs/wince50standard-x86-msvc2005/qmake.conf
@@ -11,7 +11,7 @@ CE_ARCH     = x86
 DEFINES    += STANDARDSHELL_UI_MODEL _WIN32_WCE=0x500 $$CE_ARCH _X86_ _M_IX86 Q_OS_WINCE_STD QT_NO_PRINTER QT_NO_PRINTDIALOG
 
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:WINDOWSCE,5.00 /MACHINE:X86 /ENTRY:mainACRTStartup
-QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWSCE,5.00 /MACHINE:X86 
+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWSCE,5.00 /MACHINE:X86
 QMAKE_LFLAGS_DLL        = /SUBSYSTEM:WINDOWSCE,5.00 /MACHINE:X86 /DLL /SAFESEH:NO
 QMAKE_LIBFLAGS          = $$QMAKE_LFLAGS_WINDOWS
 QMAKE_LIBFLAGS_RELEASE  = /LTCG
diff --git a/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf b/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
index 3bb18af3c2..2fe971b4f4 100644
--- a/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
+++ b/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
@@ -20,8 +20,8 @@ QMAKE_LIBS              = corelibc.lib coredll.lib
 QMAKE_LIBS_CORE         = libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib
 QMAKE_LIBS_GUI          = ceshell.lib ole32.lib $$QMAKE_LIBS_CORE
 QMAKE_LIBS_NETWORK      = ws2.lib $$QMAKE_LIBS_GUI
-QMAKE_LIBS_OPENGL       = 
-QMAKE_LIBS_COMPAT       = 
+QMAKE_LIBS_OPENGL       =
+QMAKE_LIBS_COMPAT       =
 
 QMAKE_RC		= rc /DUNDER_CE=600 /D_WIN32_WCE=0x600
 
diff --git a/mkspecs/wincewm50pocket-msvc2005/qmake.conf b/mkspecs/wincewm50pocket-msvc2005/qmake.conf
index 676be5ac2a..657b68b616 100644
--- a/mkspecs/wincewm50pocket-msvc2005/qmake.conf
+++ b/mkspecs/wincewm50pocket-msvc2005/qmake.conf
@@ -5,7 +5,7 @@
 #
 include(../common/wince/qmake.conf)
 
-CE_SDK      = Windows Mobile 5.0 Pocket PC SDK 
+CE_SDK      = Windows Mobile 5.0 Pocket PC SDK
 CE_ARCH     = ARMV4I
 
 DEFINES += _WIN32_WCE=0x501 $$CE_ARCH _ARMV4I_ armv4i _ARM_ ARM _M_ARM ARM __arm__ Q_OS_WINCE_WM QT_NO_PRINTER QT_NO_PRINTDIALOG
diff --git a/mkspecs/wincewm50smart-msvc2005/qmake.conf b/mkspecs/wincewm50smart-msvc2005/qmake.conf
index c0f09cc0bb..36e2fcdf37 100644
--- a/mkspecs/wincewm50smart-msvc2005/qmake.conf
+++ b/mkspecs/wincewm50smart-msvc2005/qmake.conf
@@ -5,13 +5,13 @@
 #
 include(../common/wince/qmake.conf)
 
-CE_SDK      = Windows Mobile 5.0 Smartphone SDK 
+CE_SDK      = Windows Mobile 5.0 Smartphone SDK
 CE_ARCH     = ARMV4I
 
 DEFINES    += SMARTPHONE2003_UI_MODEL _WIN32_WCE=0x501 $$CE_ARCH _ARMV4I_ armv4i _ARM_ ARM _M_ARM ARM __arm__ Q_OS_WINCE_WM QT_NO_PRINTER QT_NO_PRINTDIALOG QT_KEYPAD_NAVIGATION
 
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB /ENTRY:mainACRTStartup
-QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB 
+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB
 QMAKE_LFLAGS_DLL        = /SUBSYSTEM:WINDOWSCE,5.01 /MACHINE:THUMB /DLL
 QMAKE_LIBFLAGS          = $$QMAKE_LFLAGS_WINDOWS
 QMAKE_LIBFLAGS_RELEASE  = /LTCG
diff --git a/mkspecs/wincewm60professional-msvc2005/qmake.conf b/mkspecs/wincewm60professional-msvc2005/qmake.conf
index 78c5f0187a..5528db3afd 100644
--- a/mkspecs/wincewm60professional-msvc2005/qmake.conf
+++ b/mkspecs/wincewm60professional-msvc2005/qmake.conf
@@ -1,13 +1,13 @@
 include(../wincewm50pocket-msvc2005/qmake.conf)
 
-CE_SDK		= Windows Mobile 6 Professional SDK 
-CE_ARCH		= ARMV4I
+CE_SDK                  = Windows Mobile 6 Professional SDK
+CE_ARCH                 = ARMV4I
 
 DEFINES -= _WIN32_WCE=0x501
 DEFINES += _WIN32_WCE=0x502
 
-QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB /ENTRY:mainACRTStartup
-QMAKE_LFLAGS_WINDOWS	= /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB
+QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB /ENTRY:mainACRTStartup
+QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB
 QMAKE_LFLAGS_DLL        = /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB /DLL
 QMAKE_LIBFLAGS          = $$QMAKE_LFLAGS_WINDOWS
 
diff --git a/mkspecs/wincewm60standard-msvc2005/qmake.conf b/mkspecs/wincewm60standard-msvc2005/qmake.conf
index 15cac422bc..c80339047b 100644
--- a/mkspecs/wincewm60standard-msvc2005/qmake.conf
+++ b/mkspecs/wincewm60standard-msvc2005/qmake.conf
@@ -1,6 +1,6 @@
 include(../wincewm50smart-msvc2005/qmake.conf)
 
-CE_SDK   = Windows Mobile 6 Standard SDK 
+CE_SDK   = Windows Mobile 6 Standard SDK
 CE_ARCH  = ARMV4I
 
 DEFINES -= _WIN32_WCE=0x501
@@ -8,7 +8,7 @@ DEFINES += _WIN32_WCE=0x502
 
 # Windows Mobile 6 Standard edition defines
 # GWES_ICONCURS=1 although there is no cursor support
-  
+
 DEFINES += QT_NO_CURSOR
 
 QMAKE_LFLAGS_CONSOLE	= /SUBSYSTEM:WINDOWSCE,5.02 /MACHINE:THUMB /ENTRY:mainACRTStartup
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 2e0a724c02..e64b2160b3 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -431,7 +431,7 @@ void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
 
     if (!rc_file.isEmpty()) {
         t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t"
-          << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") 
+          << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE")
           << incPathStr << " $(DEFINES)" << endl << endl;
     }
 }
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 6bdcb7ea70..0e1267994e 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -65,7 +65,7 @@ private:
     void writeRcFilePart(QTextStream &t);
 
     QStringList &findDependencies(const QString &file);
-    
+
     QString preCompHeaderOut;
 
     virtual bool findLibraries();
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 54dea886af..b620c270e0 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -451,7 +451,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
         }
     }
     QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");
-    bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") && 
+    bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
     if(useSignature) {
         t << "\n\tsigntool sign /F " << signature << " $(DESTDIR_TARGET)";
diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp
index 72362b7d8a..ef0229a695 100644
--- a/src/concurrent/qtconcurrentfilter.cpp
+++ b/src/concurrent/qtconcurrentfilter.cpp
@@ -148,7 +148,7 @@
 
     QtConcurrent::filter(), QtConcurrent::filtered(), and
     QtConcurrent::filteredReduced() accept function objects, which can be used to
-    add state to a function call. The result_type typedef must define the 
+    add state to a function call. The result_type typedef must define the
     result type of the function call operator:
 
     \snippet code/src_concurrent_qtconcurrentfilter.cpp 13
diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp
index 2dba3779ff..9718baf48f 100644
--- a/src/concurrent/qtconcurrentmap.cpp
+++ b/src/concurrent/qtconcurrentmap.cpp
@@ -56,7 +56,7 @@
 
 /*!
     \enum QtConcurrent::ReduceOption
-    This enum specifies the order of which results from the map or filter 
+    This enum specifies the order of which results from the map or filter
     function are passed to the reduce function.
 
     \value UnorderedReduce Reduction is done in an arbitrary order.
@@ -197,7 +197,7 @@
 
     QtConcurrent::map(), QtConcurrent::mapped(), and
     QtConcurrent::mappedReduced() accept function objects, which can be used to
-    add state to a function call. The result_type typedef must define the 
+    add state to a function call. The result_type typedef must define the
     result type of the function call operator:
 
     \snippet code/src_concurrent_qtconcurrentmap.cpp 14
@@ -347,7 +347,7 @@
   Calls \a function once for each item from \a begin to \a end and returns a
   container with the results. Specify the type of container as the a template
   argument, like this:
-  
+
   \code
      QList<int> ints = QtConcurrent::blockingMapped<QList<int> >(beginIterator, endIterator, fn);
   \endcode
diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h
index b456c42285..6817cd3e29 100644
--- a/src/concurrent/qtconcurrentmapkernel.h
+++ b/src/concurrent/qtconcurrentmapkernel.h
@@ -80,7 +80,7 @@ public:
             runIteration(it, i, 0);
             advance(it, 1);
         }
-       
+
         return false;
     }
 };
diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h
index a4a626d6c9..dcf4b92319 100644
--- a/src/concurrent/qtconcurrentreducekernel.h
+++ b/src/concurrent/qtconcurrentreducekernel.h
@@ -139,7 +139,7 @@ class ReduceKernel
 
 public:
     ReduceKernel(ReduceOptions _reduceOptions)
-        : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), 
+        : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0),
           threadCount(QThreadPool::globalInstance()->maxThreadCount())
     { }
 
diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp
index 880441cfc3..4ab1399c0c 100644
--- a/src/concurrent/qtconcurrentrun.cpp
+++ b/src/concurrent/qtconcurrentrun.cpp
@@ -47,63 +47,63 @@
     separate thread.
 
     \ingroup thread
-    
+
     This function is a part of the \l {Concurrent Programming}{Qt Concurrent} framework.
 
     The QtConcurrent::run() function runs a function in a separate thread.
     The return value of the function is made available through the QFuture API.
-    
+
     \section1 Running a Function in a Separate Thread
-    
+
     To run a function in another thread, use QtConcurrent::run():
-    
+
     \snippet code/src_concurrent_qtconcurrentrun.cpp 0
-    
+
     This will run \e aFunction in a separate thread obtained from the default
     QThreadPool. You can use the QFuture and QFutureWatcher classes to monitor
     the status of the function.
-    
+
     \section1 Passing Arguments to the Function
 
     Passing arguments to the function is done by adding them to the
     QtConcurrent::run() call immediately after the function name. For example:
-    
+
     \snippet code/src_concurrent_qtconcurrentrun.cpp 1
-    
+
     A copy of each argument is made at the point where QtConcurrent::run() is
     called, and these values are passed to the thread when it begins executing
     the function. Changes made to the arguments after calling
     QtConcurrent::run() are \e not visible to the thread.
-    
+
     \section1 Returning Values from the Function
-    
+
     Any return value from the function is available via QFuture:
-    
+
     \snippet code/src_concurrent_qtconcurrentrun.cpp 2
-    
+
     As documented above, passing arguments is done like this:
-    
+
     \snippet code/src_concurrent_qtconcurrentrun.cpp 3
-    
+
     Note that the QFuture::result() function blocks and waits for the result
     to become available. Use QFutureWatcher to get notification when the
     function has finished execution and the result is available.
-    
+
     \section1 Additional API Features
-    
+
     \section2 Using Member Functions
-    
+
     QtConcurrent::run() also accepts pointers to member functions. The first
     argument must be either a const reference or a pointer to an instance of
     the class. Passing by const reference is useful when calling const member
     functions; passing by pointer is useful for calling non-const member
     functions that modify the instance.
-    
+
     For example, calling QByteArray::split() (a const member function) in a
     separate thread is done like this:
-    
+
     \snippet code/src_concurrent_qtconcurrentrun.cpp 4
-    
+
     Calling a non-const member function is done like this:
 
     \snippet code/src_concurrent_qtconcurrentrun.cpp 5
@@ -115,17 +115,17 @@
     \l{http://www.boost.org/libs/bind/bind.html}{Boost} or
     \l{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf}
     {C++ TR1 Library Extensions}.
-    
+
     You can use boost::bind() or std::tr1::bind() to \e bind a number of
     arguments to a function when called. There are number of reasons for doing
     this:
-    
+
     \list
     \li To call a function that takes more than 5 arguments.
     \li To simplify calling a function with constant arguments.
     \li Changing the order of arguments.
     \endlist
-    
+
     See the documentation for the relevant functions for details on how to use
     the bind API.
 
@@ -137,14 +137,14 @@
 /*!
     \fn QFuture<T> QtConcurrent::run(Function function, ...);
     \relates <QtConcurrentRun>
-    
+
     Runs \a function in a separate thread. The thread is taken from the global
     QThreadPool. Note that the function may not run immediately; the function
     will only be run when a thread is available.
-    
+
     T is the same type as the return value of \a function. Non-void return
     values can be accessed via the QFuture::result() function.
-    
+
     Note that the QFuture returned by QtConcurrent::run() does not support
     canceling, pausing, or progress reporting. The QFuture returned can only
     be used to query for the running/finished status and the return value of
diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp
index 2fbb844367..42debea782 100644
--- a/src/corelib/animation/qsequentialanimationgroup.cpp
+++ b/src/corelib/animation/qsequentialanimationgroup.cpp
@@ -266,8 +266,8 @@ QSequentialAnimationGroup::~QSequentialAnimationGroup()
 
 /*!
     Adds a pause of \a msecs to this animation group.
-    The pause is considered as a special type of animation, thus 
-    \l{QAnimationGroup::animationCount()}{animationCount} will be 
+    The pause is considered as a special type of animation, thus
+    \l{QAnimationGroup::animationCount()}{animationCount} will be
     increased by one.
 
     \sa insertPause(), QAnimationGroup::addAnimation()
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 72a7c7264a..f69d9dd8de 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -222,7 +222,7 @@ void QVariantAnimationPrivate::updateInterpolator()
         interpolator = getInterpolator(type);
     else
         interpolator = 0;
-    
+
     //we make sure that the interpolator is always set to something
     if (!interpolator)
         interpolator = &defaultInterpolator;
@@ -252,7 +252,7 @@ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/)
                                                                            qMakePair(progress, QVariant()),
                                                                            animationValueLessThan);
         if (it == keyValues.constBegin()) {
-            //the item pointed to by it is the start element in the range    
+            //the item pointed to by it is the start element in the range
             if (it->first == 0 && keyValues.count() > 1) {
                 currentInterval.start = *it;
                 currentInterval.end = *(it+1);
diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h
index d4b187ffea..ed72036076 100644
--- a/src/corelib/arch/qatomic_ia64.h
+++ b/src/corelib/arch/qatomic_ia64.h
@@ -219,28 +219,28 @@ inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue)
 inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
 {
     register int expectedValueCopy = expectedValue;
-    return (static_cast<int>(_InterlockedCompareExchange(&_q_value, 
-							 newValue, 
-							 expectedValueCopy))
-	    == expectedValue);
+    return (static_cast<int>(_InterlockedCompareExchange(&_q_value,
+                                                         newValue,
+                                                         expectedValueCopy))
+            == expectedValue);
 }
 
 inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue)
 {
     register int expectedValueCopy = expectedValue;
-    return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value), 
-							     newValue, 
-							     expectedValueCopy)) 
-	    == expectedValue);
+    return (static_cast<int>(_InterlockedCompareExchange_acq(reinterpret_cast<volatile uint *>(&_q_value),
+                                                             newValue,
+                                                             expectedValueCopy))
+            == expectedValue);
 }
 
 inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue)
 {
     register int expectedValueCopy = expectedValue;
-    return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value), 
-							     newValue, 
-							     expectedValueCopy)) 
-	    == expectedValue);
+    return (static_cast<int>(_InterlockedCompareExchange_rel(reinterpret_cast<volatile uint *>(&_q_value),
+                                                             newValue,
+                                                             expectedValueCopy))
+            == expectedValue);
 }
 
 inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd)
@@ -286,10 +286,10 @@ template <typename T>
 Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValue, T *newValue)
 {
     register T *expectedValueCopy = expectedValue;
-    return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value), 
-					       newValue, 
-					       expectedValueCopy)
-	    == expectedValue);
+    return (_InterlockedCompareExchangePointer(reinterpret_cast<void * volatile*>(&_q_value),
+                                               newValue,
+                                               expectedValueCopy)
+            == expectedValue);
 }
 
 template <typename T>
@@ -301,7 +301,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetAcquire(T *expectedValu
     };
     x = &_q_value;
     register T *expectedValueCopy = expectedValue;
-    return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) 
+    return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy))
 	    == quintptr(expectedValue));
 }
 
diff --git a/src/corelib/arch/sparc/arch.pri b/src/corelib/arch/sparc/arch.pri
index b3ca399640..a201c83c6a 100644
--- a/src/corelib/arch/sparc/arch.pri
+++ b/src/corelib/arch/sparc/arch.pri
@@ -3,7 +3,7 @@
 #
 *-64* {
     SOURCES += $$PWD/qatomic64.s
-} 
+}
 else {
     SOURCES += $$PWD/qatomic32.s \
                $$PWD/qatomic_sparc.cpp
diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp
index d0a9eb8d29..8ea270e90a 100644
--- a/src/corelib/arch/sparc/qatomic_sparc.cpp
+++ b/src/corelib/arch/sparc/qatomic_sparc.cpp
@@ -60,7 +60,7 @@ Q_CORE_EXPORT int q_atomic_lock_int(volatile int *addr)
                 sched_yield();
                 returnValue = *addr;
             } while (returnValue == INT_MIN);
-            
+
             // try again
             returnValue = q_atomic_trylock_int(addr);
         } while (returnValue == INT_MIN);
diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
index a6d75666d5..20ba1e85d6 100644
--- a/src/corelib/codecs/qeuckrcodec.cpp
+++ b/src/corelib/codecs/qeuckrcodec.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-// Most of the cp949 code was originally written by Joon-Kyu Park, and is included 
+// Most of the cp949 code was originally written by Joon-Kyu Park, and is included
 // in Qt with the author's permission and the grateful thanks of the Qt team.
 
 /*! \class QEucKrCodec
@@ -3405,7 +3405,7 @@ QByteArray QCP949Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt
                     row = internal_code / 178;
                     column = internal_code % 178;
                 }
-                else { 
+                else {
                     // code between a1-fe
                     internal_code -= 3008;
                     row = internal_code / 84;
diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp
index 01b90fe527..60b13ac4e1 100644
--- a/src/corelib/codecs/qiconvcodec.cpp
+++ b/src/corelib/codecs/qiconvcodec.cpp
@@ -374,7 +374,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt
         delete temporaryState;
         return QString(uc, len).toLatin1();
     }
- 
+
     size_t outBytesLeft = len;
     QByteArray ba(outBytesLeft, Qt::Uninitialized);
     outBytes = ba.data();
diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
index 95ffe11f75..9513621dfe 100644
--- a/src/corelib/codecs/qjpunicode.cpp
+++ b/src/corelib/codecs/qjpunicode.cpp
@@ -10537,7 +10537,7 @@ static unsigned short const sjis208ibmvdc_unicode[] = {
 
 uint QJpUnicodeConv::sjisibmvdcToUnicode(uint h, uint l) const
 {
-    if (((rule & IBM_VDC) || (rule & Microsoft_CP932))  && IsSjisIBMVDCChar1(h)) 
+    if (((rule & IBM_VDC) || (rule & Microsoft_CP932))  && IsSjisIBMVDCChar1(h))
           return sjis208ibmvdc_unicode[((h - 0x00fa)*189 + (l-0x0040))];
     else
         return 0;
@@ -10632,9 +10632,9 @@ static unsigned short const cp932_ed_ee_unicode[] = {
 uint QJpUnicodeConv::cp932ToUnicode(uint h, uint l) const
 {
     if (rule & Microsoft_CP932) {
-        if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) 
+        if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c))
             return cp932_87_unicode[l-0x0040];
-        else if ((h == 0x00ed || h == 0x00ee)  && (l >= 0x0040 && l <= 0x00fc)) 
+        else if ((h == 0x00ed || h == 0x00ee)  && (l >= 0x0040 && l <= 0x00fc))
             return cp932_ed_ee_unicode[((h - 0x00ed)*189 + (l-0x0040))];
     }
     return 0;
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index 7d7d71ac50..59f05592be 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -501,7 +501,7 @@ namespace QT_NAMESPACE {
 //! [43]
 class MyClass : public QObject
 {
-    
+
   private:
     Q_DISABLE_COPY(MyClass)
 };
@@ -511,7 +511,7 @@ class MyClass : public QObject
 //! [44]
 class MyClass : public QObject
 {
-    
+
   private:
      MyClass(const MyClass &);
      MyClass &operator=(const MyClass &);
diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp
index de1a7cea19..92a6e77866 100644
--- a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp
@@ -84,6 +84,6 @@ forever {
         mutex.lock();
     }
     keyPressed.wakeAll();
-    mutex.unlock();          
+    mutex.unlock();
 }
 //! [3]
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
index 7e221cfaab..4f8c4c095e 100644
--- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -405,7 +405,7 @@ QString tmp = "test";
 QByteArray text = tmp.toLocal8Bit();
 char *data = new char[text.size()]
 strcpy(data, text.data());
-delete [] data; 
+delete [] data;
 //! [46]
 
 //! [47]
diff --git a/src/corelib/doc/snippets/fileinfo/main.cpp b/src/corelib/doc/snippets/fileinfo/main.cpp
index 57d7e32cb5..50acdb2550 100644
--- a/src/corelib/doc/snippets/fileinfo/main.cpp
+++ b/src/corelib/doc/snippets/fileinfo/main.cpp
@@ -54,12 +54,12 @@ int main(int argc, char *argv[])
     QFileInfo fileInfo1("~/examples/191697/.");
     QFileInfo fileInfo2("~/examples/191697/..");
     QFileInfo fileInfo3("~/examples/191697/main.cpp");
-//! [0]    
-//! [1]    
+//! [0]
+//! [1]
     QFileInfo fileInfo4(".");
     QFileInfo fileInfo5("..");
     QFileInfo fileInfo6("main.cpp");
-//! [1]    
+//! [1]
 
     qDebug() << fileInfo1.fileName();
     qDebug() << fileInfo2.fileName();
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp
index 6ee3088138..bf45a31c29 100644
--- a/src/corelib/doc/snippets/qstring/main.cpp
+++ b/src/corelib/doc/snippets/qstring/main.cpp
@@ -552,7 +552,7 @@ void Widget::replaceFunction()
     //! [86]
     QString equis = "xxxxxx";
     equis.replace("xx", "x");
-    // equis == "xxx"    
+    // equis == "xxx"
     //! [86]
 
     //! [87]
diff --git a/src/corelib/doc/snippets/sharedemployee/employee.h b/src/corelib/doc/snippets/sharedemployee/employee.h
index 8025015a2e..2df1f71c51 100644
--- a/src/corelib/doc/snippets/sharedemployee/employee.h
+++ b/src/corelib/doc/snippets/sharedemployee/employee.h
@@ -69,11 +69,11 @@ class Employee
         setName(name);
     }
 //! [2] //! [7]
-    Employee(const Employee &other) 
-          : d (other.d) 
-    { 
-    } 
-//! [7]  
+    Employee(const Employee &other)
+          : d (other.d)
+    {
+    }
+//! [7]
 //! [3]
     void setId(int id) { d->id = id; }
 //! [3] //! [4]
diff --git a/src/corelib/doc/snippets/signalmapper/filereader.cpp b/src/corelib/doc/snippets/signalmapper/filereader.cpp
index 42660b9551..cb83ea9362 100644
--- a/src/corelib/doc/snippets/signalmapper/filereader.cpp
+++ b/src/corelib/doc/snippets/signalmapper/filereader.cpp
@@ -73,7 +73,7 @@ FileReader::FileReader(QWidget *parent)
 /*
 //! [2]
     //slower due to signature normalization at runtime
-    
+
     connect(signalMapper, SIGNAL(mapped(const QString &)),
         this, SLOT(readFile(const QString &)));
 //! [2]
@@ -93,7 +93,7 @@ FileReader::FileReader(QWidget *parent)
 void FileReader::readFile(const QString &filename)
 {
     QFile file(filename);
-    
+
     if (!file.open(QIODevice::ReadOnly)) {
         QMessageBox::information(this, tr("Unable to open file"),
             file.errorString());
diff --git a/src/corelib/doc/snippets/statemachine/eventtest.cpp b/src/corelib/doc/snippets/statemachine/eventtest.cpp
index c83e92ab77..7454344680 100644
--- a/src/corelib/doc/snippets/statemachine/eventtest.cpp
+++ b/src/corelib/doc/snippets/statemachine/eventtest.cpp
@@ -55,11 +55,11 @@ protected:
             if (wrappedEvent->type() == QEvent::KeyPress) {
                 QKeyEvent *keyEvent = static_cast<QKeyEvent *>(wrappedEvent);
                 // Do your event test
-            }       
+            }
         }
         return false;
     }
-//![0]      
+//![0]
 
     void onTransition(QEvent *event)
     {
diff --git a/src/corelib/doc/snippets/statemachine/main4.cpp b/src/corelib/doc/snippets/statemachine/main4.cpp
index f1ecabd535..19b40a10b4 100644
--- a/src/corelib/doc/snippets/statemachine/main4.cpp
+++ b/src/corelib/doc/snippets/statemachine/main4.cpp
@@ -69,7 +69,7 @@ protected:
         StringEvent *se = static_cast<StringEvent*>(e);
         return (m_value == se->value);
     }
-    
+
     virtual void onTransition(QEvent *) {}
 
 private:
diff --git a/src/corelib/doc/snippets/streaming/main.cpp b/src/corelib/doc/snippets/streaming/main.cpp
index 66808a5a6b..673df075ee 100644
--- a/src/corelib/doc/snippets/streaming/main.cpp
+++ b/src/corelib/doc/snippets/streaming/main.cpp
@@ -85,12 +85,12 @@ int main(int argc, char *argv[])
     QByteArray byteArray;
     QDataStream stream(&byteArray, QIODevice::WriteOnly);
     stream << m;
-    
+
     // display
     qDebug() << m.id << m.releaseDate << m.title;
 
     Movie m2;
-    
+
     int id2;
     QString title2;
     QDate date2;
diff --git a/src/corelib/doc/snippets/timers/timers.cpp b/src/corelib/doc/snippets/timers/timers.cpp
index 4d74e7cc27..8257bf57a7 100644
--- a/src/corelib/doc/snippets/timers/timers.cpp
+++ b/src/corelib/doc/snippets/timers/timers.cpp
@@ -74,5 +74,5 @@ Foo::Foo()
 
 int main()
 {
-    
+
 }
diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc
index 1d33c14d0f..89a781da39 100644
--- a/src/corelib/doc/src/objectmodel/object.qdoc
+++ b/src/corelib/doc/src/objectmodel/object.qdoc
@@ -71,7 +71,7 @@
     \section1 Important Classes
 
     These classes form the basis of the Qt Object Model.
-    
+
     \annotatedlist objectmodel
 
     \target Identity vs Value
@@ -108,7 +108,7 @@
     at runtime that are not declared in the C++ class. If we copy a Qt
     Object, should the copy include the properties that were added to
     the original?
-    
+
     \endlist
 
     For these reasons, Qt Objects should be treated as identities, not
diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc
index 37f54621a1..721b98c0f7 100644
--- a/src/corelib/doc/src/objectmodel/properties.qdoc
+++ b/src/corelib/doc/src/objectmodel/properties.qdoc
@@ -62,7 +62,7 @@
     A property behaves like a class data member, but it has additional
     features accessible through the \l {Meta-Object System}.
 
-    \list 
+    \list
 
     \li A \c READ accessor function is required if no \c MEMBER variable was
     specified. It is for reading the property value. Ideally, a const function
@@ -130,7 +130,7 @@
     gets and sets a widget's \c USER property.
 
     \li The presence of the \c CONSTANT attibute indicates that the property
-    value is constant.  For a given object instance, the READ method of a 
+    value is constant.  For a given object instance, the READ method of a
     constant property must return the same value every time it is called.  This
     constant value may be different for different instances of the object.  A
     constant property cannot have a WRITE method or a NOTIFY signal.
@@ -272,7 +272,7 @@
     Q_DECLARE_METATYPE() macro so that their values can be stored in
     QVariant objects. This makes them suitable for use with both
     static properties declared using the Q_PROPERTY() macro in class
-    definitions and dynamic properties created at run-time. 
+    definitions and dynamic properties created at run-time.
 
     \sa Q_DECLARE_METATYPE(), QMetaType, QVariant
 
diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
index d897c4b9a7..4e285f2966 100644
--- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
+++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
@@ -365,7 +365,7 @@
     arguments can have default values. Consider QObject::destroyed():
 
     \code
-    void destroyed(QObject* = 0); 
+    void destroyed(QObject* = 0);
     \endcode
 
     When a QObject is deleted, it emits this QObject::destroyed()
@@ -434,7 +434,7 @@
     handle each signal differently.
 
     Suppose you have three push buttons that determine which file you
-    will open: "Tax File", "Accounts File", or "Report File". 
+    will open: "Tax File", "Accounts File", or "Report File".
 
     In order to open the correct file, you use QSignalMapper::setMapping() to
     map all the clicked() signals to a QSignalMapper object. Then you connect
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index a751f9af56..daf853b916 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -238,7 +238,7 @@
 // QWheelEvent
 //#define QT_NO_WHEELEVENT
 
-// 
+//
 //#define QT_NO_XMLSTREAM
 
 // Animation
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index c27463897f..43db585643 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -325,7 +325,7 @@ SeeAlso: ???
 Feature: COMBOBOX
 Description: Supports comboboxes presenting a list of options to the user.
 Section: Widgets
-Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW 
+Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW
 Name: QComboBox
 SeeAlso: ???
 
@@ -516,7 +516,7 @@ SeeAlso: ???
 Feature: WHATSTHIS
 Description: Supports displaying "What's this" help.
 Section: Widgets
-Requires: TOOLBUTTON 
+Requires: TOOLBUTTON
 Name: QWhatsThis
 SeeAlso: ???
 
@@ -636,7 +636,7 @@ SeeAlso: ???
 Feature: DIRMODEL
 Description: Supports a data model for the local filesystem.
 Section: ItemViews
-Requires: ITEMVIEWS FILESYSTEMMODEL 
+Requires: ITEMVIEWS FILESYSTEMMODEL
 Name: QDirModel
 SeeAlso: ???
 
@@ -1030,7 +1030,7 @@ SeeAlso: ???
 Feature: SYSTEMTRAYICON
 Description: Provides an icon for an application in the system tray.
 Section: Utilities
-Requires: 
+Requires:
 Name: QSystemTrayIcon
 SeeAlso: ???
 
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 233743f3ce..c45ad12e99 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -470,7 +470,7 @@ typedef qptrdiff qintptr;
 #  else
 #    define QT_ENSURE_STACK_ALIGNED_FOR_SSE
 #  endif
-#  define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE 
+#  define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE
 #endif
 
 typedef int QNoImplicitBoolCast;
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 8f788ac355..5f5e9a8b72 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -743,7 +743,7 @@ QDataStream &QDataStream::operator>>(bool &i)
 */
 
 QDataStream &QDataStream::operator>>(float &f)
-{    
+{
     if (version() >= QDataStream::Qt_4_6
         && floatingPointPrecision() == QDataStream::DoublePrecision) {
         double d;
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index fa0711461c..6ac6a3fbd9 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -207,7 +207,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths,
                         this, SIGNAL(fileChanged(QString,bool)));
                 connect(thread, SIGNAL(directoryChanged(QString,bool)),
                         this, SIGNAL(directoryChanged(QString,bool)));
-                
+
                 thread->msg = '@';
                 thread->start();
                 threads.append(thread);
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 4df9c6b911..c8a3f86137 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -1372,7 +1372,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize)
     \since 4.5
 
     \overload
- 
+
     Writes data from a zero-terminated string of 8-bit characters to the
     device. Returns the number of bytes that were actually written, or
     -1 if an error occurred. This is equivalent to
diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index 3fdaa41206..d632ac70be 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -109,7 +109,7 @@ public:
 
     virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames);
     virtual Iterator *endEntryList();
-    
+
     bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
     bool supportsExtension(Extension extension) const;
 };
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index d7b100ba3c..a0904fea24 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -1074,7 +1074,7 @@ static void initDefaultPaths(QMutexLocker *locker)
     QString systemPath;
 
     locker->unlock();
-	
+
     /*
        QLibraryInfo::location() uses QSettings, so in order to
        avoid a dead-lock, we can't hold the global mutex while
@@ -3198,7 +3198,7 @@ bool QSettings::isWritable() const
 }
 
 /*!
-  
+
   Sets the value of setting \a key to \a value. If the \a key already
   exists, the previous value is overwritten.
 
@@ -3465,7 +3465,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path)
     \typedef QSettings::SettingsMap
 
     Typedef for QMap<QString, QVariant>.
-	
+
     \sa registerFormat()
 */
 
@@ -3477,8 +3477,8 @@ void QSettings::setPath(Format format, Scope scope, const QString &path)
     \snippet code/src_corelib_io_qsettings.cpp 27
 
     \c ReadFunc is used in \c registerFormat() as a pointer to a function
-    that reads a set of key/value pairs. \c ReadFunc should read all the 
-    options in one pass, and return all the settings in the \c SettingsMap 
+    that reads a set of key/value pairs. \c ReadFunc should read all the
+    options in one pass, and return all the settings in the \c SettingsMap
     container, which is initially empty.
 
     \sa WriteFunc, registerFormat()
@@ -3491,7 +3491,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path)
 
     \snippet code/src_corelib_io_qsettings.cpp 28
 
-    \c WriteFunc is used in \c registerFormat() as a pointer to a function 
+    \c WriteFunc is used in \c registerFormat() as a pointer to a function
     that writes a set of key/value pairs. \c WriteFunc is only called once,
     so you need to output the settings in one go.
 
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index bd127e621e..9ce14f1851 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -569,7 +569,7 @@ QWinSettingsPrivate::~QWinSettingsPrivate()
 {
     if (deleteWriteHandleOnExit && writeHandle() != 0) {
 #if defined(Q_OS_WINCE)
-        remove(regList.at(0).key()); 
+        remove(regList.at(0).key());
 #else
         QString emptyKey;
         DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(emptyKey.utf16()));
diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h
index bc44a21cb8..f40807a0d9 100644
--- a/src/corelib/kernel/qfunctions_nacl.h
+++ b/src/corelib/kernel/qfunctions_nacl.h
@@ -67,7 +67,7 @@ int pthread_cancel(pthread_t thread);
 
 int pthread_attr_setinheritsched(pthread_attr_t *attr,
     int inheritsched);
-int pthread_attr_getinheritsched(const pthread_attr_t *attr, 
+int pthread_attr_getinheritsched(const pthread_attr_t *attr,
     int *inheritsched);
 
 // event dispatcher, select
diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc
index 448b167662..06d8db9277 100644
--- a/src/corelib/kernel/qmath.qdoc
+++ b/src/corelib/kernel/qmath.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \headerfile <QtCore/qmath.h>
     \title Math Functions
     \ingroup funclists
@@ -35,11 +35,11 @@
 
 /*!
     \fn int qCeil(qreal v)
-    Return the ceiling of the value \a v. 
+    Return the ceiling of the value \a v.
 
     The ceiling is the smallest integer that is not less than \a v.
     For example, if \a v is 41.2, then the ceiling is 42.
-    
+
     \relates <QtCore/qmath.h>
     \sa qFloor()
 */
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 14d96e96fd..4399349352 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1001,7 +1001,7 @@ int QMetaObject::indexOfProperty(const char *name) const
 
     Q_ASSERT(priv(this->d.data)->revision >= 3);
     if (priv(this->d.data)->flags & DynamicMetaObject) {
-        QAbstractDynamicMetaObject *me = 
+        QAbstractDynamicMetaObject *me =
             const_cast<QAbstractDynamicMetaObject *>(static_cast<const QAbstractDynamicMetaObject *>(this));
 
         return me->createProperty(name, 0);
@@ -2041,8 +2041,8 @@ QMetaMethod QMetaMethod::fromSignalImpl(const QMetaObject *metaObject, void **si
 
     \snippet code/src_corelib_kernel_qmetaobject.cpp 8
 
-    QMetaObject::normalizedSignature() is used here to ensure that the format 
-    of the signature is what invoke() expects.  E.g. extra whitespace is 
+    QMetaObject::normalizedSignature() is used here to ensure that the format
+    of the signature is what invoke() expects.  E.g. extra whitespace is
     removed.
 
     If the "compute" slot does not take exactly one QString, one int
@@ -2970,7 +2970,7 @@ QMetaMethod QMetaProperty::notifySignal() const
 {
     int id = notifySignalIndex();
     if (id != -1)
-        return mobj->method(id); 
+        return mobj->method(id);
     else
         return QMetaMethod();
 }
@@ -2978,7 +2978,7 @@ QMetaMethod QMetaProperty::notifySignal() const
 /*!
     \since 4.6
 
-    Returns the index of the property change notifying signal if one was 
+    Returns the index of the property change notifying signal if one was
     specified, otherwise returns -1.
 
     \sa hasNotifySignal()
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 3e578b36d7..a60deefe90 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -927,7 +927,7 @@ QObjectPrivate::Connection::~Connection()
     \relates QObject
 
     Returns the given \a object cast to type T if the object is of type
-    T (or of a subclass); otherwise returns 0.  If \a object is 0 then 
+    T (or of a subclass); otherwise returns 0.  If \a object is 0 then
     it will also return 0.
 
     The class T must inherit (directly or indirectly) QObject and be
@@ -3089,8 +3089,8 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index,
 /*!
     \internal
 
-Disconnect a single signal connection.  If QMetaObject::connect() has been called 
-multiple times for the same sender, signal_index, receiver and method_index only 
+Disconnect a single signal connection.  If QMetaObject::connect() has been called
+multiple times for the same sender, signal_index, receiver and method_index only
 one of these connections will be removed.
  */
 bool QMetaObject::disconnectOne(const QObject *sender, int signal_index,
@@ -3368,7 +3368,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i
         return;
 
     if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted)
-        QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, 
+        QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender,
                                                 signal_index, argv);
 
     void *empty_argv[] = { 0 };
diff --git a/src/corelib/kernel/qsystemerror_p.h b/src/corelib/kernel/qsystemerror_p.h
index 94bfb5deb4..4b46011129 100644
--- a/src/corelib/kernel/qsystemerror_p.h
+++ b/src/corelib/kernel/qsystemerror_p.h
@@ -66,14 +66,14 @@ public:
         StandardLibraryError,
         NativeError
     };
-    
+
     inline QSystemError(int error, ErrorScope scope);
     inline QSystemError();
-    
+
     QString toString();
     inline ErrorScope scope();
     inline int error();
-    
+
     //data members
     int errorCode;
     ErrorScope errorScope;
diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp
index 6b064c1d52..835a9fde5b 100644
--- a/src/corelib/kernel/qsystemsemaphore_win.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_win.cpp
@@ -46,7 +46,7 @@
 #include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE
-        
+
 #ifndef QT_NO_SYSTEMSEMAPHORE
 
 QSystemSemaphorePrivate::QSystemSemaphorePrivate() :
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index e7940e0039..04b9d92f55 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -150,7 +150,7 @@ inline void v_construct(QVariant::Private *x, const T &t)
 template <class T>
 inline void v_clear(QVariant::Private *d, T* = 0)
 {
-    
+
     if (!QVariantIntegrator<T>::CanUseInternalSpace) {
         //now we need to cast
         //because QVariant::PrivateShared doesn't have a virtual destructor
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index 4ccf449ae2..4de83c62ee 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -279,7 +279,7 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto
     The field layouts for the DCE versions listed in the table above
     are specified in the \l{http://www.ietf.org/rfc/rfc4122.txt}
     {Network Working Group UUID Specification}.
-    
+
     Most platforms provide a tool for generating new UUIDs, e.g. \c
     uuidgen and \c guidgen. You can also use createUuid().  UUIDs
     generated by createUuid() are of the random type.  Their
@@ -534,23 +534,23 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes)
     \header
     \li Field #
     \li Source
-    
+
     \row
     \li 1
     \li data1
-    
+
     \row
     \li 2
     \li data2
-    
+
     \row
     \li 3
     \li data3
-    
+
     \row
     \li 4
     \li data4[0] .. data4[1]
-    
+
     \row
     \li 5
     \li data4[2] .. data4[7]
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index dae3cb1988..a661d105cf 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -185,7 +185,7 @@ public:
     void unregisterTransition(QAbstractTransition *transition);
     void unregisterAllTransitions();
     void handleTransitionSignal(QObject *sender, int signalIndex,
-                                void **args);    
+                                void **args);
 
     void postInternalEvent(QEvent *e);
     void postExternalEvent(QEvent *e);
@@ -195,7 +195,7 @@ public:
     bool isExternalEventQueueEmpty();
     void processEvents(EventProcessingMode processingMode);
     void cancelAllDelayedEvents();
-    
+
 #ifndef QT_NO_PROPERTIES
     typedef QPair<QPointer<QObject>, QByteArray> RestorableId;
     QHash<QAbstractState*, QHash<RestorableId, QVariant> > registeredRestorablesForState;
@@ -235,7 +235,7 @@ public:
     bool animated;
 
     QPair<QList<QAbstractAnimation*>, QList<QAbstractAnimation*> >
-        initializeAnimation(QAbstractAnimation *abstractAnimation, 
+        initializeAnimation(QAbstractAnimation *abstractAnimation,
                             const QPropertyAssignment &prop);
 
     QHash<QAbstractState*, QList<QAbstractAnimation*> > animationsForState;
@@ -274,7 +274,7 @@ public:
     QHash<int, DelayedEvent> delayedEvents;
     QHash<int, int> timerIdToDelayedEventId;
     QMutex delayedEventsMutex;
-  
+
     typedef QEvent* (*f_cloneEvent)(QEvent*);
     struct Handler {
         f_cloneEvent cloneEvent;
diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp
index 1c83f23df0..11623f80dc 100644
--- a/src/corelib/thread/qatomic.cpp
+++ b/src/corelib/thread/qatomic.cpp
@@ -49,7 +49,7 @@
 
     For atomic operations on pointers, see the QAtomicPointer class.
 
-    An \e atomic operation is a complex operation that completes without interruption. 
+    An \e atomic operation is a complex operation that completes without interruption.
     The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store,
     and fetch-and-add for integers.
 
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp
index 263f7d19fe..0c17399d33 100644
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-/*! 
+/*!
     \class QException
     \inmodule QtCore
     \brief The QException class provides a base class for exceptions that can transferred across threads.
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
     \snippet code/src_corelib_thread_qexception.cpp 3
 */
 
-/*! 
+/*!
     \class QUnhandledException
     \inmodule QtCore
 
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc
index 4ab28e81b2..421e683c4a 100644
--- a/src/corelib/thread/qfuture.qdoc
+++ b/src/corelib/thread/qfuture.qdoc
@@ -58,7 +58,7 @@
     use the isResultReadyAt() function to determine if a result is ready or
     not. For QFuture objects that report more than one result, the
     resultCount() function returns the number of continuous results. This
-    means that it is always safe to iterate through the results from 0 to 
+    means that it is always safe to iterate through the results from 0 to
     resultCount().
 
     QFuture provides a \l{Java-style iterators}{Java-style iterator}
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index f5590d95f8..0f7d04a7c5 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -288,7 +288,7 @@ void QFutureInterfaceBase::waitForResult(int resultIndex)
         return;
     lock.unlock();
 
-    // To avoid deadlocks and reduce the number of threads used, try to 
+    // To avoid deadlocks and reduce the number of threads used, try to
     // run the runnable in the current thread.
     QThreadPool::globalInstance()->d_func()->stealRunnable(d->runnable);
 
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h
index d2d58a9332..e0a59697a1 100644
--- a/src/corelib/thread/qfutureinterface.h
+++ b/src/corelib/thread/qfutureinterface.h
@@ -234,7 +234,7 @@ inline void QFutureInterface<T>::reportResults(const QVector<T> &_results, int b
         this->reportResultsReady(resultCountBefore, store.count());
     } else {
         const int insertIndex = store.addResults(beginIndex, &_results, count);
-        this->reportResultsReady(insertIndex, insertIndex + _results.count());    
+        this->reportResultsReady(insertIndex, insertIndex + _results.count());
     }
 }
 
diff --git a/src/corelib/thread/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h
index 426bb42b0d..39dbfc52a8 100644
--- a/src/corelib/thread/qfuturesynchronizer.h
+++ b/src/corelib/thread/qfuturesynchronizer.h
@@ -80,7 +80,7 @@ public:
                  m_futures[i].cancel();
             }
         }
-        
+
         for (int i = 0; i < m_futures.count(); ++i) {
              m_futures[i].waitForFinished();
          }
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp
index b6bb22b314..0de826fddf 100644
--- a/src/corelib/thread/qreadwritelock.cpp
+++ b/src/corelib/thread/qreadwritelock.cpp
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     \sa QReadLocker, QWriteLocker, QMutex, QSemaphore
 */
 
-/*! 
+/*!
     \enum QReadWriteLock::RecursionMode
     \since 4.4
 
diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp
index 940fd45027..65c2437064 100644
--- a/src/corelib/thread/qresultstore.cpp
+++ b/src/corelib/thread/qresultstore.cpp
@@ -97,7 +97,7 @@ bool ResultIteratorBase::canIncrementVectorIndex() const
     return (m_vectorIndex + 1 < mapIterator.value().m_count);
 }
 
-ResultStoreBase::ResultStoreBase() 
+ResultStoreBase::ResultStoreBase()
     : insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { }
 
 void ResultStoreBase::setFilterMode(bool enable)
@@ -148,7 +148,7 @@ void ResultStoreBase::syncPendingResults()
     // check if we can insert any of the pending results:
     QMap<int, ResultItem>::iterator it = pendingResults.begin();
     while (it != pendingResults.end()) {
-        int index = it.key(); 
+        int index = it.key();
         if (index != resultCount + filteredResults)
             break;
 
@@ -165,7 +165,7 @@ int ResultStoreBase::addResult(int index, const void *result)
     return insertResultItem(index, resultItem);
 }
 
-int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) 
+int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount)
 {
     if (m_filterMode == false || vectorSize == totalCount) {
         ResultItem resultItem(results, vectorSize);
@@ -218,7 +218,7 @@ ResultIteratorBase ResultStoreBase::resultAt(int index) const
     }
 
     const int vectorIndex = index - it.key();
-    
+
     if (vectorIndex >= it.value().count())
         return ResultIteratorBase(m_results.end());
     else if (it.value().isVector() == false && vectorIndex != 0)
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index c14146656a..11ce23936d 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -148,7 +148,7 @@ protected:
     bool m_filterMode;
     QMap<int, ResultItem> pendingResults;
     int filteredResults;
-    
+
 };
 
 template <typename T>
diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp
index eed716af37..e271582b9b 100644
--- a/src/corelib/thread/qrunnable.cpp
+++ b/src/corelib/thread/qrunnable.cpp
@@ -57,7 +57,7 @@
     change the auto-deletion flag.
 
     QThreadPool supports executing the same QRunnable more than once
-    by calling QThreadPool::tryStart(this) from within the run() function. 
+    by calling QThreadPool::tryStart(this) from within the run() function.
     If autoDelete is enabled the QRunnable will be deleted when
     the last thread exits the run function. Calling QThreadPool::start()
     multiple times with the same QRunnable when autoDelete is enabled
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 79199c97e0..dd4d4e74ae 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -524,9 +524,9 @@ int QThread::exec()
 
     Note that unlike the C library function of the same name, this
     function \e does return to the caller -- it is event processing
-    that stops. 
-    
-    No QEventLoops will be started anymore in this thread  until 
+    that stops.
+
+    No QEventLoops will be started anymore in this thread  until
     QThread::exec() has been called again. If the eventloop in QThread::exec()
     is not running then the next call to QThread::exec() will also return
     immediately.
diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
index 2b099706ff..1616fb9fab 100644
--- a/src/corelib/thread/qthreadpool.cpp
+++ b/src/corelib/thread/qthreadpool.cpp
@@ -133,7 +133,7 @@ void QThreadPoolThread::run()
             // wait for work, exiting after the expiry timeout is reached
             expired = !manager->runnableReady.wait(locker.mutex(), manager->expiryTimeout);
             ++manager->activeThreads;
-    
+
             if (expired)
                 --manager->waitingThreads;
         }
@@ -223,7 +223,7 @@ void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority)
 
 int QThreadPoolPrivate::activeThreadCount() const
 {
-    // To improve scalability this function is called without holding 
+    // To improve scalability this function is called without holding
     // the mutex lock -- keep it thread-safe.
     return (allThreads.count()
             - expiredThreads.count()
@@ -301,7 +301,7 @@ bool QThreadPoolPrivate::waitForDone(int msecs)
         QElapsedTimer timer;
         timer.start();
         int t;
-        while (!(queue.isEmpty() && activeThreads == 0) && 
+        while (!(queue.isEmpty() && activeThreads == 0) &&
                ((t = msecs - timer.elapsed()) > 0))
             noActiveThreads.wait(locker.mutex(), t);
     }
@@ -367,11 +367,11 @@ void QThreadPoolPrivate::stealRunnable(QRunnable *runnable)
 
     \snippet code/src_corelib_concurrent_qthreadpool.cpp 0
 
-    QThreadPool deletes the QRunnable automatically by default. Use 
+    QThreadPool deletes the QRunnable automatically by default. Use
     QRunnable::setAutoDelete() to change the auto-deletion flag.
 
     QThreadPool supports executing the same QRunnable more than once
-    by calling tryStart(this) from within QRunnable::run(). 
+    by calling tryStart(this) from within QRunnable::run().
     If autoDelete is enabled the QRunnable will be deleted when
     the last thread exits the run function. Calling start()
     multiple times with the same QRunnable when autoDelete is enabled
@@ -595,8 +595,8 @@ void QThreadPool::releaseThread()
 }
 
 /*!
-    Waits up to \a msecs milliseconds for all threads to exit and removes all 
-    threads from the thread pool. Returns true if all threads were removed; 
+    Waits up to \a msecs milliseconds for all threads to exit and removes all
+    threads from the thread pool. Returns true if all threads were removed;
     otherwise it returns false. If \a msecs is -1 (the default), the timeout
     is ignored (waits for the last thread to exit).
 */
diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc
index b4558722cb..cc544af868 100644
--- a/src/corelib/tools/qalgorithms.qdoc
+++ b/src/corelib/tools/qalgorithms.qdoc
@@ -70,7 +70,7 @@
     \snippet code/doc_src_qalgorithms.cpp 1
 
     Different algorithms can have different requirements for the
-    iterators they accept. For example, qFill() accepts two 
+    iterators they accept. For example, qFill() accepts two
     \l {forward iterators}. The iterator types required are specified
     for each algorithm. If an iterator of the wrong type is passed (for
     example, if QList::ConstIterator is passed as an \l {output
@@ -369,7 +369,7 @@ of \a value in the variable passed as a reference in argument \a n.
     This is the same as qSort(\a{container}.begin(), \a{container}.end());
 */
 
-/*! 
+/*!
     \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end)
     \relates <QtAlgorithms>
 
@@ -393,7 +393,7 @@ of \a value in the variable passed as a reference in argument \a n.
     \sa qSort(), {random access iterators}
 */
 
-/*! 
+/*!
     \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end, LessThan lessThan)
     \relates <QtAlgorithms>
 
@@ -406,7 +406,7 @@ of \a value in the variable passed as a reference in argument \a n.
     in case-insensitive alphabetical order:
 
     \snippet code/doc_src_qalgorithms.cpp 16
-    
+
     Note that earlier versions of Qt allowed using a lessThan function that took its
     arguments by non-const reference. From 4.3 and on this is no longer possible,
     the arguments has to be passed by const reference or value.
@@ -423,7 +423,7 @@ of \a value in the variable passed as a reference in argument \a n.
     property is often useful when sorting user-visible data.
 */
 
-/*! 
+/*!
     \fn void qStableSort(Container &container)
     \relates <QtAlgorithms>
 
@@ -470,7 +470,7 @@ of \a value in the variable passed as a reference in argument \a n.
     specified by the \a lessThan object.
 */
 
-/*! 
+/*!
     \fn void qLowerBound(const Container &container, const T &value)
     \relates <QtAlgorithms>
 
@@ -520,7 +520,7 @@ of \a value in the variable passed as a reference in argument \a n.
     specified by the \a lessThan object.
 */
 
-/*! 
+/*!
     \fn void qUpperBound(const Container &container, const T &value)
     \relates <QtAlgorithms>
 
@@ -568,7 +568,7 @@ of \a value in the variable passed as a reference in argument \a n.
     specified by the \a lessThan object.
 */
 
-/*! 
+/*!
     \fn void qBinaryFind(const Container &container, const T &value)
     \relates <QtAlgorithms>
 
@@ -578,7 +578,7 @@ of \a value in the variable passed as a reference in argument \a n.
 */
 
 
-/*! 
+/*!
     \fn void qDeleteAll(ForwardIterator begin, ForwardIterator end)
     \relates <QtAlgorithms>
 
@@ -601,7 +601,7 @@ of \a value in the variable passed as a reference in argument \a n.
     \sa {forward iterators}
 */
 
-/*! 
+/*!
     \fn void qDeleteAll(const Container &c)
     \relates <QtAlgorithms>
 
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index 66ae7d21c2..2b459b2b1b 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -173,7 +173,7 @@ int QBitArray::count(bool on) const
     while (len >= 24) {
         quint32 v = quint32(bits[0]) | (quint32(bits[1]) << 8) | (quint32(bits[2]) << 16);
         quint32 c =  ((v & 0xfff) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f;
-        c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f;    
+        c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f;
         len -= 24;
         bits += 3;
         numBits += int(c);
@@ -467,7 +467,7 @@ QBitArray &QBitArray::operator&=(const QBitArray &other)
     resize(qMax(size(), other.size()));
     uchar *a1 = reinterpret_cast<uchar*>(d.data()) + 1;
     const uchar *a2 = reinterpret_cast<const uchar*>(other.d.constData()) + 1;
-    int n = other.d.size() -1 ; 
+    int n = other.d.size() -1 ;
     int p = d.size() - 1 - n;
     while (n-- > 0)
         *a1++ &= *a2++;
@@ -496,7 +496,7 @@ QBitArray &QBitArray::operator|=(const QBitArray &other)
     resize(qMax(size(), other.size()));
     uchar *a1 = reinterpret_cast<uchar*>(d.data()) + 1;
     const uchar *a2 = reinterpret_cast<const uchar *>(other.d.constData()) + 1;
-    int n = other.d.size() - 1;   
+    int n = other.d.size() - 1;
     while (n-- > 0)
         *a1++ |= *a2++;
     return *this;
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 950d291986..dc3f5f3be9 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -397,7 +397,7 @@ static const quint16 crc_tbl[16] = {
     0xc60c, 0xd68d, 0xe70e, 0xf78f
 };
 
-/*! 
+/*!
     \relates QByteArray
 
     Returns the CRC-16 checksum of the first \a len bytes of \a data.
@@ -422,7 +422,7 @@ quint16 qChecksum(const char *data, uint len)
     return ~crc & 0xffff;
 }
 
-/*!     
+/*!
     \fn QByteArray qCompress(const QByteArray& data, int compressionLevel)
 
     \relates QByteArray
@@ -1370,7 +1370,7 @@ QByteArray::QByteArray(int size, char ch)
 }
 
 /*!
-    \internal 
+    \internal
 
     Constructs a byte array of size \a size with uninitialized contents.
 */
@@ -1904,7 +1904,7 @@ QByteArray &QByteArray::replace(const QByteArray &before, const QByteArray &afte
     QByteArray aft = after;
     if (after.d == d)
         aft.detach();
-    
+
     return replace(before.constData(), before.size(), aft.constData(), aft.size());
 }
 
@@ -1921,7 +1921,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after)
     QByteArray aft = after;
     if (after.d == d)
         aft.detach();
-    
+
     return replace(c, qstrlen(c), aft.constData(), aft.size());
 }
 
@@ -1954,7 +1954,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
         memcpy(copy, before, bsize);
         b = copy;
     }
-    
+
     QByteArrayMatcher matcher(before, bsize);
     int index = 0;
     int len = d->size;
@@ -2044,8 +2044,8 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after
         ::free((char *)a);
     if (b != before)
         ::free((char *)b);
-    
-    
+
+
     return *this;
 }
 
@@ -2274,7 +2274,7 @@ int QByteArray::indexOf(const char *c, int from) const
     const int ol = qstrlen(c);
     if (ol == 1)
         return indexOf(*c, from);
-    
+
     const int l = d->size;
     if (from > d->size || ol + from > l)
         return -1;
@@ -3580,7 +3580,7 @@ QByteArray QByteArray::toBase64() const
     return tmp;
 }
 
-/*! 
+/*!
     \fn QByteArray &QByteArray::setNum(int n, int base)
 
     Sets the byte array to the printed value of \a n in base \a base (10
@@ -3597,21 +3597,21 @@ QByteArray QByteArray::toBase64() const
     \sa number(), toInt()
 */
 
-/*! 
+/*!
     \fn QByteArray &QByteArray::setNum(uint n, int base)
     \overload
 
     \sa toUInt()
 */
 
-/*! 
+/*!
     \fn QByteArray &QByteArray::setNum(short n, int base)
     \overload
 
     \sa toShort()
 */
 
-/*! 
+/*!
     \fn QByteArray &QByteArray::setNum(ushort n, int base)
     \overload
 
@@ -3677,7 +3677,7 @@ QByteArray &QByteArray::setNum(qulonglong n, int base)
     return *this;
 }
 
-/*! 
+/*!
     \overload
 
     Sets the byte array to the printed value of \a n, formatted in format
@@ -3736,7 +3736,7 @@ QByteArray &QByteArray::setNum(double n, char f, int prec)
     return *this;
 }
 
-/*! 
+/*!
     \fn QByteArray &QByteArray::setNum(float n, char f, int prec)
     \overload
 
@@ -3806,7 +3806,7 @@ QByteArray QByteArray::number(qulonglong n, int base)
     return s;
 }
 
-/*! 
+/*!
     \overload
 
     Returns a byte array that contains the printed value of \a n,
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index bfef234ae4..b92c4d3fe9 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -313,8 +313,8 @@ MyRecord record(int row) const
 
     In most cases it is better to use either at() or insert().
 
-    \note This non-const overload of operator[] requires QContiguousCache 
-    to make a deep copy. Use at() for read-only access to a non-const 
+    \note This non-const overload of operator[] requires QContiguousCache
+    to make a deep copy. Use at() for read-only access to a non-const
     QContiguousCache.
 
     \sa insert(), at()
diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index fdf2d1a620..32f5f0b33a 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -308,7 +308,7 @@ void QCryptographicHash::addData(const char *data, int length)
         sha3Update(&d->sha3Context, reinterpret_cast<const BitSequence *>(data), length*8);
         break;
 #endif
-    }    
+    }
     d->result.clear();
 }
 
@@ -350,7 +350,7 @@ bool QCryptographicHash::addData(QIODevice* device)
 */
 QByteArray QCryptographicHash::result() const
 {
-    if (!d->result.isEmpty()) 
+    if (!d->result.isEmpty())
         return d->result;
 
     switch (d->method) {
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index b8cd076cb6..ed756cbeb6 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -574,7 +574,7 @@ void QHashData::checkSanity()
     \fn uint qHash(const QPair<T1, T2> &key, uint seed = 0)
     \since 5.0
     \relates QHash
-    
+
     Returns the hash value for the \a key, using \a seed to seed the calculation.
 
     Types \c T1 and \c T2 must be supported by qHash().
diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc
index 798d25e050..25914967a9 100644
--- a/src/corelib/tools/qiterator.qdoc
+++ b/src/corelib/tools/qiterator.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \class QListIterator
     \inmodule QtCore
 
@@ -78,7 +78,7 @@
     \sa QMutableListIterator, QList::const_iterator
 */
 
-/*! 
+/*!
     \class QLinkedListIterator
     \inmodule QtCore
 
@@ -126,7 +126,7 @@
     \sa QMutableLinkedListIterator, QLinkedList::const_iterator
 */
 
-/*! 
+/*!
     \class QVectorIterator
     \inmodule QtCore
     \brief The QVectorIterator class provides a Java-style const iterator for QVector and QStack.
@@ -178,7 +178,7 @@
     \sa QMutableVectorIterator, QVector::const_iterator
 */
 
-/*! 
+/*!
     \class QSetIterator
     \inmodule QtCore
     \brief The QSetIterator class provides a Java-style const iterator for QSet.
@@ -225,7 +225,7 @@
     \sa QMutableSetIterator, QSet::const_iterator
 */
 
-/*! 
+/*!
     \class QMutableListIterator
     \inmodule QtCore
 
@@ -291,7 +291,7 @@
     \sa QListIterator, QList::iterator
 */
 
-/*! 
+/*!
     \class QMutableLinkedListIterator
     \inmodule QtCore
 
@@ -352,7 +352,7 @@
     \sa QLinkedListIterator, QLinkedList::iterator
 */
 
-/*! 
+/*!
     \class QMutableVectorIterator
     \inmodule QtCore
 
@@ -418,7 +418,7 @@
     \sa QVectorIterator, QVector::iterator
 */
 
-/*! 
+/*!
     \class QMutableSetIterator
     \inmodule QtCore
     \since 4.2
@@ -869,7 +869,7 @@
     \sa remove(), setValue()
 */
 
-/*! 
+/*!
     \class QMapIterator
     \inmodule QtCore
 
@@ -921,7 +921,7 @@
     \sa QMutableMapIterator, QMap::const_iterator
 */
 
-/*! 
+/*!
     \class QHashIterator
     \inmodule QtCore
 
@@ -973,7 +973,7 @@
     \sa QMutableHashIterator, QHash::const_iterator
 */
 
-/*! 
+/*!
     \class QMutableMapIterator
     \inmodule QtCore
 
@@ -1038,7 +1038,7 @@
     \sa QMapIterator, QMap::iterator
 */
 
-/*! 
+/*!
     \class QMutableHashIterator
     \inmodule QtCore
 
diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp
index 5d8368e930..3fb958fae6 100644
--- a/src/corelib/tools/qline.cpp
+++ b/src/corelib/tools/qline.cpp
@@ -374,7 +374,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
     \value UnboundedIntersection The two lines intersect, but not
     within the range defined by their lengths. This will be the case
-    if the lines are not parallel. 
+    if the lines are not parallel.
 
     intersect() will also return this value if the intersect point is
     within the start and end point of only one of the lines.
@@ -499,9 +499,9 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
 
     Sets the length of the line to the given \a length. QLineF will
     move the end point - p2() - of the line to give the line its new length.
-    
+
     If the line is a null line, the length will remain zero regardless
-    of the length specified. 
+    of the length specified.
 
     \sa length(), isNull()
 */
diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp
index 6e7b541110..2cdc3f3f03 100644
--- a/src/corelib/tools/qmargins.cpp
+++ b/src/corelib/tools/qmargins.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \ingroup painting
     \since 4.6
 
-    \brief The QMargins class defines the four margins of a rectangle. 
+    \brief The QMargins class defines the four margins of a rectangle.
 
     QMargin defines a set of four margins; left, top, right and bottom,
     that describe the size of the borders surrounding a rectangle.
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc
index 55353dc258..b0caf1aaf0 100644
--- a/src/corelib/tools/qpair.qdoc
+++ b/src/corelib/tools/qpair.qdoc
@@ -31,7 +31,7 @@
     \brief The QPair class is a template class that stores a pair of items.
 
     \ingroup tools
-    
+
     QPair\<T1, T2\> can be used in your application if the STL \c
     pair type is not available. It stores one value of type T1 and
     one value of type T2. It can be used as a return value for a
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index cbb3580024..83e87ff637 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -298,7 +298,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from,
     Square brackets mean match any character contained in the square
     brackets. The character set abbreviations described above can
     appear in a character set in square brackets. Except for the
-    character set abbreviations and the following two exceptions, 
+    character set abbreviations and the following two exceptions,
     characters do not have special meanings in square brackets.
 
     \table
diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h
index 9c952fea21..b17c6d2f40 100644
--- a/src/corelib/tools/qringbuffer_p.h
+++ b/src/corelib/tools/qringbuffer_p.h
@@ -375,7 +375,7 @@ public:
             --tailBuffer;
         }
         bufferSize -= qba.length();
-        return qba;        
+        return qba;
     }
 
     // append a new buffer to the end
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index cd90b4949b..c1351943e1 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -130,7 +130,7 @@
     \fn QSet<T> &QSet::operator=(const QSet<T> &other)
 
     Assigns the \a other set to this set and returns a reference to
-    this set.  
+    this set.
 */
 
 /*!
@@ -306,7 +306,7 @@
 
     Returns a non-const iterator positioned at the item \a value in
     the set. If the set contains no item \a value, the function
-    returns end(). 
+    returns end().
 */
 
 /*! \fn QSet::const_iterator QSet::constFind(const T &value) const
@@ -351,7 +351,7 @@
     \overload
 
     Returns a non-const \l{STL-style iterators}{STL-style iterator} positioned at the first
-    item in the set.  
+    item in the set.
 */
 
 /*! \fn QSet::const_iterator QSet::cbegin() const
@@ -496,7 +496,7 @@
 /*!
     \fn QSet<T> &QSet::subtract(const QSet<T> &other)
 
-    Removes all items from  this set that are contained in the 
+    Removes all items from  this set that are contained in the
     \a other set. Returns a reference to this set.
 
     \sa operator-=(), unite(), intersect()
@@ -506,7 +506,7 @@
     \fn bool QSet::empty() const
 
     Returns true if the set is empty. This function is provided
-    for STL compatibility. It is equivalent to isEmpty().  
+    for STL compatibility. It is equivalent to isEmpty().
 */
 
 /*!
@@ -529,7 +529,7 @@
 /*!
     \fn QSet<T> &QSet::operator-=(const T &value)
 
-    Removes the occurrence of item \a value from the set, if 
+    Removes the occurrence of item \a value from the set, if
     it is found, and returns a reference to the set. If the
     \a value is not contained the set, nothing is removed.
 
@@ -559,7 +559,7 @@
     \overload
 
     Same as intersect(\e{other}), if we consider \e{other} to be a set
-    that contains the singleton \a value.  
+    that contains the singleton \a value.
 */
 
 
@@ -575,7 +575,7 @@
     \fn QSet<T> QSet::operator|(const QSet<T> &other) const
     \fn QSet<T> QSet::operator+(const QSet<T> &other) const
 
-    Returns a new QSet that is the union of this set and the 
+    Returns a new QSet that is the union of this set and the
     \a other set.
 
     \sa unite(), operator|=(), operator&(), operator-()
@@ -622,7 +622,7 @@
     iterators are slightly faster, and can improve code readability.
 
     QSet\<T\>::iterator allows you to iterate over a QSet\<T\> and
-    modify it as you go (using QSet::erase()). However, 
+    modify it as you go (using QSet::erase()). However,
 
     The default QSet::iterator constructor creates an uninitialized
     iterator. You must initialize it using a function like
@@ -701,7 +701,7 @@
     \sa QSet::begin(), QSet::end()
 */
 
-/*! 
+/*!
     \fn QSet::iterator::iterator(typename Hash::iterator i)
     \fn QSet::const_iterator::const_iterator(typename Hash::const_iterator i)
 
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 8205560781..cee0c1d450 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-/*! 
+/*!
     \class QSharedData
     \inmodule QtCore
     \brief The QSharedData class is a base class for shared data objects.
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     \a other is ignored.
 */
 
-/*! 
+/*!
     \class QSharedDataPointer
     \inmodule QtCore
     \brief The QSharedDataPointer class represents a pointer to an implicitly shared object.
@@ -395,7 +395,7 @@ QT_BEGIN_NAMESPACE
     return the proper polymorphic type.
 */
 
-/*! 
+/*!
     \class QExplicitlySharedDataPointer
     \inmodule QtCore
     \brief The QExplicitlySharedDataPointer class represents a pointer to an explicitly shared object.
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp
index 5e8aed579d..eb861b7289 100644
--- a/src/corelib/tools/qtextboundaryfinder.cpp
+++ b/src/corelib/tools/qtextboundaryfinder.cpp
@@ -84,7 +84,7 @@ static void init(QTextBoundaryFinder::BoundaryType type, const QChar *chars, int
     QUnicodeTools::initCharAttributes(string, length, scriptItems.data(), scriptItems.count(), attributes, options);
 }
 
-/*! 
+/*!
     \class QTextBoundaryFinder
     \inmodule QtCore
 
diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp
index e72c1964a2..725cf894c6 100644
--- a/src/corelib/tools/qvector.cpp
+++ b/src/corelib/tools/qvector.cpp
@@ -435,7 +435,7 @@
     Same as at(\a i).
 */
 
-/*! 
+/*!
     \fn void QVector::append(const T &value)
 
     Inserts \a value at the end of the vector.
diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/xml/qxmlutils.cpp
index 52921919eb..d175d554cc 100644
--- a/src/corelib/xml/qxmlutils.cpp
+++ b/src/corelib/xml/qxmlutils.cpp
@@ -70,7 +70,7 @@ bool QXmlUtils::rangeContains(RangeIter begin, RangeIter end, const QChar c)
 
     // check the first two ranges "manually" as characters in that
     // range are checked very often and we avoid the binary search below.
- 
+
     if (cp <= begin->max)
         return cp >= begin->min;
 
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 2a8681d1d7..22fe4a5fd8 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -513,7 +513,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCallWithArgumentList(const QString
     not indicate that the executed call succeeded. If it fails,
     the \a errorMethod is called. If the queueing failed, this
     function returns false and no slot will be called.
- 
+
     The \a returnMethod must have as its parameters the types returned
     by the function call. Optionally, it may have a QDBusMessage
     parameter as its last or only parameter.  The \a errorMethod must
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index d578bf7d76..f486c19fdc 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -72,7 +72,7 @@ for ($j = 0; $j < $i; ++$j) {
 }
 print "0\n};\n";
 ===== PERL SCRIPT ====
- 
+
  * The input data is as follows:
 other
 org.freedesktop.DBus.Error.Failed
diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h
index a9f3773acc..b892ed95f1 100644
--- a/src/dbus/qdbusintrospection_p.h
+++ b/src/dbus/qdbusintrospection_p.h
@@ -97,7 +97,7 @@ public:
         inline bool operator==(const Argument& other) const
         { return name == other.name && type == other.type; }
     };
-    
+
     struct Method
     {
         QString name;
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index f3bd7c28ba..799c66f6f9 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -77,7 +77,7 @@ private:
         QVarLengthArray<int, 4> outputTypes;
         int flags;
     };
-    
+
     struct Property {
         QByteArray typeName;
         QByteArray signature;
@@ -92,14 +92,14 @@ private:
     QMap<QByteArray, Method> signals_;
     QMap<QByteArray, Method> methods;
     QMap<QByteArray, Property> properties;
-    
+
     const QDBusIntrospection::Interface *data;
     QString interface;
 
     Type findType(const QByteArray &signature,
                   const QDBusIntrospection::Annotations &annotations,
                   const char *direction = "Out", int id = -1);
-    
+
     void parseMethods();
     void parseSignals();
     void parseProperties();
@@ -258,7 +258,7 @@ void QDBusMetaObjectGenerator::parseMethods()
             mm.inputTypes.append(type.id);
 
             mm.parameterNames.append(arg.name.toLatin1());
-            
+
             prototype.append(type.name);
             prototype.append(',');
         }
@@ -331,7 +331,7 @@ void QDBusMetaObjectGenerator::parseSignals()
             mm.inputTypes.append(type.id);
 
             mm.parameterNames.append(arg.name.toLatin1());
-            
+
             prototype.append(type.name);
             prototype.append(',');
         }
@@ -361,7 +361,7 @@ void QDBusMetaObjectGenerator::parseProperties()
         Type type = findType(p.type.toLatin1(), p.annotations);
         if (type.id == QVariant::Invalid)
             continue;
-        
+
         QByteArray name = p.name.toLatin1();
         mp.signature = p.type.toLatin1();
         mp.type = type.id;
@@ -564,7 +564,7 @@ void QDBusMetaObjectGenerator::writeWithoutXml(const QString &interface)
 
     char *stringdata = new char[name.length() + 1];
     stringdata[name.length()] = '\0';
-    
+
     d.data = reinterpret_cast<uint*>(header);
     d.relatedMetaObjects = 0;
     d.static_metacall = 0;
@@ -615,7 +615,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con
     if (we)
         return we;
     // still nothing?
-    
+
     if (parsed.isEmpty()) {
         // object didn't return introspection
         we = new QDBusMetaObject;
@@ -627,7 +627,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con
         // merge all interfaces
         it = parsed.constBegin();
         QDBusIntrospection::Interface merged = *it.value().constData();
- 
+
         for (++it; it != end; ++it) {
             merged.annotations.unite(it.value()->annotations);
             merged.methods.unite(it.value()->methods);
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index ff5818d684..804e80699a 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -318,10 +318,10 @@ int QDBusMetaType::signatureToType(const char *signature)
 
     case DBUS_TYPE_UINT16:
         return QMetaType::UShort;
-        
+
     case DBUS_TYPE_INT32:
         return QVariant::Int;
-        
+
     case DBUS_TYPE_UINT32:
         return QVariant::UInt;
 
@@ -375,7 +375,7 @@ int QDBusMetaType::signatureToType(const char *signature)
 
 /*!
     \fn QDBusMetaType::typeToSignature(int type)
-    \internal 
+    \internal
 
     Returns the D-Bus signature equivalent to the supplied meta type id \a type.
 
diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
index 443f5407e0..1169254253 100644
--- a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
@@ -87,7 +87,7 @@ MainWindow::MainWindow()
     int row;
     QTextTableCell cell;
     QTextCursor cellCursor;
-    
+
     QTextCharFormat charFormat;
     charFormat.setForeground(Qt::black);
 
diff --git a/src/gui/doc/snippets/textdocument-texttable/main.cpp b/src/gui/doc/snippets/textdocument-texttable/main.cpp
index 0024d8592b..f82b5235cf 100644
--- a/src/gui/doc/snippets/textdocument-texttable/main.cpp
+++ b/src/gui/doc/snippets/textdocument-texttable/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char * argv[])
     tableFormat.setCellSpacing(2);
     QTextTable *table = cursor.insertTable(rows, columns);
     table->setFormat(tableFormat);
-    
+
     QTextCharFormat boldFormat;
     boldFormat.setFontWeight(QFont::Bold);
 
diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 7857a160ac..cd208e9e18 100644
--- a/src/gui/doc/src/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
@@ -50,7 +50,7 @@
     \ingroup qt-graphics
     \ingroup frameworks-technologies
     \ingroup qt-basic-concepts
-	
+
 
     Qt's paint system enables painting on screen and print devices
     using the same API, and is primarily based on the QPainter,
@@ -70,7 +70,7 @@
     same painting pipeline making it easy to add support for new
     features and providing default implementations for unsupported
     ones.
-    
+
     \section1 Topics
     \list
         \li \l{Classes for Painting}
@@ -126,7 +126,7 @@
     in a platform-independent way. Another benefit is that the
     painting can be performed in another thread than the current GUI
     thread.
-    
+
     \row \li \b Pixmap
 
     The QPixmap class is an off-screen image representation which is
@@ -175,7 +175,7 @@
     actually be able to draw on the device, this paint engine must be
     a custom paint engine created by deriving from the QPaintEngine
     class.
-    
+
     \endtable
 
 */
@@ -183,7 +183,7 @@
 /*!
     \page paintsystem-drawing.html
     \title Drawing and Filling
-    
+
     \previouspage Paint Devices and Backends
     \contentspage The Paint System
     \nextpage Coordinate System
diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index aa44dcfad5..201bb03a14 100644
--- a/src/gui/doc/src/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -62,7 +62,7 @@
 
     For application developers writing user interfaces, Qt provides
     higher level API's, like Qt Quick, that are much more suitable
-    than the enablers found in the Qt GUI module. 
+    than the enablers found in the Qt GUI module.
 
     \section1 Getting started
 
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index f770458127..055ace9985 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -433,7 +433,7 @@ bool QImageIOHandler::supportsOption(ImageOption option) const
     the sequence number of the current image in the animation. If
     this function is called before any image is read(), -1 is
     returned. The number of the first image in the sequence is 0.
-    
+
     If the image format does not support animation, 0 is returned.
 
     \sa read()
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index e137af2231..ae526f5ba7 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \class QMovie
 
     \inmodule QtGui
@@ -150,7 +150,7 @@
     copy of the frame.
 */
 
-/*! 
+/*!
     \fn void QMovie::stateChanged(QMovie::MovieState state)
 
     This signal is emitted every time the state of the movie changes. The new
@@ -203,23 +203,23 @@ public:
     inline QFrameInfo(bool endMark)
         : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(endMark)
     { }
-    
+
     inline QFrameInfo()
         : pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false)
     { }
-    
+
     inline QFrameInfo(const QPixmap &pixmap, int delay)
         : pixmap(pixmap), delay(delay), endMark(false)
     { }
-    
+
     inline bool isValid()
     {
         return endMark || !(pixmap.isNull() && (delay == QMOVIE_INVALID_DELAY));
     }
-    
+
     inline bool isEndMarker()
     { return endMark; }
-    
+
     static inline QFrameInfo endMarker()
     { return QFrameInfo(true); }
 };
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 0e1ecfa299..498f6ce767 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -302,7 +302,7 @@ bool QXbmHandler::read(QImage *image)
 {
     if (state == Error)
         return false;
-    
+
     if (state == Ready && !readHeader()) {
         state = Error;
         return false;
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 79da6471b8..f0b1f16ba2 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -226,7 +226,7 @@ QClipboard::~QClipboard()
     the global clipboard.
 
     \value Selection  indicates that data should be stored and retrieved from
-    the global mouse selection. Support for \c Selection is provided only on 
+    the global mouse selection. Support for \c Selection is provided only on
     systems with a global mouse selection (e.g. X11).
 
     \value FindBuffer indicates that data should be stored and retrieved from
@@ -344,7 +344,7 @@ void QClipboard::setText(const QString &text, Mode mode)
     clipboard is used.  If \a mode is QClipboard::Clipboard, the
     image is retrieved from the global clipboard.  If \a mode is
     QClipboard::Selection, the image is retrieved from the global
-    mouse selection. 
+    mouse selection.
 
     \sa setImage(), pixmap(), mimeData(), QImage::isNull()
 */
@@ -459,7 +459,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode)
     \sa mimeData()
 */
 
-/*! 
+/*!
     \fn void QClipboard::clear(Mode mode)
     Clear the clipboard contents.
 
@@ -467,7 +467,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode)
     clipboard is used.  If \a mode is QClipboard::Clipboard, this
     function clears the global clipboard contents.  If \a mode is
     QClipboard::Selection, this function clears the global mouse
-    selection contents. If \a mode is QClipboard::FindBuffer, this 
+    selection contents. If \a mode is QClipboard::FindBuffer, this
     function clears the search string buffer.
 
     \sa QClipboard::Mode, supportsSelection()
@@ -521,21 +521,21 @@ bool QClipboard::ownsFindBuffer() const
     return ownsMode(FindBuffer);
 }
 
-/*! 
+/*!
     \internal
     \fn bool QClipboard::supportsMode(Mode mode) const;
     Returns true if the clipboard supports the clipboard mode speacified by \a mode;
     otherwise returns false.
 */
 
-/*! 
+/*!
     \internal
     \fn bool QClipboard::ownsMode(Mode mode) const;
     Returns true if the clipboard supports the clipboard data speacified by \a mode;
     otherwise returns false.
 */
 
-/*! 
+/*!
     \internal
     Emits the appropriate changed signal for \a mode.
 */
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 016a0ef798..0bf4cc7bf9 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -107,7 +107,7 @@ public:
     static void setPos(QScreen *screen, int x, int y);
     inline static void setPos(const QPoint &p) { setPos(p.x(), p.y()); }
     inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); }
-    
+
 private:
     QCursorData *d;
 };
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index cc0ecdf388..66eb1d58ed 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -878,7 +878,7 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate
     \value SelectPreviousPage       Extend selection to previous page.
     \value SelectPreviousWord       Extend selection to previous word.
     \value SelectStartOfBlock       Extend selection to the start of a text block. This shortcut is only used on OS X.
-    \value SelectStartOfDocument    Extend selection to start of document. 
+    \value SelectStartOfDocument    Extend selection to start of document.
     \value SelectStartOfLine        Extend selection to start of line.
     \value Underline        Underline text.
     \value Undo             Undo.
@@ -892,10 +892,10 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate
 /*!
     \since 4.2
 
-    Constructs a QKeySequence object for the given \a key. 
-    The result will depend on the currently running platform. 
+    Constructs a QKeySequence object for the given \a key.
+    The result will depend on the currently running platform.
 
-    The resulting object will be based on the first element in the 
+    The resulting object will be based on the first element in the
     list of key bindings for the \a key.
 */
 QKeySequence::QKeySequence(StandardKey key)
@@ -903,7 +903,7 @@ QKeySequence::QKeySequence(StandardKey key)
     const QList <QKeySequence> bindings = keyBindings(key);
     //pick only the first/primary shortcut from current bindings
     if (bindings.size() > 0) {
-        d = bindings.first().d; 
+        d = bindings.first().d;
         d->ref.ref();
     }
     else
@@ -991,8 +991,8 @@ static inline int maybeSwapShortcut(int shortcut)
     \since 4.2
 
     Returns a list of key bindings for the given \a key.
-    The result of calling this function will vary based on the target platform. 
-    The first element of the list indicates the primary shortcut for the given platform. 
+    The result of calling this function will vary based on the target platform.
+    The first element of the list indicates the primary shortcut for the given platform.
     If the result contains more than one result, these can
     be considered alternative shortcuts on the same platform for the given \a key.
 */
@@ -1509,9 +1509,9 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const
 
     \obsolete
 
-    Use toString() instead. 
-    
-    Returns the key sequence as a QString. This is equivalent to 
+    Use toString() instead.
+
+    Returns the key sequence as a QString. This is equivalent to
     calling toString(QKeySequence::NativeText). Note that the
     result is not platform independent.
 */
diff --git a/src/gui/opengl/qopengl2pexvertexarray_p.h b/src/gui/opengl/qopengl2pexvertexarray_p.h
index fa0ad47e7f..03a3ba5d24 100644
--- a/src/gui/opengl/qopengl2pexvertexarray_p.h
+++ b/src/gui/opengl/qopengl2pexvertexarray_p.h
@@ -104,20 +104,20 @@ public:
         maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
         boundingRectDirty(true)
     { }
-    
+
     inline void addRect(const QRectF &rect)
     {
         qreal top = rect.top();
         qreal left = rect.left();
         qreal bottom = rect.bottom();
         qreal right = rect.right();
-    
+
         vertexArray << QOpenGLPoint(left, top)
                     << QOpenGLPoint(right, top)
                     << QOpenGLPoint(right, bottom)
                     << QOpenGLPoint(right, bottom)
                     << QOpenGLPoint(left, bottom)
-                    << QOpenGLPoint(left, top);        
+                    << QOpenGLPoint(left, top);
     }
 
     inline void addQuad(const QRectF &rect)
diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h
index be7d6f3290..5926d5bbd5 100644
--- a/src/gui/opengl/qopengles2ext.h
+++ b/src/gui/opengl/qopengles2ext.h
@@ -100,23 +100,23 @@ typedef void* GLeglImageOES;
 #endif
 
 /* GL_OES_required_internalformat */
-#ifndef GL_OES_required_internalformat 
+#ifndef GL_OES_required_internalformat
 #define GL_ALPHA8_OES                                           0x803C
 #define GL_DEPTH_COMPONENT16_OES                                0x81A5
-/* reuse GL_DEPTH_COMPONENT24_OES */                            
-/* reuse GL_DEPTH24_STENCIL8_OES */                             
-/* reuse GL_DEPTH_COMPONENT32_OES */                            
+/* reuse GL_DEPTH_COMPONENT24_OES */
+/* reuse GL_DEPTH24_STENCIL8_OES */
+/* reuse GL_DEPTH_COMPONENT32_OES */
 #define GL_LUMINANCE4_ALPHA4_OES                                0x8043
 #define GL_LUMINANCE8_ALPHA8_OES                                0x8045
 #define GL_LUMINANCE8_OES                                       0x8040
 #define GL_RGBA4_OES                                            0x8056
 #define GL_RGB5_A1_OES                                          0x8057
 #define GL_RGB565_OES                                           0x8D62
-/* reuse GL_RGB8_OES */                              
-/* reuse GL_RGBA8_OES */  
+/* reuse GL_RGB8_OES */
+/* reuse GL_RGBA8_OES */
 /* reuse GL_RGB10_EXT */
 /* reuse GL_RGB10_A2_EXT */
-#endif 
+#endif
 
 /* GL_OES_rgb8_rgba8 */
 #ifndef GL_OES_rgb8_rgba8
@@ -216,9 +216,9 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen
 #define GL_SHADER                                               0x82E1
 #define GL_PROGRAM                                              0x82E2
 #define GL_QUERY                                                0x82E3
-/* PROGRAM_PIPELINE only in GL */                               
+/* PROGRAM_PIPELINE only in GL */
 #define GL_SAMPLER                                              0x82E6
-/* DISPLAY_LIST only in GL */                                   
+/* DISPLAY_LIST only in GL */
 #define GL_MAX_LABEL_LENGTH                                     0x82E8
 #define GL_MAX_DEBUG_MESSAGE_LENGTH                             0x9143
 #define GL_MAX_DEBUG_LOGGED_MESSAGES                            0x9144
@@ -328,12 +328,12 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen
 #endif
 
 /* GL_ANGLE_instanced_arrays */
-#ifndef GL_ANGLE_instanced_arrays 
+#ifndef GL_ANGLE_instanced_arrays
 #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE                    0x88FE
 #endif
 
 /* GL_ANGLE_pack_reverse_row_order */
-#ifndef GL_ANGLE_pack_reverse_row_order 
+#ifndef GL_ANGLE_pack_reverse_row_order
 #define GL_PACK_REVERSE_ROW_ORDER_ANGLE                         0x93A4
 #endif
 
@@ -343,23 +343,23 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen
 #endif
 
 /* GL_ANGLE_texture_compression_dxt3 */
-#ifndef GL_ANGLE_texture_compression_dxt3 
+#ifndef GL_ANGLE_texture_compression_dxt3
 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE                      0x83F2
 #endif
 
 /* GL_ANGLE_texture_compression_dxt5 */
-#ifndef GL_ANGLE_texture_compression_dxt5 
+#ifndef GL_ANGLE_texture_compression_dxt5
 #define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE                      0x83F3
 #endif
 
 /* GL_ANGLE_texture_usage */
-#ifndef GL_ANGLE_texture_usage 
+#ifndef GL_ANGLE_texture_usage
 #define GL_TEXTURE_USAGE_ANGLE                                  0x93A2
 #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE                         0x93A3
 #endif
 
 /* GL_ANGLE_translated_shader_source */
-#ifndef GL_ANGLE_translated_shader_source 
+#ifndef GL_ANGLE_translated_shader_source
 #define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE                0x93A0
 #endif
 
@@ -369,7 +369,7 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen
 
 /* GL_APPLE_copy_texture_levels */
 /* No new tokens introduced by this extension. */
-    
+
 /* GL_APPLE_framebuffer_multisample */
 #ifndef GL_APPLE_framebuffer_multisample
 #define GL_RENDERBUFFER_SAMPLES_APPLE                           0x8CAB
@@ -394,9 +394,9 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen
 #ifndef __gl3_h_
 /* These types are defined with reference to <inttypes.h>
  * in the Apple extension spec, but here we use the Khronos
- * portable types in khrplatform.h, and assume those types 
+ * portable types in khrplatform.h, and assume those types
  * are always defined.
- * If any other extensions using these types are defined, 
+ * If any other extensions using these types are defined,
  * the typedefs must move out of this block and be shared.
  */
 typedef khronos_int64_t GLint64;
@@ -502,7 +502,7 @@ typedef struct __GLsync *GLsync;
 /* GL_EXT_multisampled_render_to_texture */
 #ifndef GL_EXT_multisampled_render_to_texture
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
-/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ 
+/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */
 #define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
 #define GL_MAX_SAMPLES_EXT                                      0x8D57
@@ -610,10 +610,10 @@ typedef struct __GLsync *GLsync;
 /* GL_EXT_texture_storage */
 #ifndef GL_EXT_texture_storage
 #define GL_TEXTURE_IMMUTABLE_FORMAT_EXT                         0x912F
-#define GL_ALPHA8_EXT                                           0x803C  
+#define GL_ALPHA8_EXT                                           0x803C
 #define GL_LUMINANCE8_EXT                                       0x8040
 #define GL_LUMINANCE8_ALPHA8_EXT                                0x8045
-#define GL_RGBA32F_EXT                                          0x8814  
+#define GL_RGBA32F_EXT                                          0x8814
 #define GL_RGB32F_EXT                                           0x8815
 #define GL_ALPHA32F_EXT                                         0x8816
 #define GL_LUMINANCE32F_EXT                                     0x8818
@@ -623,12 +623,12 @@ typedef struct __GLsync *GLsync;
 #define GL_ALPHA16F_EXT                                         0x881C
 #define GL_LUMINANCE16F_EXT                                     0x881E
 #define GL_LUMINANCE_ALPHA16F_EXT                               0x881F
-#define GL_RGB10_A2_EXT                                         0x8059  
+#define GL_RGB10_A2_EXT                                         0x8059
 #define GL_RGB10_EXT                                            0x8052
 #define GL_BGRA8_EXT                                            0x93A1
 #define GL_R8_EXT                                               0x8229
 #define GL_RG8_EXT                                              0x822B
-#define GL_R32F_EXT                                             0x822E  
+#define GL_R32F_EXT                                             0x822E
 #define GL_RG32F_EXT                                            0x8230
 #define GL_R16F_EXT                                             0x822D
 #define GL_RG16F_EXT                                            0x822F
@@ -785,7 +785,7 @@ typedef struct __GLsync *GLsync;
 #ifndef GL_NV_framebuffer_blit
 #define GL_READ_FRAMEBUFFER_NV                                  0x8CA8
 #define GL_DRAW_FRAMEBUFFER_NV                                  0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING_NV                          0x8CA6 
+#define GL_DRAW_FRAMEBUFFER_BINDING_NV                          0x8CA6
 #define GL_READ_FRAMEBUFFER_BINDING_NV                          0x8CAA
 #endif
 
@@ -824,10 +824,10 @@ typedef struct __GLsync *GLsync;
 /* GL_NV_shadow_samplers_array */
 #ifndef GL_NV_shadow_samplers_array
 #define GL_SAMPLER_2D_ARRAY_SHADOW_NV                           0x8DC4
-#endif                                             
-                                                   
+#endif
+
 /* GL_NV_shadow_samplers_cube */
-#ifndef GL_NV_shadow_samplers_cube                 
+#ifndef GL_NV_shadow_samplers_cube
 #define GL_SAMPLER_CUBE_SHADOW_NV                               0x8DC5
 #endif
 
@@ -1162,7 +1162,7 @@ GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GL
 GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
 GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
 GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
-#endif 
+#endif
 typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
 typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
@@ -1256,7 +1256,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target
 typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
 #endif
 
-#ifndef GL_ANGLE_instanced_arrays 
+#ifndef GL_ANGLE_instanced_arrays
 #define GL_ANGLE_instanced_arrays 1
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
@@ -1269,7 +1269,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLu
 #endif
 
 /* GL_ANGLE_pack_reverse_row_order */
-#ifndef GL_ANGLE_pack_reverse_row_order 
+#ifndef GL_ANGLE_pack_reverse_row_order
 #define GL_ANGLE_pack_reverse_row_order 1
 #endif
 
@@ -1279,21 +1279,21 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLu
 #endif
 
 /* GL_ANGLE_texture_compression_dxt3 */
-#ifndef GL_ANGLE_texture_compression_dxt3 
+#ifndef GL_ANGLE_texture_compression_dxt3
 #define GL_ANGLE_texture_compression_dxt3 1
 #endif
 
 /* GL_ANGLE_texture_compression_dxt5 */
-#ifndef GL_ANGLE_texture_compression_dxt5 
+#ifndef GL_ANGLE_texture_compression_dxt5
 #define GL_ANGLE_texture_compression_dxt5 1
 #endif
 
 /* GL_ANGLE_texture_usage */
-#ifndef GL_ANGLE_texture_usage 
+#ifndef GL_ANGLE_texture_usage
 #define GL_ANGLE_texture_usage 1
 #endif
 
-#ifndef GL_ANGLE_translated_shader_source 
+#ifndef GL_ANGLE_translated_shader_source
 #define GL_ANGLE_translated_shader_source 1
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h
index e65578caee..dfdb8249d9 100644
--- a/src/gui/opengl/qopenglext.h
+++ b/src/gui/opengl/qopenglext.h
@@ -13,7 +13,7 @@ extern "C" {
 
 /*
 ** Copyright (c) 2007-2012 The Khronos Group Inc.
-** 
+**
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
 ** "Materials"), to deal in the Materials without restriction, including
@@ -21,10 +21,10 @@ extern "C" {
 ** distribute, sublicense, and/or sell copies of the Materials, and to
 ** permit persons to whom the Materials are furnished to do so, subject to
 ** the following conditions:
-** 
+**
 ** The above copyright notice and this permission notice shall be included
 ** in all copies or substantial portions of the Materials.
-** 
+**
 ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp
index 83c7c93fdf..d3c80e264f 100644
--- a/src/gui/opengl/qtriangulator.cpp
+++ b/src/gui/opengl/qtriangulator.cpp
@@ -370,7 +370,7 @@ bool QIntersectionPoint::isOnLine(const QPodPoint &u, const QPodPoint &v) const
 
     if (((q.x < 0) == (q.y < 0)) != ((p.x < 0) == (p.y < 0)))
         return false; // 'p + offset' and 'q' pass through different quadrants.
-    
+
     // Move all coordinates into the first quadrant.
     quint64 nx, ny;
     if (p.x < 0)
@@ -991,7 +991,7 @@ void QTriangulator<T>::ComplexToSimple::initEdges()
     if (first != m_edges.size())
         m_edges.last().to = m_edges.at(first).from;
     for (int i = 0; i < m_edges.size(); ++i) {
-        m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp = 
+        m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp =
             m_parent->m_vertices.at(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from);
     }
 }
@@ -1646,7 +1646,7 @@ QTriangulator<T>::ComplexToSimple::DebugDialog::DebugDialog(ComplexToSimple *par
     QDataBuffer<QPodPoint> &vertices = m_parent->m_parent->m_vertices;
     if (vertices.isEmpty())
         return;
-    
+
     int minX, maxX, minY, maxY;
     minX = maxX = vertices.at(0).x;
     minY = maxY = vertices.at(0).y;
@@ -1671,7 +1671,7 @@ void QTriangulator<T>::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *)
     QDataBuffer<QPodPoint> &vertices = m_parent->m_parent->m_vertices;
     if (vertices.isEmpty())
         return;
-    
+
     qreal halfPointSize = qMin(m_window.width(), m_window.height()) / 300.0;
     p.setWindow(m_window.toRect());
 
@@ -1725,7 +1725,7 @@ void QTriangulator<T>::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *)
         }
         u += q;
         v += q;
-        p.drawLine(u.x, u.y, v.x, v.y);        
+        p.drawLine(u.x, u.y, v.x, v.y);
     }
 }
 
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 7eec60ed12..12ca84d8d1 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -1572,7 +1572,7 @@ QColor QColor::toRgb() const
                 // achromatic case
                 color.ct.argb.red = color.ct.argb.green = color.ct.argb.blue = ct.ahsl.lightness;
             } else if (ct.ahsl.lightness == 0) {
-                // lightness 0 
+                // lightness 0
                 color.ct.argb.red = color.ct.argb.green = color.ct.argb.blue = 0;
             } else {
                 // chromatic case
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 5bd879ed63..ef3503e8d8 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -266,10 +266,10 @@ inline QColor::QColor(const QColor &acolor)
 inline bool QColor::isValid() const
 { return cspec != Invalid; }
 
-inline QColor QColor::lighter(int f) const 
+inline QColor QColor::lighter(int f) const
 { return light(f); }
 
-inline QColor QColor::darker(int f) const 
+inline QColor QColor::darker(int f) const
 { return dark(f); }
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h
index 38e45ae7c9..7888b9edf1 100644
--- a/src/gui/painting/qcssutil_p.h
+++ b/src/gui/painting/qcssutil_p.h
@@ -78,7 +78,7 @@ extern void Q_GUI_EXPORT qNormalizeRadii(const QRect &br, const QSize *radii,
                             QSize *tlr, QSize *trr, QSize *blr, QSize *brr);
 
 QT_END_NAMESPACE
-        
+
 #endif //QT_NO_CSSPARSER
 
 #endif // QCSSUTIL_P_H
diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index 72093a3612..db2d51e53a 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -62,10 +62,10 @@ class QEmulationPaintEngine : public QPaintEngineEx
 {
 public:
     QEmulationPaintEngine(QPaintEngineEx *engine);
-    
+
     virtual bool begin(QPaintDevice *pdev);
     virtual bool end();
-    
+
     virtual Type type() const;
     virtual QPainterState *createState(QPainterState *orig) const;
 
@@ -78,7 +78,7 @@ public:
     virtual void drawStaticTextItem(QStaticTextItem *item);
     virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);
     virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags);
-    
+
     virtual void clipEnabledChanged();
     virtual void penChanged();
     virtual void brushChanged();
diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index be446c86eb..bb0c441b40 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -1731,12 +1731,12 @@ void QPainterReplayer::process(const QPaintBufferCommand &cmd)
 #endif
         painter->setClipRegion(region, Qt::ClipOperation(cmd.extra));
         break; }
-        
+
 #if !defined(QT_NO_RAWFONT)
     case QPaintBufferPrivate::Cmd_DrawStaticText: {
-            
+
             QVariantList variants(d->variants.at(cmd.offset).value<QVariantList>());
-            
+
             QFont font = variants.at(0).value<QFont>();
 
             QVector<quint32> glyphIndexes;
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 8769aeaba9..81c9c676ba 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -158,7 +158,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const
                metrics.yoff.toReal(),
                metrics.x.toReal(),
                metrics.y.toReal());
-#endif        
+#endif
         GlyphAndSubPixelPosition key(glyph, subPixelPosition);
         int glyph_width = metrics.width.ceil().toInt();
         int glyph_height = metrics.height.ceil().toInt();
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index eaca605652..b7b8e919ad 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -183,7 +183,7 @@ QT_BEGIN_NAMESPACE
    This signal is emitted when the specified \a block has been updated.
 
    Subclasses of QAbstractTextDocumentLayout should emit this signal when
-   the layout of \a block has changed in order to repaint. 
+   the layout of \a block has changed in order to repaint.
 */
 
 /*!
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 5f610e3fb7..1264330873 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -537,7 +537,7 @@ QSize ValueExtractor::sizeValue(const Declaration &decl)
                      lengthValueFromData(qvariant_cast<LengthData>(v.at(1)), f));
     }
 
-    LengthData x[2] = { {0, LengthData::None }, {0, LengthData::None} };   
+    LengthData x[2] = { {0, LengthData::None }, {0, LengthData::None} };
     if (decl.d->values.count() > 0)
         x[0] = lengthValue(decl.d->values.at(0));
     if (decl.d->values.count() > 1)
@@ -917,7 +917,7 @@ void ValueExtractor::borderValue(const Declaration &decl, int *width, QCss::Bord
 
     if (decl.d->values.isEmpty())
         return;
-    
+
     BorderData data;
     data.width.number = 0;
     data.width.unit = LengthData::None;
@@ -1465,7 +1465,7 @@ QRect Declaration::rectValue() const
 {
     if (d->values.count() != 1)
         return QRect();
-    
+
     if (d->parsed.isValid())
         return qvariant_cast<QRect>(d->parsed);
 
@@ -1934,7 +1934,7 @@ QVector<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
         return rules;
 
     QMap<uint, StyleRule> weightedRules; // (spec, rule) that will be sorted below
-    
+
     //prune using indexed stylesheet
     for (int sheetIdx = 0; sheetIdx < styleSheets.count(); ++sheetIdx) {
         const StyleSheet &styleSheet = styleSheets.at(sheetIdx);
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 2c1683f416..cd88e3bbe4 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE
     \mainclass
 
     QStaticText provides a way to cache layout data for a block of text so that it can be drawn
-    more efficiently than by using QPainter::drawText() in which the layout information is 
-    recalculated with every call. 
+    more efficiently than by using QPainter::drawText() in which the layout information is
+    recalculated with every call.
 
     The class primarily provides an optimization for cases where the text, its font and the
     transformations on the painter are static over several paint events. If the text or its layout
@@ -97,8 +97,8 @@ QT_BEGIN_NAMESPACE
     \endcode
 
     The QStaticText class can be used to mimic the behavior of QPainter::drawText() to a specific
-    point with no boundaries, and also when QPainter::drawText() is called with a bounding 
-    rectangle. 
+    point with no boundaries, and also when QPainter::drawText() is called with a bounding
+    rectangle.
 
     If a bounding rectangle is not required, create a QStaticText object without setting a preferred
     text width. The text will then occupy a single line.
@@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs an empty QStaticText
 */
-QStaticText::QStaticText()    
+QStaticText::QStaticText()
     : data(new QStaticTextPrivate)
 {
 }
@@ -161,7 +161,7 @@ QStaticText::QStaticText()
 */
 QStaticText::QStaticText(const QString &text)
     : data(new QStaticTextPrivate)
-{    
+{
     data->text = text;
     data->invalidate();
 }
@@ -169,7 +169,7 @@ QStaticText::QStaticText(const QString &text)
 /*!
     Constructs a QStaticText object which is a copy of \a other.
 */
-QStaticText::QStaticText(const QStaticText &other)    
+QStaticText::QStaticText(const QStaticText &other)
 {
     data = other.data;
 }
@@ -186,7 +186,7 @@ QStaticText::~QStaticText()
     \internal
 */
 void QStaticText::detach()
-{    
+{
     if (data->ref.load() != 1)
         data.detach();
 }
@@ -219,7 +219,7 @@ void QStaticText::prepare(const QTransform &matrix, const QFont &font)
     Assigns \a other to this QStaticText.
 */
 QStaticText &QStaticText::operator=(const QStaticText &other)
-{    
+{
     data = other.data;
     return *this;
 }
@@ -300,7 +300,7 @@ Qt::TextFormat QStaticText::textFormat() const
 
     \sa setText()
 */
-QString QStaticText::text() const 
+QString QStaticText::text() const
 {
     return data->text;
 }
@@ -651,7 +651,7 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p)
                                       .arg(QString::number(color.blue(), 16), 2, QLatin1Char('0')));
 #endif
         document.setDefaultFont(font);
-        document.setDocumentMargin(0.0);        
+        document.setDocumentMargin(0.0);
 #ifndef QT_NO_TEXTHTMLPARSER
         document.setHtml(text);
 #else
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 60fa82712b..e41c475495 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 class QStaticTextPrivate;
 class Q_GUI_EXPORT QStaticText
-{    
+{
 public:
     enum PerformanceHint {
         ModerateCaching,
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 1434c54417..4451f27b27 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -77,7 +77,7 @@ public:
 
 class Q_GUI_EXPORT QStaticTextItem
 {
-public:    
+public:
     QStaticTextItem() : chars(0), numChars(0), useBackendOptimizations(false),
                         userDataNeedsUpdate(0), m_fontEngine(0), m_userData(0) {}
 
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index e8e1c81dab..784aeb9a71 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -380,7 +380,7 @@ void QSyntaxHighlighter::rehighlight()
     \since 4.6
 
     Reapplies the highlighting to the given QTextBlock \a block.
-    
+
     \sa rehighlight()
 */
 void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 34133c5e07..b83af30f7f 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -416,12 +416,12 @@ void QTextDocument::redo(QTextCursor *cursor)
 }
 
 /*! \enum QTextDocument::Stacks
-  
+
   \value UndoStack              The undo stack.
   \value RedoStack              The redo stack.
   \value UndoAndRedoStacks      Both the undo and redo stacks.
 */
-        
+
 /*!
     \since 4.7
     Clears the stacks specified by \a stacksToClear.
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 833e4c5037..50908f9908 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1022,7 +1022,7 @@ static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip)
 */
 #if !defined(QT_NO_RAWFONT)
 QList<QGlyphRun> QTextLayout::glyphRuns(int from, int length) const
-{    
+{
     if (from < 0)
         from = 0;
     if (length < 0)
@@ -1651,7 +1651,7 @@ namespace {
         }
 
         inline glyph_t currentGlyph() const
-        {            
+        {
             Q_ASSERT(currentPosition > 0);
             Q_ASSERT(logClusters[currentPosition - 1] < glyphs.numGlyphs);
 
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 80ed2f023f..8465dcdaad 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -636,7 +636,7 @@ QTextFrame::iterator QTextFrame::begin() const
 
 /*!
     Returns an iterator pointing to the position past the last document element inside the frame.
-    Please see the document \l{STL-Style Iterators} for more information.    
+    Please see the document \l{STL-Style Iterators} for more information.
     \sa begin()
 */
 QTextFrame::iterator QTextFrame::end() const
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index d83dc98e22..1572648d7f 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -677,13 +677,13 @@ void QTextOdfWriter::writeFrameFormat(QXmlStreamWriter &writer, QTextFrameFormat
     writer.writeEndElement(); // style
 
 // TODO consider putting the following properties in a qt-namespace.
-// Position   position () const 
-// qreal   border () const 
-// QBrush   borderBrush () const 
-// BorderStyle   borderStyle () const 
-// qreal   padding () const 
-// QTextLength   width () const 
-// QTextLength   height () const 
+// Position   position () const
+// qreal   border () const
+// QBrush   borderBrush () const
+// BorderStyle   borderStyle () const
+// qreal   padding () const
+// QTextLength   width () const
+// QTextLength   height () const
 // PageBreakFlags   pageBreakPolicy () const
 }
 
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index 7b5d20bc5c..c939020457 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -394,7 +394,7 @@ QList<QTextOption::Tab> QTextOption::tabs() const
 
 /*!
     \fn Tab::Tab(qreal pos, TabType tabType, QChar delim = QChar())
-    
+
     Creates a tab with the given position, tab type, and delimiter
     (\a pos, \a tabType, \a delim).
 
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 0c9ec6203e..a56f8060e0 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -535,11 +535,11 @@ void QTextTablePrivate::update() const
     Rows and columns within a QTextTable can be merged and split using
     the mergeCells() and splitCell() functions. However, only cells that span multiple
     rows or columns can be split. (Merging or splitting does not increase or decrease
-    the number of rows and columns.) 
+    the number of rows and columns.)
 
     Note that if you have merged multiple columns and rows into one cell, you will not
-    be able to split the merged cell into new cells spanning over more than one row 
-    or column. To be able to split cells spanning over several rows and columns you 
+    be able to split the merged cell into new cells spanning over more than one row
+    or column. To be able to split cells spanning over several rows and columns you
     need to do this over several iterations.
 
     \table 80%
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 509f8b3251..a279990f4c 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -923,7 +923,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
             fillPipeline(channels[i].socket);
 
     // If there is not already any connected channels we need to connect a new one.
-    // We do not pair the channel with the request until we know if it is 
+    // We do not pair the channel with the request until we know if it is
     // connected or not. This is to reuse connected channels before we connect new once.
     int queuedRequest = highPriorityQueue.count() + lowPriorityQueue.count();
     for (int i = 0; i < channelCount; ++i) {
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 3577d76df5..c8138b5453 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -146,7 +146,7 @@ public:
     QHttpNetworkConnectionChannel();
 
     QAbstractSocket::NetworkLayerProtocol networkLayerPreference;
-    
+
     void setConnection(QHttpNetworkConnection *c);
     QPointer<QHttpNetworkConnection> connection;
 
diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp
index d9d3200564..b6c04dddea 100644
--- a/src/network/access/qnetworkaccessdebugpipebackend.cpp
+++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp
@@ -143,7 +143,7 @@ void QNetworkAccessDebugPipeBackend::pushFromSocketToDownstream()
 
         buffer.resize(ReadBufferSize);
         qint64 haveRead = socket.read(buffer.data(), ReadBufferSize);
-        
+
         if (haveRead == -1) {
             hasDownloadFinished = true;
             // this ensures a good last downloadProgress is emitted
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 123b354131..83cb729589 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -672,8 +672,8 @@ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request)
 
 /*!
     Posts a request to obtain the contents of the target \a request
-    and returns a new QNetworkReply object opened for reading which emits the 
-    \l{QIODevice::readyRead()}{readyRead()} signal whenever new data 
+    and returns a new QNetworkReply object opened for reading which emits the
+    \l{QIODevice::readyRead()}{readyRead()} signal whenever new data
     arrives.
 
     The contents as well as associated headers will be downloaded.
@@ -687,11 +687,11 @@ QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request)
 
 /*!
     Sends an HTTP POST request to the destination specified by \a request
-    and returns a new QNetworkReply object opened for reading that will 
-    contain the reply sent by the server. The contents of  the \a data 
+    and returns a new QNetworkReply object opened for reading that will
+    contain the reply sent by the server. The contents of  the \a data
     device will be uploaded to the server.
 
-    \a data must be open for reading and must remain valid until the 
+    \a data must be open for reading and must remain valid until the
     finished() signal is emitted for this reply.
 
     \note Sending a POST request on protocols other than HTTP and
@@ -707,7 +707,7 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODe
 /*!
     \overload
 
-    Sends the contents of the \a data byte array to the destination 
+    Sends the contents of the \a data byte array to the destination
     specified by \a request.
 */
 QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const QByteArray &data)
@@ -770,8 +770,8 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, QHttpM
     this reply.
 
     Whether anything will be available for reading from the returned
-    object is protocol dependent. For HTTP, the server may send a 
-    small HTML page indicating the upload was successful (or not). 
+    object is protocol dependent. For HTTP, the server may send a
+    small HTML page indicating the upload was successful (or not).
     Other protocols will probably have content in their replies.
 
     \note For HTTP, this request will send a PUT request, which most servers
@@ -807,7 +807,7 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const
 
     Sends a request to delete the resource identified by the URL of \a request.
 
-    \note This feature is currently available for HTTP only, performing an 
+    \note This feature is currently available for HTTP only, performing an
     HTTP DELETE request.
 
     \sa get(), post(), put(), sendCustomRequest()
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index ec8d7894fa..49d6babb10 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -134,7 +134,7 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
     \sa QNetworkConfiguration
 */
 
-/*! 
+/*!
     \fn void QNetworkConfigurationManager::configurationAdded(const QNetworkConfiguration &config)
 
     This signal is emitted whenever a new network configuration is added to the system. The new
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index f06a2d0df4..cca95fce8c 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -66,37 +66,37 @@ QT_BEGIN_NAMESPACE
     \ingroup network
 
     A QNetworkSession enables control over the system's network interfaces. The session's configuration
-    parameter are determined via the QNetworkConfiguration object to which it is bound. Depending on the 
+    parameter are determined via the QNetworkConfiguration object to which it is bound. Depending on the
     type of the session (single access point or service network) a session may be linked to one or more
-    network interfaces. By means of \l{open()}{opening} and \l{close()}{closing} of network sessions 
-    a developer can start and stop the systems network interfaces. If the configuration represents 
+    network interfaces. By means of \l{open()}{opening} and \l{close()}{closing} of network sessions
+    a developer can start and stop the systems network interfaces. If the configuration represents
     multiple access points (see \l QNetworkConfiguration::ServiceNetwork) more advanced features such as roaming may be supported.
 
-    QNetworkSession supports session management within the same process and depending on the platform's 
-    capabilities may support out-of-process sessions. If the same 
+    QNetworkSession supports session management within the same process and depending on the platform's
+    capabilities may support out-of-process sessions. If the same
     network configuration is used by multiple open sessions the underlying network interface is only terminated once
     the last session has been closed.
 
     \section1 Roaming
 
-    Applications may connect to the preferredConfigurationChanged() signal in order to 
-    receive notifications when a more suitable access point becomes available. 
+    Applications may connect to the preferredConfigurationChanged() signal in order to
+    receive notifications when a more suitable access point becomes available.
     In response to this signal the application must either initiate the roaming via migrate()
-    or ignore() the new access point. Once the session has roamed the 
-    newConfigurationActivated() signal is emitted. The application may now test the 
+    or ignore() the new access point. Once the session has roamed the
+    newConfigurationActivated() signal is emitted. The application may now test the
     carrier and must either accept() or reject() it. The session will return to the previous
     access point if the roaming was rejected. The subsequent state diagram depicts the required
     state transitions.
-    
+
     \image roaming-states.png
 
-    Some platforms may distinguish forced roaming and application level roaming (ALR). 
-    ALR implies that the application controls (via migrate(), ignore(), accept() and reject()) 
+    Some platforms may distinguish forced roaming and application level roaming (ALR).
+    ALR implies that the application controls (via migrate(), ignore(), accept() and reject())
     whether a network session can roam from one access point to the next. Such control is useful
     if the application maintains stateful socket connections and wants to control the transition from
-    one interface to the next. Forced roaming implies that the system automatically roams to the next network without 
+    one interface to the next. Forced roaming implies that the system automatically roams to the next network without
     consulting the application. This has the advantage that the application can make use of roaming features
-    without actually being aware of it. It is expected that the application detects that the underlying 
+    without actually being aware of it. It is expected that the application detects that the underlying
     socket is broken and automatically reconnects via the new network link.
 
     If the platform supports both modes of roaming, an application indicates its preference
@@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE
     level roaming. If the client does not connect to the preferredConfigurationChanged(), forced roaming
     is used. If forced roaming is not supported the network session will not roam by default.
 
-    Some applications may want to suppress any form of roaming altogether. Possible use cases may be 
+    Some applications may want to suppress any form of roaming altogether. Possible use cases may be
     high priority downloads or remote services which cannot handle a roaming enabled client. Clients
     can suppress roaming by connecting to the preferredConfigurationChanged() signal and answer each
     signal emission with ignore().
@@ -120,19 +120,19 @@ QT_BEGIN_NAMESPACE
     single access point configuration the state of the session is the same as the state of the
     associated network interface.
 
-    \value Invalid          The session is invalid due to an invalid configuration. This may 
-                            happen due to a removed access point or a configuration that was 
+    \value Invalid          The session is invalid due to an invalid configuration. This may
+                            happen due to a removed access point or a configuration that was
                             invalid to begin with.
     \value NotAvailable     The session is based on a defined but not yet discovered QNetworkConfiguration
                             (see \l QNetworkConfiguration::StateFlag).
     \value Connecting       The network session is being established.
     \value Connected        The network session is connected. If the current process wishes to use this session
-                            it has to register its interest by calling open(). A network session 
+                            it has to register its interest by calling open(). A network session
                             is considered to be ready for socket operations if it isOpen() and connected.
     \value Closing          The network session is in the process of being shut down.
     \value Disconnected     The network session is not connected. The associated QNetworkConfiguration
                             has the state QNetworkConfiguration::Discovered.
-    \value Roaming          The network session is roaming from one access point to another 
+    \value Roaming          The network session is roaming from one access point to another
                             access point.
 */
 
@@ -194,16 +194,16 @@ QT_BEGIN_NAMESPACE
     If the roaming process is non-seamless the IP address will change which means that
     a socket becomes invalid. However seamless mobility can ensure that the local IP address
     does not change. This is achieved by using a virtual IP address which is bound to the actual
-    link address. During the roaming process the virtual address is attached to the new link 
+    link address. During the roaming process the virtual address is attached to the new link
     address.
 
-    Some platforms may support the concept of Forced Roaming and Application Level Roaming (ALR). 
-    Forced roaming implies that the platform may simply roam to a new configuration without 
+    Some platforms may support the concept of Forced Roaming and Application Level Roaming (ALR).
+    Forced roaming implies that the platform may simply roam to a new configuration without
     consulting applications. It is up to the application to detect the link layer loss and reestablish
-    its sockets. In contrast ALR provides the opportunity to prevent the system from roaming. 
+    its sockets. In contrast ALR provides the opportunity to prevent the system from roaming.
     If this session is based on a configuration that supports roaming the application can choose
-    whether it wants to be consulted (ALR use case) by connecting to this signal. For as long as this signal 
-    connection remains the session remains registered as a roaming stakeholder; otherwise roaming will 
+    whether it wants to be consulted (ALR use case) by connecting to this signal. For as long as this signal
+    connection remains the session remains registered as a roaming stakeholder; otherwise roaming will
     be enforced by the platform.
 
     \sa migrate(), ignore(), QNetworkConfiguration::isRoamingAvailable()
@@ -214,7 +214,7 @@ QT_BEGIN_NAMESPACE
 
     This signal is emitted once the session has roamed to the new access point.
     The application may reopen its socket and test the suitability of the new network link.
-    Subsequently it must either accept() or reject() the new access point. 
+    Subsequently it must either accept() or reject() the new access point.
 
     \sa accept(), reject()
 */
@@ -222,8 +222,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \fn void QNetworkSession::opened()
 
-    This signal is emitted when the network session has been opened. 
-    
+    This signal is emitted when the network session has been opened.
+
     The underlying network interface will not be shut down as long as the session remains open.
     Note that this feature is dependent on \l{QNetworkConfigurationManager::SystemSessionSupport}{system wide session support}.
 */
@@ -292,12 +292,12 @@ QNetworkSession::~QNetworkSession()
     The system will not terminate a network interface until the session reference counter reaches zero.
     Therefore an open session allows an application to register its use of the interface.
 
-    As a result of calling open() the interface will be started if it is not connected/up yet. 
+    As a result of calling open() the interface will be started if it is not connected/up yet.
     Some platforms may not provide support for out-of-process sessions. On such platforms the session
-    counter ignores any sessions held by another process. The platform capabilities can be 
+    counter ignores any sessions held by another process. The platform capabilities can be
     detected via QNetworkConfigurationManager::capabilities().
 
-    Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired 
+    Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired
     by connecting to the stateChanged(), opened() or error() signals.
 
     It is not a requirement to open a session in order to monitor the underlying network interface.
@@ -361,10 +361,10 @@ bool QNetworkSession::waitForOpened(int msecs)
     \l Disconnected if the current session was the last open session.
 
     If the platform does not support out-of-process sessions calling this function does not stop the
-    interface. In this case \l{stop()} has to be used to force a shut down. 
+    interface. In this case \l{stop()} has to be used to force a shut down.
     The platform capabilities can be detected via QNetworkConfigurationManager::capabilities().
 
-    Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired 
+    Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired
     by connecting to the stateChanged(), opened() or error() signals.
 
     \sa open(), stop(), isOpen()
@@ -376,7 +376,7 @@ void QNetworkSession::close()
 }
 
 /*!
-    Invalidates all open sessions against the network interface and therefore stops the 
+    Invalidates all open sessions against the network interface and therefore stops the
     underlying network interface. This function always changes the session's state() flag to
     \l Disconnected.
 
@@ -426,15 +426,15 @@ bool QNetworkSession::isOpen() const
 }
 
 /*!
-    Returns the state of the session. 
-    
-    If the session is based on a single access point configuration the state of the 
+    Returns the state of the session.
+
+    If the session is based on a single access point configuration the state of the
     session is the same as the state of the associated network interface. Therefore
-    a network session object can be used to monitor network interfaces. 
+    a network session object can be used to monitor network interfaces.
 
     A \l QNetworkConfiguration::ServiceNetwork based session summarizes the state of all its children
-    and therefore returns the \l Connected state if at least one of the service network's 
-    \l {QNetworkConfiguration::children()}{children()} configurations is active. 
+    and therefore returns the \l Connected state if at least one of the service network's
+    \l {QNetworkConfiguration::children()}{children()} configurations is active.
 
     Note that it is not required to hold an open session in order to obtain the network interface state.
     A connected but closed session may be used to monitor network interfaces whereas an open and connected
@@ -458,7 +458,7 @@ QNetworkSession::SessionError QNetworkSession::error() const
 }
 
 /*!
-    Returns a human-readable description of the last device error that 
+    Returns a human-readable description of the last device error that
     occurred.
 
     \sa error()
@@ -485,7 +485,7 @@ QString QNetworkSession::errorString() const
             QNetworkConfiguration that is used by this session; otherwise an empty string.
 
             The main purpose of this key is to determine which Internet access point is used
-            if the session is based on a \l{QNetworkConfiguration::ServiceNetwork}{ServiceNetwork}. 
+            if the session is based on a \l{QNetworkConfiguration::ServiceNetwork}{ServiceNetwork}.
             The following code snippet highlights the difference:
             \code
                     QNetworkConfigurationManager mgr;
@@ -512,7 +512,7 @@ QString QNetworkSession::errorString() const
             this key may return an identifier for either a
             \l {QNetworkConfiguration::ServiceNetwork}{service network} or a
             \l {QNetworkConfiguration::InternetAccessPoint}{Internet access points} configurations,
-            whereas \e ActiveConfiguration always returns identifiers to 
+            whereas \e ActiveConfiguration always returns identifiers to
             \l {QNetworkConfiguration::InternetAccessPoint}{Internet access points} configurations.
         \row
             \li ConnectInBackground
@@ -558,7 +558,7 @@ QVariant QNetworkSession::sessionProperty(const QString &key) const
 
 /*!
     Sets the property \a value on the session. The property is identified using
-    \a key. Removing an already set  property can be achieved by passing an 
+    \a key. Removing an already set  property can be achieved by passing an
     invalid QVariant.
 
     Note that the \e UserChoiceConfiguration and \e ActiveConfiguration
@@ -578,7 +578,7 @@ void QNetworkSession::setSessionProperty(const QString &key, const QVariant &val
 }
 
 /*!
-    Instructs the session to roam to the new access point. The old access point remains active 
+    Instructs the session to roam to the new access point. The old access point remains active
     until the application calls accept().
 
    The newConfigurationActivated() signal is emitted once roaming has been completed.
@@ -603,11 +603,11 @@ void QNetworkSession::ignore()
 }
 
 /*!
-    Instructs the session to permanently accept the new access point. Once this function 
+    Instructs the session to permanently accept the new access point. Once this function
     has been called the session may not return to the old access point.
 
     The old access point may be closed in the process if there are no other network sessions for it.
-    Therefore any open socket that still uses the old access point 
+    Therefore any open socket that still uses the old access point
     may become unusable and should be closed before completing the migration.
 */
 void QNetworkSession::accept()
@@ -617,7 +617,7 @@ void QNetworkSession::accept()
 }
 
 /*!
-    The new access point is not suitable for the application. By calling this function the 
+    The new access point is not suitable for the application. By calling this function the
     session returns to the previous access point/configuration. This action may invalidate
     any socket that has been created via the not desired access point.
 
@@ -633,10 +633,10 @@ void QNetworkSession::reject()
 /*!
     Returns the amount of data sent in bytes; otherwise 0.
 
-    This field value includes the usage across all open network 
+    This field value includes the usage across all open network
     sessions which use the same network interface.
 
-    If the session is based on a service network configuration the number of 
+    If the session is based on a service network configuration the number of
     sent bytes across all active member configurations are returned.
 
     This function may not always be supported on all platforms and returns 0.
@@ -652,10 +652,10 @@ quint64 QNetworkSession::bytesWritten() const
 /*!
     Returns the amount of data received in bytes; otherwise 0.
 
-    This field value includes the usage across all open network 
+    This field value includes the usage across all open network
     sessions which use the same network interface.
 
-    If the session is based on a service network configuration the number of 
+    If the session is based on a service network configuration the number of
     sent bytes across all active member configurations are returned.
 
     This function may not always be supported on all platforms and returns 0.
@@ -699,12 +699,12 @@ void QNetworkSessionPrivate::setUsagePolicies(QNetworkSession &session, QNetwork
 /*!
     \internal
 
-    This function is required to detect whether the client wants to control 
+    This function is required to detect whether the client wants to control
     the roaming process. If he connects to preferredConfigurationChanged() signal
     he intends to influence it. Otherwise QNetworkSession always roams
     without registering this session as a stakeholder in the roaming process.
 
-    For more details check the Forced vs ALR roaming section in the QNetworkSession 
+    For more details check the Forced vs ALR roaming section in the QNetworkSession
     class description.
 */
 void QNetworkSession::connectNotify(const QMetaMethod &signal)
diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h
index c5af8d8ca0..909cce5e4b 100644
--- a/src/network/bearer/qnetworksession_p.h
+++ b/src/network/bearer/qnetworksession_p.h
@@ -76,7 +76,7 @@ public:
 
     //called by QNetworkSession constructor and ensures
     //that the state is immediately updated (w/o actually opening
-    //a session). Also this function should take care of 
+    //a session). Also this function should take care of
     //notification hooks to discover future state changes.
     virtual void syncStateWithInterface() = 0;
 
diff --git a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
index 01ec19c0ba..af1273dd85 100644
--- a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
+++ b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp
@@ -47,7 +47,7 @@ if (socket->waitForConnected(1000))
 
 //! [1]
 socket->disconnectFromHost();
-    if (socket->state() == QAbstractSocket::UnconnectedState || 
+    if (socket->state() == QAbstractSocket::UnconnectedState ||
         socket->waitForDisconnected(1000))
         qDebug("Disconnected!");
 //! [1]
diff --git a/src/network/doc/snippets/network/tcpwait.cpp b/src/network/doc/snippets/network/tcpwait.cpp
index 2be8d7c8ea..fb44e2ded9 100644
--- a/src/network/doc/snippets/network/tcpwait.cpp
+++ b/src/network/doc/snippets/network/tcpwait.cpp
@@ -49,7 +49,7 @@ int main(int argv, char **args)
 
     QTcpSocket socket;
     socket.connectToHost("localhost", 1025);
-    
+
 //! [0]
     int numRead = 0, numReadTotal = 0;
     char buffer[50];
@@ -58,12 +58,12 @@ int main(int argv, char **args)
 	numRead  = socket.read(buffer, 50);
 
 	// do whatever with array
-	
+
 	numReadTotal += numRead;
-	if (numRead == 0 && !socket.waitForReadyRead()) 
+        if (numRead == 0 && !socket.waitForReadyRead())
 	    break;
     }
 //! [0]
-    
+
     return app.exec();
 }
diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h
index b784cd7f50..4d96104bc0 100644
--- a/src/network/kernel/qauthenticator.h
+++ b/src/network/kernel/qauthenticator.h
@@ -62,7 +62,7 @@ public:
 
     bool operator==(const QAuthenticator &other) const;
     inline bool operator!=(const QAuthenticator &other) const { return !operator==(other); }
-    
+
     QString user() const;
     void setUser(const QString &user);
 
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index f15c49104d..dc67b0d835 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -664,7 +664,7 @@ Q_IPV6ADDR QHostAddress::toIPv6Address() const
     Returns the address as a string.
 
     For example, if the address is the IPv4 address 127.0.0.1, the
-    returned string is "127.0.0.1". For IPv6 the string format will 
+    returned string is "127.0.0.1". For IPv6 the string format will
     follow the RFC5952 recommendation.
     For QHostAddress::Any, its IPv4 address will be returned ("0.0.0.0")
 
diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h
index f288b8d938..53d5d6e664 100644
--- a/src/network/kernel/qnetworkinterface.h
+++ b/src/network/kernel/qnetworkinterface.h
@@ -98,7 +98,7 @@ public:
         CanMulticast = 0x20
     };
     Q_DECLARE_FLAGS(InterfaceFlags, InterfaceFlag)
-    
+
     QNetworkInterface();
     QNetworkInterface(const QNetworkInterface &other);
     QNetworkInterface &operator=(const QNetworkInterface &other);
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 7885d122ea..0ec9554c82 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -328,9 +328,9 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
                 }
                 break;
             }
-        if ( if_it != interfaces.end() ) 
+        if ( if_it != interfaces.end() )
             continue;
-        
+
         QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
         interfaces << iface;
         iface->index = ifindex;
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp
index 0a2deb8711..02c0801cef 100644
--- a/src/network/kernel/qnetworkinterface_win.cpp
+++ b/src/network/kernel/qnetworkinterface_win.cpp
@@ -109,7 +109,7 @@ static QHash<QHostAddress, QHostAddress> ipv4Netmasks()
     IP_ADAPTER_INFO staticBuf[2]; // 2 is arbitrary
     PIP_ADAPTER_INFO pAdapter = staticBuf;
     ULONG bufSize = sizeof staticBuf;
-    QHash<QHostAddress, QHostAddress> ipv4netmasks; 
+    QHash<QHostAddress, QHostAddress> ipv4netmasks;
 
     DWORD retval = ptrGetAdaptersInfo(pAdapter, &bufSize);
     if (retval == ERROR_BUFFER_OVERFLOW) {
diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h
index 34f4e18d5e..d6a3366316 100644
--- a/src/network/kernel/qnetworkinterface_win_p.h
+++ b/src/network/kernel/qnetworkinterface_win_p.h
@@ -112,19 +112,19 @@ typedef struct {
 
 // copied from MSDN online help
 typedef enum {
-  IpPrefixOriginOther = 0, 
-  IpPrefixOriginManual, 
-  IpPrefixOriginWellKnown, 
-  IpPrefixOriginDhcp, 
+  IpPrefixOriginOther = 0,
+  IpPrefixOriginManual,
+  IpPrefixOriginWellKnown,
+  IpPrefixOriginDhcp,
   IpPrefixOriginRouterAdvertisement
 } IP_PREFIX_ORIGIN;
 
 typedef enum {
-  IpSuffixOriginOther = 0, 
-  IpSuffixOriginManual, 
-  IpSuffixOriginWellKnown, 
-  IpSuffixOriginDhcp, 
-  IpSuffixOriginLinkLayerAddress, 
+  IpSuffixOriginOther = 0,
+  IpSuffixOriginManual,
+  IpSuffixOriginWellKnown,
+  IpSuffixOriginDhcp,
+  IpSuffixOriginLinkLayerAddress,
   IpSuffixOriginRandom
 } IP_SUFFIX_ORIGIN;
 
@@ -164,11 +164,11 @@ typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
   ULONG LeaseLifetime;
 } IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS;
 
-typedef struct _IP_ADAPTER_ANYCAST_ADDRESS 
+typedef struct _IP_ADAPTER_ANYCAST_ADDRESS
  IP_ADAPTER_ANYCAST_ADDRESS, *PIP_ADAPTER_ANYCAST_ADDRESS;
 
-typedef struct _IP_ADAPTER_MULTICAST_ADDRESS 
- IP_ADAPTER_MULTICAST_ADDRESS, 
+typedef struct _IP_ADAPTER_MULTICAST_ADDRESS
+ IP_ADAPTER_MULTICAST_ADDRESS,
  *PIP_ADAPTER_MULTICAST_ADDRESS;
 
 typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS
@@ -186,7 +186,7 @@ typedef struct _IP_ADAPTER_PREFIX {
   struct _IP_ADAPTER_PREFIX* Next;
   SOCKET_ADDRESS Address;
   ULONG PrefixLength;
-} IP_ADAPTER_PREFIX, 
+} IP_ADAPTER_PREFIX,
  *PIP_ADAPTER_PREFIX;
 
 typedef struct _IP_ADAPTER_ADDRESSES {
@@ -215,7 +215,7 @@ typedef struct _IP_ADAPTER_ADDRESSES {
   DWORD Ipv6IfIndex;
   DWORD ZoneIndices[16];
   PIP_ADAPTER_PREFIX FirstPrefix;
-} IP_ADAPTER_ADDRESSES, 
+} IP_ADAPTER_ADDRESSES,
  *PIP_ADAPTER_ADDRESSES;
 
 typedef struct {
@@ -227,7 +227,7 @@ typedef struct _IP_ADDR_STRING {
   IP_ADDRESS_STRING IpAddress;
   IP_MASK_STRING IpMask;
   DWORD Context;
-} IP_ADDR_STRING, 
+} IP_ADDR_STRING,
  *PIP_ADDR_STRING;
 
 typedef struct _IP_ADAPTER_INFO {
@@ -249,7 +249,7 @@ typedef struct _IP_ADAPTER_INFO {
   IP_ADDR_STRING SecondaryWinsServer;
   time_t LeaseObtained;
   time_t LeaseExpires;
-} IP_ADAPTER_INFO, 
+} IP_ADAPTER_INFO,
  *PIP_ADAPTER_INFO;
 
 typedef struct {
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index a135abd5e3..3027b77161 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -1450,7 +1450,7 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co
     bool readEnabled = selectForRead && readNotifier && readNotifier->isEnabled();
     if (readEnabled)
         readNotifier->setEnabled(false);
-    
+
     fd_set fds;
 
     int ret = 0;
diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp
index fb5d46a9f7..ce37401a89 100644
--- a/src/network/socket/qtcpsocket.cpp
+++ b/src/network/socket/qtcpsocket.cpp
@@ -41,7 +41,7 @@
 
 //#define QTCPSOCKET_DEBUG
 
-/*! 
+/*!
     \class QTcpSocket
 
     \brief The QTcpSocket class provides a TCP socket.
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index 6fcd977759..4e33001d8d 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     \enum QSsl::KeyType
 
     Describes the two types of keys QSslKey supports.
-    
+
     \value PrivateKey A private key.
     \value PublicKey A public key.
 */
diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp
index 46131fc1aa..b045d2eba9 100644
--- a/src/network/ssl/qsslcipher.cpp
+++ b/src/network/ssl/qsslcipher.cpp
@@ -194,7 +194,7 @@ QString QSslCipher::keyExchangeMethod() const
 {
     return d->keyExchangeMethod;
 }
- 
+
 /*!
     Returns the cipher's authentication method as a QString.
 */
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index d151b376d5..bf75d2e610 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -61,7 +61,7 @@
     \enum QSslError::SslError
 
     Describes all recognized errors that can occur during an SSL handshake.
-    
+
     \value NoError
     \value UnableToGetIssuerCertificate
     \value UnableToDecryptCertificateSignature
@@ -108,7 +108,7 @@ public:
 };
 
 /*!
-    Constructs a QSslError object with no error and default certificate. 
+    Constructs a QSslError object with no error and default certificate.
 
 */
 
diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h
index 135ba11ece..73549ce648 100644
--- a/src/network/ssl/qsslerror.h
+++ b/src/network/ssl/qsslerror.h
@@ -104,7 +104,7 @@ public:
     SslError error() const;
     QString errorString() const;
     QSslCertificate certificate() const;
-    
+
 private:
     QScopedPointer<QSslErrorPrivate> d;
 };
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index b1cdef7f29..a8bf8f83b8 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -267,7 +267,7 @@
 
 /*!
     \fn void QSslSocket::sslErrors(const QList<QSslError> &errors);
-    
+
     QSslSocket emits this signal after the SSL handshake to indicate that one
     or more errors have occurred while establishing the identity of the
     peer. The errors are usually an indication that QSslSocket is unable to
@@ -281,7 +281,7 @@
 
     \a errors contains one or more errors that prevent QSslSocket from
     verifying the identity of the peer.
-    
+
     Note: You cannot use Qt::QueuedConnection when connecting to this signal,
     or calling QSslSocket::ignoreSslErrors() will have no effect.
 
@@ -436,7 +436,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port, O
     \overload
 
     In addition to the original behaviour of connectToHostEncrypted,
-    this overloaded method enables the usage of a different hostname 
+    this overloaded method enables the usage of a different hostname
     (\a sslPeerName) for the certificate validation instead of
     the one used for the TCP connection (\a hostName).
 
@@ -827,7 +827,7 @@ bool QSslSocket::flush()
 /*!
     \since 4.4
 
-    Sets the size of QSslSocket's internal read buffer to be \a size bytes. 
+    Sets the size of QSslSocket's internal read buffer to be \a size bytes.
 */
 void QSslSocket::setReadBufferSize(qint64 size)
 {
@@ -960,7 +960,7 @@ void QSslSocket::setLocalCertificate(const QSslCertificate &certificate)
     \overload
 
     Sets the socket's local \l {QSslCertificate} {certificate} to the
-    first one found in file \a path, which is parsed according to the 
+    first one found in file \a path, which is parsed according to the
     specified \a format.
 */
 void QSslSocket::setLocalCertificate(const QString &path,
@@ -990,7 +990,7 @@ QSslCertificate QSslSocket::localCertificate() const
     Returns the peer's digital certificate (i.e., the immediate
     certificate of the host you are connected to), or a null
     certificate, if the peer has not assigned a certificate.
-    
+
     The peer certificate is checked automatically during the
     handshake phase, so this function is normally used to fetch
     the certificate for display or for connection diagnostic
@@ -1102,7 +1102,7 @@ void QSslSocket::setPrivateKey(const QSslKey &key)
     creating an SSL server socket. If you are creating an SSL client
     socket, the key and local certificate are required if your client
     must identify itself to an SSL server.
-    
+
     \sa privateKey(), setLocalCertificate()
 */
 void QSslSocket::setPrivateKey(const QString &fileName, QSsl::KeyAlgorithm algorithm,
@@ -1710,7 +1710,7 @@ void QSslSocket::startClientEncryption()
     subclass of QTcpServer and reimplement
     QTcpServer::incomingConnection(). The returned socket descriptor
     is then passed to QSslSocket::setSocketDescriptor().
-    
+
     \sa connectToHostEncrypted(), startClientEncryption()
 */
 void QSslSocket::startServerEncryption()
diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc
index 17fee37b7c..67c6aa3c0d 100644
--- a/src/opengl/doc/src/qtopengl-examples.qdoc
+++ b/src/opengl/doc/src/qtopengl-examples.qdoc
@@ -35,7 +35,7 @@
 
     These examples describe how to use the Qt OpenGL Module. For new code,
     please use the OpenGL classes in the \l {Qt GUI Module}.
-   
+
 
     Qt provides support for integration with OpenGL implementations on all
     platforms, giving developers the opportunity to display hardware accelerated
diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
index 44a0274da4..f1a664c93d 100644
--- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
+++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h
@@ -104,20 +104,20 @@ public:
         maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10),
         boundingRectDirty(true)
     { }
-    
+
     inline void addRect(const QRectF &rect)
     {
         qreal top = rect.top();
         qreal left = rect.left();
         qreal bottom = rect.bottom();
         qreal right = rect.right();
-    
+
         vertexArray << QGLPoint(left, top)
                     << QGLPoint(right, top)
                     << QGLPoint(right, bottom)
                     << QGLPoint(right, bottom)
                     << QGLPoint(left, bottom)
-                    << QGLPoint(left, top);        
+                    << QGLPoint(left, top);
     }
 
     inline void addQuad(const QRectF &rect)
diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp
index 589b0e2c24..e85949afb6 100644
--- a/src/plugins/bearer/connman/qconnmanengine.cpp
+++ b/src/plugins/bearer/connman/qconnmanengine.cpp
@@ -574,7 +574,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath)
         QNetworkConfigurationPrivatePointer ptr(cpPriv);
         accessPointConfigurations.insert(ptr->id, ptr);
         foundConfigurations.append(cpPriv);
-        configInterfaces[cpPriv->id] = serv->getInterface(); 
+        configInterfaces[cpPriv->id] = serv->getInterface();
 
         locker.unlock();
         emit configurationAdded(ptr);
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
index 56ae2b6e3c..e78a597433 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp
+++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp
@@ -405,7 +405,7 @@ QVariant QConnmanProfileInterface::getProperty(const QString &property)
     QVariantMap map = getProperties();
     if (map.contains(property)) {
         var = map.value(property);
-    } 
+    }
     return var;
 }
 
@@ -493,7 +493,7 @@ QVariant QConnmanServiceInterface::getProperty(const QString &property)
     QVariantMap map = getProperties();
     if (map.contains(property)) {
         var = map.value(property);
-    } 
+    }
     return var;
 }
 
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index d1524ca753..a437c6609c 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -134,7 +134,7 @@ public:
 
     QString requestSession(const QString &bearerName);
     void releaseSession();
-    
+
       // properties
     QString getState();
     QStringList getAvailableTechnologies();
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
index 7038dde3d9..7febe27ad2 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h
@@ -139,26 +139,26 @@ class QNetworkManagerInterfacePrivate;
 class QNetworkManagerInterface : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     QNetworkManagerInterface(QObject *parent = 0);
     ~QNetworkManagerInterface();
-    
+
     QList <QDBusObjectPath> getDevices() const;
     void activateConnection(const QString &serviceName, QDBusObjectPath connection, QDBusObjectPath device, QDBusObjectPath specificObject);
     void deactivateConnection(QDBusObjectPath connectionPath) const;
-    
+
     QDBusObjectPath path() const;
     QDBusInterface *connectionInterface() const;
-    
+
     bool wirelessEnabled() const;
     bool wirelessHardwareEnabled() const;
     QList <QDBusObjectPath> activeConnections() const;
     quint32 state();
     bool setConnections();
     bool isValid();
-    
+
 Q_SIGNALS:
     void deviceAdded(QDBusObjectPath);
     void deviceRemoved(QDBusObjectPath);
@@ -176,9 +176,9 @@ class QNetworkManagerInterfaceAccessPointPrivate;
 class QNetworkManagerInterfaceAccessPoint : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     enum DeviceState {
         Unknown = 0,
         Unmanaged,
@@ -191,14 +191,14 @@ public:
         Activated,
         Failed
     };
-    
+
     enum ApFlag {
         ApNone = 0x0,
         Privacy = 0x1
     };
-    
+
     Q_DECLARE_FLAGS(ApFlags, ApFlag);
-    
+
     enum ApSecurityFlag {
         ApSecurityNone = 0x0,
         PairWep40 = 0x1,
@@ -212,9 +212,9 @@ public:
         KeyPsk = 0x100,
         Key8021x = 0x200
     };
-    
+
     Q_DECLARE_FLAGS(ApSecurityFlags, ApSecurityFlag);
-    
+
     explicit QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent = 0);
     ~QNetworkManagerInterfaceAccessPoint();
 
@@ -231,7 +231,7 @@ public:
     quint32 strength() const;
     bool setConnections();
     bool isValid();
-    
+
 Q_SIGNALS:
     void propertiesChanged(QMap <QString,QVariant>);
     void propertiesChanged( const QString &, QMap<QString,QVariant>);
@@ -245,23 +245,23 @@ class QNetworkManagerInterfaceDevicePrivate;
 class QNetworkManagerInterfaceDevice : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     explicit QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent = 0);
     ~QNetworkManagerInterfaceDevice();
-    
+
     QString udi() const;
     QString networkInterface() const;
     QDBusInterface *connectionInterface() const;
     quint32 ip4Address() const;
     quint32 state() const;
     quint32 deviceType() const;
-    
+
     QDBusObjectPath ip4config() const;
     bool setConnections();
     bool isValid();
-    
+
 Q_SIGNALS:
     void stateChanged(const QString &, quint32);
 
@@ -274,20 +274,20 @@ class QNetworkManagerInterfaceDeviceWiredPrivate;
 class QNetworkManagerInterfaceDeviceWired : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     explicit QNetworkManagerInterfaceDeviceWired(const QString &ifaceDevicePath,
                                                  QObject *parent = 0);
     ~QNetworkManagerInterfaceDeviceWired();
-    
+
     QDBusInterface  *connectionInterface() const;
     QString hwAddress() const;
     quint32 speed() const;
     bool carrier() const;
     bool setConnections();
     bool isValid();
-    
+
 Q_SIGNALS:
     void propertiesChanged( const QString &, QMap<QString,QVariant>);
 private:
@@ -299,9 +299,9 @@ class QNetworkManagerInterfaceDeviceWirelessPrivate;
 class QNetworkManagerInterfaceDeviceWireless : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     enum DeviceCapability {
         None = 0x0,
         Wep40 = 0x1,
@@ -311,11 +311,11 @@ public:
         Wpa = 0x10,
         Rsn = 0x20
        };
-    
+
     explicit QNetworkManagerInterfaceDeviceWireless(const QString &ifaceDevicePath,
                                                     QObject *parent = 0);
     ~QNetworkManagerInterfaceDeviceWireless();
-    
+
     QDBusObjectPath path() const;
     QList <QDBusObjectPath> getAccessPoints();
     QDBusInterface *connectionInterface() const;
@@ -327,7 +327,7 @@ public:
     quint32 wirelessCapabilities() const;
     bool setConnections();
     bool isValid();
-    
+
 Q_SIGNALS:
     void propertiesChanged( const QString &, QMap<QString,QVariant>);
     void accessPointAdded(const QString &,QDBusObjectPath);
@@ -341,12 +341,12 @@ class QNetworkManagerSettingsPrivate;
 class QNetworkManagerSettings : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     explicit QNetworkManagerSettings(const QString &settingsService, QObject *parent = 0);
     ~QNetworkManagerSettings();
-    
+
     QDBusInterface  *connectionInterface() const;
     QList <QDBusObjectPath> listConnections();
     bool setConnections();
@@ -362,12 +362,12 @@ class QNetworkManagerSettingsConnectionPrivate;
 class QNetworkManagerSettingsConnection : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent = 0);
     ~QNetworkManagerSettingsConnection();
-    
+
     QDBusInterface  *connectionInterface() const;
     QNmSettingsMap getSettings();
     bool setConnections();
@@ -382,7 +382,7 @@ public:
     bool isValid();
 
 Q_SIGNALS:
-    
+
     void updated(const QNmSettingsMap &settings);
     void removed(const QString &path);
 
@@ -395,18 +395,18 @@ class QNetworkManagerConnectionActivePrivate;
 class QNetworkManagerConnectionActive : public QObject
 {
     Q_OBJECT
-    
+
 public:
-    
+
     enum ActiveConnectionState {
         Unknown = 0,
         Activating = 1,
         Activated = 2
        };
-    
+
     explicit QNetworkManagerConnectionActive(const QString &dbusPathName, QObject *parent = 0);
     ~ QNetworkManagerConnectionActive();
-    
+
     QDBusInterface  *connectionInterface() const;
     QString serviceName() const;
     QDBusObjectPath connection() const;
@@ -417,7 +417,7 @@ public:
     bool setConnections();
     bool isValid();
 
-    
+
 Q_SIGNALS:
     void propertiesChanged(QList<QDBusObjectPath>);
     void propertiesChanged( const QString &, QMap<QString,QVariant>);
@@ -430,7 +430,7 @@ class QNetworkManagerIp4ConfigPrivate;
 class QNetworkManagerIp4Config : public QObject
 {
     Q_OBJECT
-    
+
 public:
     explicit QNetworkManagerIp4Config(const QString &dbusPathName, QObject *parent = 0);
 	~QNetworkManagerIp4Config();
@@ -439,7 +439,7 @@ public:
     bool isValid();
 
  private:
-	QNetworkManagerIp4ConfigPrivate *d;    
+    QNetworkManagerIp4ConfigPrivate *d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h
index 12893108dc..23828c885c 100644
--- a/src/plugins/bearer/qnetworksession_impl.h
+++ b/src/plugins/bearer/qnetworksession_impl.h
@@ -77,7 +77,7 @@ public:
 
     //called by QNetworkSession constructor and ensures
     //that the state is immediately updated (w/o actually opening
-    //a session). Also this function should take care of 
+    //a session). Also this function should take care of
     //notification hooks to discover future state changes.
     void syncStateWithInterface();
 
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index b1ef823068..a45c3875bc 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \class QtIcoHandler
     \since 4.4
     \brief The QtIcoHandler class provides support for the ICO image format.
diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h
index c0439b9d11..65c0f5cf59 100644
--- a/src/plugins/imageformats/ico/qicohandler.h
+++ b/src/plugins/imageformats/ico/qicohandler.h
@@ -57,13 +57,13 @@ public:
     bool write(const QImage &image);
 
     QByteArray name() const;
-    
+
     int imageCount() const;
     bool jumpToImage(int imageNumber);
     bool jumpToNextImage();
-    
+
     static bool canRead(QIODevice *device);
-    
+
     bool supportsOption(ImageOption option) const;
     QVariant option(ImageOption option) const;
 
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index ed4f8cd1fb..5c487b0bdd 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -299,27 +299,27 @@ bool QCocoaEventDispatcher::hasPendingEvents()
 static bool IsMouseOrKeyEvent( NSEvent* event )
 {
     bool    result    = false;
-    
+
     switch( [event type] )
     {
-        case NSLeftMouseDown:              
-        case NSLeftMouseUp:      
-        case NSRightMouseDown:   
-        case NSRightMouseUp:     
+        case NSLeftMouseDown:
+        case NSLeftMouseUp:
+        case NSRightMouseDown:
+        case NSRightMouseUp:
         case NSMouseMoved:                // ??
-        case NSLeftMouseDragged: 
+        case NSLeftMouseDragged:
         case NSRightMouseDragged:
-        case NSMouseEntered:     
-        case NSMouseExited:      
-        case NSKeyDown:          
-        case NSKeyUp:            
+        case NSMouseEntered:
+        case NSMouseExited:
+        case NSKeyDown:
+        case NSKeyUp:
         case NSFlagsChanged:            // key modifiers changed?
         case NSCursorUpdate:            // ??
-        case NSScrollWheel:      
-        case NSTabletPoint:      
-        case NSTabletProximity:  
-        case NSOtherMouseDown:   
-        case NSOtherMouseUp:     
+        case NSScrollWheel:
+        case NSTabletPoint:
+        case NSTabletProximity:
+        case NSOtherMouseDown:
+        case NSOtherMouseUp:
         case NSOtherMouseDragged:
 #ifndef QT_NO_GESTURES
         case NSEventTypeGesture: // touch events
@@ -639,7 +639,7 @@ static void setChildrenWorksWhenModal(QWindow *window, bool worksWhenModal)
     Q_UNUSED(worksWhenModal)
 
     // For NSPanels (but not NSWindows, sadly), we can set the flag
-    // worksWhenModal, so that they are active even when they are not modal. 
+    // worksWhenModal, so that they are active even when they are not modal.
 /*
     ### not ported
     QList<QDialog *> dialogs = window->findChildren<QDialog *>();
@@ -680,7 +680,7 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions()
     // this to actually end the sessions for real (rather than at the
     // point they were marked as stopped), is that ending a session
     // when no other session runs below it on the stack will make cocoa
-    // drop some events on the floor. 
+    // drop some events on the floor.
     QCocoaAutoReleasePool pool;
     int stackSize = cocoaModalSessionStack.size();
 
@@ -859,7 +859,7 @@ void QCocoaEventDispatcherPrivate::processPostedEvents()
         if (currentExecIsNSAppRun) {
             // The event dispatcher has been interrupted. But since
             // [NSApplication run] is running the event loop, we
-            // delayed stopping it until now (to let cocoa process 
+            // delayed stopping it until now (to let cocoa process
             // pending cocoa events first).
             if (currentModalSessionCached)
                 temporarilyStopAllModalSessions();
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index 1b11ef7f95..ff40c6a9ab 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -306,7 +306,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *widget)
     else
         // No X11 cursor control when there is no widget under the cursor
         return;
-    
+
     xcb_cursor_t c = XCB_CURSOR_NONE;
     if (cursor) {
         if (cursor->shape() == Qt::BitmapCursor) {
diff --git a/src/printsupport/doc/snippets/widgetprinting.cpp b/src/printsupport/doc/snippets/widgetprinting.cpp
index 0204809988..3abef7a9a3 100644
--- a/src/printsupport/doc/snippets/widgetprinting.cpp
+++ b/src/printsupport/doc/snippets/widgetprinting.cpp
@@ -57,7 +57,7 @@ public:
 private slots:
     void print() {
         QPrinter printer(QPrinter::HighResolution);
-        
+
         printer.setOutputFileName("test.pdf");
 
 //! [0]
diff --git a/src/printsupport/doc/src/qtprintsupport-index.qdoc b/src/printsupport/doc/src/qtprintsupport-index.qdoc
index ea0d89aa34..dac915692e 100644
--- a/src/printsupport/doc/src/qtprintsupport-index.qdoc
+++ b/src/printsupport/doc/src/qtprintsupport-index.qdoc
@@ -40,12 +40,12 @@
   generation facilities.
 
   \tableofcontents
-  
+
   \section1 Classes Supporting Printing
 
   The following classes support the selecting and setting up of printers and
   printing output.
-  
+
   \annotatedlist printing
 
   \section1 Paint Devices and Printing
diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
index 48eb324cb8..695e7cdce8 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp
@@ -62,7 +62,7 @@ db.setDatabaseName("C:\\test.gdb");
 
 
 //! [25]
-// connect to database using the Latin-1 character set 
+// connect to database using the Latin-1 character set
 db.setConnectOptions("ISC_DPB_LC_CTYPE=Latin1");
 db.open();
 //! [25]
diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc
index b278e045bb..8480b5d412 100644
--- a/src/sql/doc/src/qsqldatatype-table.qdoc
+++ b/src/sql/doc/src/qsqldatatype-table.qdoc
@@ -29,7 +29,7 @@
   \page sql-types.html
   \title Data Types for Qt-supported Database Systems
   \brief Recommended data types for database systems
-  
+
   \ingroup qt-sql
 
   \section1 Recommended Data Types for Qt-Supported Database Systems
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index 28db62537f..3de898c344 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -212,7 +212,7 @@
 
     \li Open the DOS prompt, go to \c{C:\MySQL\MySQL51\lib\opt}, and run
        the following commands:
-       \list 
+       \list
        \li \c{reimp -d libmysql.lib}
        \li \c{dlltool -k -d libmysql.def -l libmysql.a}
        \endlist
@@ -227,7 +227,7 @@
 
     \li Open the DOS prompt, go to
         \c{C:\Qt\4.6.2\src\plugins\sqldrivers\mysql} and run the
-        following command: 
+        following command:
 	\list
         \li \c{qmake "INCLUDEPATH+=C:/MySQL/MySQL51/include" "LIBS+=-L. mysql" mysql.pro}
 	\endlist
diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc
index d4089c8ab2..9b5e9318e0 100644
--- a/src/sql/doc/src/sql-programming.qdoc
+++ b/src/sql/doc/src/sql-programming.qdoc
@@ -64,7 +64,7 @@
     \li \l{Using the SQL Model Classes}
     \li \l{Presenting Data in a Table View}
     \li \l{Creating Data-Aware Forms}
-    \endlist    
+    \endlist
 
     \section1 Database Classes
 
@@ -142,7 +142,7 @@
     \l{QSqlDatabase::addDatabase()} {addDatabase()} specifies the type
     of database driver to use for the connection. The set of database
     drivers included with Qt are shown in the table of \l{SQL Database
-    Drivers#Supported Databases} {supported database drivers}. 
+    Drivers#Supported Databases} {supported database drivers}.
 
     The connection in the snippet will be the \e{default} connection,
     because we don't pass the second argument to
@@ -176,11 +176,11 @@
     \page sql-sqlstatements.html
     \title Executing SQL Statements
     \ingroup qt-sql
-    
+
     \previouspage Connecting to Databases
     \contentspage SQL Programming
     \nextpage Using the SQL Model Classes
-    
+
 
     The QSqlQuery class provides an interface for executing SQL
     statements and navigating through the result set of a query.
@@ -328,7 +328,7 @@
     \page sql-model.html
     \title Using the SQL Model Classes
     \ingroup qt-sql
-    
+
     \previouspage Executing SQL Statements
     \contentspage SQL Programming
     \nextpage Presenting Data in a Table View
@@ -475,7 +475,7 @@
     \page sql-presenting.html
     \title Presenting Data in a Table View
     \ingroup qt-sql
-    
+
     \previouspage Using the SQL Model Classes
     \contentspage SQL Programming
     \nextpage Creating Data-Aware Forms
@@ -580,7 +580,7 @@
     \page sql-forms.html
     \title Creating Data-Aware Forms
     \ingroup qt-sql
-    
+
     \previouspage Presenting Data in a Table View
     \contentspage SQL Programming
 
diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp
index 04ba450d46..a529d8c32d 100644
--- a/src/sql/drivers/mysql/qsql_mysql.cpp
+++ b/src/sql/drivers/mysql/qsql_mysql.cpp
@@ -166,7 +166,7 @@ class QMYSQLResultPrivate : public QObject
 {
     Q_OBJECT
 public:
-    QMYSQLResultPrivate(const QMYSQLDriver* dp, const QMYSQLResult* d) : driver(dp), result(0), q(d), 
+    QMYSQLResultPrivate(const QMYSQLDriver* dp, const QMYSQLResult* d) : driver(dp), result(0), q(d),
         rowsAffected(0), hasBlobs(false)
 #if MYSQL_VERSION_ID >= 40108
         , stmt(0), meta(0), inBinds(0), outBinds(0)
@@ -788,7 +788,7 @@ bool QMYSQLResult::nextResult()
 {
     if(!d->driver)
         return false;
-#if MYSQL_VERSION_ID >= 40100 
+#if MYSQL_VERSION_ID >= 40100
     setAt(-1);
     setActive(false);
 
@@ -796,7 +796,7 @@ bool QMYSQLResult::nextResult()
         mysql_free_result(d->result);
     d->result = 0;
     setSelect(false);
-   
+
     for (int i = 0; i < d->fields.count(); ++i)
         delete[] d->fields[i].outField;
     d->fields.clear();
@@ -1374,14 +1374,14 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const
         if(type & QSql::Tables) {
             QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'BASE TABLE'");
             q.exec(sql);
-            
+
             while(q.next())
                 tl.append(q.value(0).toString());
         }
         if(type & QSql::Views) {
             QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'VIEW'");
             q.exec(sql);
-            
+
             while(q.next())
                 tl.append(q.value(0).toString());
         }
diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp
index 8a6161d816..b0950110e0 100644
--- a/src/sql/drivers/oci/qsql_oci.cpp
+++ b/src/sql/drivers/oci/qsql_oci.cpp
@@ -100,7 +100,7 @@ enum { QOCIEncoding = 2000 }; // AL16UTF16
 // Always set the OCI_ATTR_CHARSET_FORM to SQLCS_NCHAR is safe
 // because Oracle server will deal with the implicit Conversion
 // Between CHAR and NCHAR.
-// see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705 
+// see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705
 static const ub1 qOraCharsetForm = SQLCS_NCHAR;
 #endif
 
@@ -2211,7 +2211,7 @@ bool QOCIDriver::open(const QString & db,
     // Connect without tnsnames.ora if a hostname is given
     QString connectionString = db;
     if (!hostname.isEmpty())
-        connectionString = 
+        connectionString =
         QString::fromLatin1("(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=%1)(Port=%2))"
                 "(CONNECT_DATA=(SID=%3)))").arg(hostname).arg((port > -1 ? port : 1521)).arg(db);
 
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 483c640b43..1af5d6274e 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -68,7 +68,7 @@ Q_DECLARE_METATYPE(sqlite3_stmt*)
 
 QT_BEGIN_NAMESPACE
 
-static QString _q_escapeIdentifier(const QString &identifier) 
+static QString _q_escapeIdentifier(const QString &identifier)
 {
     QString res = identifier;
     if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) {
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
index a85a120973..1a16b85470 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp
@@ -195,7 +195,7 @@ void QSQLite2ResultPrivate::init(const char **cnames, int numCols)
     for (int i = 0; i < numCols; ++i) {
         const char* lastDot = strrchr(cnames[i], '.');
         const char* fieldName = lastDot ? lastDot + 1 : cnames[i];
-        
+
         //remove quotations around the field name if any
         QString fieldStr = QString::fromLatin1(fieldName);
         QLatin1Char quote('\"');
@@ -244,7 +244,7 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int
         firstRow.clear();
         firstRow.resize(colNum);
     }
-    
+
     switch(res) {
     case SQLITE_ROW:
         // check to see if should fill out columns
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index cac2f1dad4..5b103f1bff 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -325,7 +325,7 @@ bool QSqlQuery::isNull(int field) const
 }
 
 /*!
-  
+
   Executes the SQL in \a query. Returns true and sets the query state
   to \l{isActive()}{active} if the query was successful; otherwise
   returns false. The \a query string must use syntax appropriate for
@@ -579,7 +579,7 @@ bool QSqlQuery::seek(int index, bool relative)
 }
 
 /*!
-  
+
   Retrieves the next record in the result, if available, and positions
   the query on the retrieved record. Note that the result must be in
   the \l{isActive()}{active} state and isSelect() must return true
@@ -783,7 +783,7 @@ bool QSqlQuery::isValid() const
 }
 
 /*!
-  
+
   Returns true if the query is \e{active}. An active QSqlQuery is one
   that has been \l{QSqlQuery::exec()} {exec()'d} successfully but not
   yet finished with.  When you are finished with an active query, you
@@ -1143,7 +1143,7 @@ QString QSqlQuery::executedQuery() const
   behavior is undefined.
 
   For MySQL databases the row's auto-increment field will be returned.
-    
+
   \note For this function to work in PSQL, the table table must
   contain OIDs, which may not have been created by default.  Check the
   \c default_with_oids configuration variable to be sure.
@@ -1199,7 +1199,7 @@ QSql::NumericalPrecisionPolicy QSqlQuery::numericalPrecisionPolicy() const
   call this function, but it may be helpful in order to free resources
   such as locks or cursors if you intend to re-use the query at a
   later time.
-    
+
   Sets the query to inactive. Bound values retain their values.
 
   \sa prepare(), exec(), isActive()
@@ -1216,7 +1216,7 @@ void QSqlQuery::finish()
 
 /*!
   \since 4.4
- 
+
   Discards the current result set and navigates to the next if available.
 
   Some databases are capable of returning multiple result sets for
@@ -1224,7 +1224,7 @@ void QSqlQuery::finish()
   multiple statements). If multiple result sets are available after
   executing a query this function can be used to navigate to the next
   result set(s).
-    
+
   If a new result set is available this function will return true.
   The query will be repositioned on an \e invalid record in the new
   result set and must be navigated to a valid record before data
diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h
index a79b62cda1..9d7b71faec 100644
--- a/src/sql/models/qsqlquerymodel_p.h
+++ b/src/sql/models/qsqlquerymodel_p.h
@@ -69,7 +69,7 @@ class QSqlQueryModelPrivate: public QAbstractItemModelPrivate
 public:
     QSqlQueryModelPrivate() : atEnd(false), nestedResetLevel(0) {}
     ~QSqlQueryModelPrivate();
-    
+
     void prefetch(int);
     void initColOffsets(int size);
     int columnInQuery(int modelColumn) const;
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 7cc7de2347..fb45468d2e 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -241,7 +241,7 @@ bool QRelation::isValid()
 
 
 
-QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) : 
+QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) :
     QSqlTableModel(parent, db), firstSelect(true), relation(rel)
 {
 }
diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc
index e9f2cac531..77dcd99741 100644
--- a/src/testlib/qsignalspy.qdoc
+++ b/src/testlib/qsignalspy.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \class QSignalSpy
     \inmodule QtTest
 
diff --git a/src/testlib/qtestevent.qdoc b/src/testlib/qtestevent.qdoc
index bef4d1553a..0e7a7e7ac2 100644
--- a/src/testlib/qtestevent.qdoc
+++ b/src/testlib/qtestevent.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 
-/*! 
+/*!
     \class QTestEventList
     \inmodule QtTest
 
diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h
index a2c65e4b2a..0dfd0999f4 100644
--- a/src/tools/moc/utils.h
+++ b/src/tools/moc/utils.h
@@ -112,10 +112,10 @@ inline const char *skipQuote(const char *data)
         }
         ++data;
     }
-    
+
     if (*data)  //Skip last quote
         ++data;
-    return data; 
+    return data;
 }
 
 QT_END_NAMESPACE
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp
index b6d5965dae..c0ed7401bc 100644
--- a/src/tools/rcc/main.cpp
+++ b/src/tools/rcc/main.cpp
@@ -216,7 +216,7 @@ int runRcc(int argc, char *argv[])
     }
     QFile errorDevice;
     errorDevice.open(stderr, QIODevice::WriteOnly|QIODevice::Text);
-    
+
     if (library.verbose())
         errorDevice.write("Qt resource compiler\n");
 
@@ -251,7 +251,7 @@ int runRcc(int argc, char *argv[])
             out.write("\n");
         }
         return 0;
-    } 
+    }
 
     return library.output(out, errorDevice) ? 0 : 1;
 }
diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h
index cd9828fc35..7e16fe038d 100644
--- a/src/tools/rcc/rcc.h
+++ b/src/tools/rcc/rcc.h
@@ -95,10 +95,10 @@ public:
 
     void setResourceRoot(const QString &root) { m_resourceRoot = root; }
     QString resourceRoot() const { return m_resourceRoot; }
-    
+
     void setUseNameSpace(bool v) { m_useNameSpace = v; }
     bool useNameSpace() const { return m_useNameSpace; }
-    
+
     QStringList failedResources() const { return m_failedResources; }
 
 private:
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 44049409de..c473566e3a 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -88,8 +88,8 @@ WriteIncludes::WriteIncludes(Uic *uic)
     // and create a re-mapping of the old header "qclass.h" to it. Do not do this
     // for the "Phonon::Someclass" classes, however.
     const QString namespaceDelimiter = QLatin1String("::");
-    const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry);    
-    for(const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd;  ++it) {        
+    const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry);
+    for (const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd;  ++it) {
         const QString klass = QLatin1String(it->klass);
         const QString module = QLatin1String(it->module);
         QLatin1String header = QLatin1String(it->header);
@@ -173,7 +173,7 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head
         if (!header.isEmpty())
             break;
 
-        // Known class        
+        // Known class
         const StringMap::const_iterator it = m_classToHeader.constFind(className);
         if (it != m_classToHeader.constEnd()) {
             header = it.value();
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 9fc1a649ef..5c99ffb208 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -304,7 +304,7 @@ bool Driver::uic(const QString &fileName, QTextStream *out)
         m_output = out;
     } else {
 #ifdef Q_OS_WIN
-        // As one might also redirect the output to a file on win, 
+        // As one might also redirect the output to a file on win,
         // we should not create the textstream with QFile::Text flag.
         // The redirected file is opened in TextMode and this will
         // result in broken line endings as writing will replace \n again.
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index d748e5482f..d5353c26d5 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -64,7 +64,7 @@ static QList<QWidget*> childWidgets(const QWidget *widget)
     QList<QWidget*> widgets;
     for (int i = 0; i < list.size(); ++i) {
         QWidget *w = qobject_cast<QWidget *>(list.at(i));
-        if (w && !w->isWindow() 
+        if (w && !w->isWindow()
             && !qobject_cast<QFocusFrame*>(w)
 #if !defined(QT_NO_MENU)
             && !qobject_cast<QMenu*>(w)
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index de86e2ed7c..b563066053 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -297,7 +297,7 @@ QProgressDialog::QProgressDialog(QWidget *parent, Qt::WindowFlags f)
 
    The \a labelText is the text used to remind the user what is progressing.
 
-   The \a cancelButtonText is the text to display on the cancel button.  If 
+   The \a cancelButtonText is the text to display on the cancel button.  If
    QString() is passed then no cancel button is shown.
 
    The \a minimum and \a maximum is the number of steps in the operation for
@@ -438,7 +438,7 @@ void QProgressDialog::setCancelButton(QPushButton *cancelButton)
 
 /*!
   Sets the cancel button's text to \a cancelButtonText.  If the text
-  is set to QString() then it will cause the cancel button to be 
+  is set to QString() then it will cause the cancel button to be
   hidden and deleted.
 
   \sa setCancelButton()
diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp
index c90cf732d0..95bbe1ee55 100644
--- a/src/widgets/dialogs/qwizard_win.cpp
+++ b/src/widgets/dialogs/qwizard_win.cpp
@@ -74,7 +74,7 @@ Q_DECLARE_METATYPE(QMargins)
 QT_BEGIN_NAMESPACE
 
 //DWM related
-typedef struct  {       //MARGINS       
+typedef struct  {       //MARGINS
     int cxLeftWidth;    // width of left border that retains its size
     int cxRightWidth;   // width of right border that retains its size
     int cyTopHeight;    // height of top border that retains its size
@@ -695,14 +695,14 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q
         dib.bmiHeader.biPlanes = 1;
         dib.bmiHeader.biBitCount = 32;
         dib.bmiHeader.biCompression = BI_RGB;
- 
+
         bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0);
 
         // Set up the DC
         HFONT hCaptionFont = getCaptionFont(hTheme);
         HBITMAP hOldBmp = (HBITMAP)SelectObject(dcMem, (HGDIOBJ) bmp);
         HFONT hOldFont = (HFONT)SelectObject(dcMem, (HGDIOBJ) hCaptionFont);
- 
+
         // Draw the text!
         WIZ_DTTOPTS dto;
         dto.dwSize = sizeof(WIZ_DTTOPTS);
@@ -711,7 +711,7 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q
 
         dto.dwFlags = WIZ_DTT_COMPOSITED|WIZ_DTT_GLOWSIZE;
         dto.iGlowSize = glowSize();
- 
+
         pDrawThemeTextEx(hTheme, dcMem, 0, 0, (LPCWSTR)text.utf16(), -1, uFormat, &rctext, &dto );
         BitBlt(hdc, rect.left(), rect.top(), rect.width(), rect.height(), dcMem, 0, 0, SRCCOPY);
         SelectObject(dcMem, (HGDIOBJ) hOldBmp);
@@ -743,7 +743,7 @@ bool QVistaHelper::drawBlackRect(const QRect &rect, HDC hdc)
         dib.bmiHeader.biPlanes = 1;
         dib.bmiHeader.biBitCount = 32;
         dib.bmiHeader.biCompression = BI_RGB;
- 
+
         bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0);
         HBITMAP hOldBmp = (HBITMAP)SelectObject(dcMem, (HGDIOBJ) bmp);
 
diff --git a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
index b5d9708f99..0b6ae83ffb 100644
--- a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
@@ -57,7 +57,7 @@ mapper->addMapping(ageSpinBox, 1);
 
 
 //! [2]
-QDataWidgetMapper *mapper = new QDataWidgetMapper(); 
+QDataWidgetMapper *mapper = new QDataWidgetMapper();
 connect(myTableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
         mapper, SLOT(setCurrentModelIndex(QModelIndex)));
 //! [2]
diff --git a/src/widgets/doc/snippets/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle.cpp
index 6bb022574d..cdb4ed1d77 100644
--- a/src/widgets/doc/snippets/customviewstyle.cpp
+++ b/src/widgets/doc/snippets/customviewstyle.cpp
@@ -61,7 +61,7 @@ void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
 
             painter->restore();
         break;
-        }    
+        }
         default:
             QProxyStyle::drawPrimitive(element, option, painter, widget);
     }
diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
index 15cc53ce2d..37f02c7f13 100644
--- a/src/widgets/doc/snippets/javastyle.cpp
+++ b/src/widgets/doc/snippets/javastyle.cpp
@@ -103,7 +103,7 @@ QPalette JavaStyle::standardPalette() const
 
     palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(184, 207, 229));
     palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, Qt::black);
-    
+
     palette.setBrush(QPalette::Disabled, QPalette::Button,
                      QColor(238, 238, 238));
     palette.setBrush(QPalette::Disabled, QPalette::WindowText,
@@ -968,7 +968,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option,
                 painter->setBrush(QColor(200, 221, 242));
                 painter->drawPath(outerPath);
                 painter->setPen(QColor(200, 221, 242));
-                painter->drawRect(QRect(bottomLeft + adjustTabPoint( 
+                painter->drawRect(QRect(bottomLeft + adjustTabPoint(
                                         QPoint(2, -3), tab->shape),
                                         bottomRight + adjustTabPoint(
                                         QPoint(-2, 0), tab->shape)));
@@ -976,7 +976,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option,
                 painter->setBrush(Qt::NoBrush);
                 painter->drawPath(whitePath);
 
-                if (option->state & State_HasFocus) { 
+                if (option->state & State_HasFocus) {
                     painter->setPen(option->palette.color(QPalette::Mid));
                     painter->drawPath(innerPath);
                 }
@@ -1699,7 +1699,7 @@ void JavaStyle::drawComplexControl(ComplexControl control,
             menuOption.rect = menuRect;
 
             QStyleOptionToolButton label = *button;
-            int fw = 5; 
+            int fw = 5;
 
             drawControl(CE_ToolButtonLabel, &label, painter, widget);
             if (button->subControls & SC_ToolButtonMenu) {
@@ -1713,7 +1713,7 @@ void JavaStyle::drawComplexControl(ComplexControl control,
 
                 drawPrimitive(PE_FrameFocusRect, &focusOption, painter, widget);
             }
-            
+
             break;
         }
         case CC_ComboBox: {
@@ -2113,7 +2113,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
                     painter->drawLine(center, QPoint(center.x(),
                                       option->rect.bottom()));
                 }
-                
+
                 if (option->state & State_Children)
                     if (option->state & State_Open)
                         painter->drawPixmap(pixmapRect.topLeft(), closedPixmap);
@@ -2198,7 +2198,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
             painter->drawPoint(center.x() + 1 + add, center.y() + 1 + add);
             break;
         }
-        case PE_FrameDockWidget: { 
+        case PE_FrameDockWidget: {
             drawPrimitive(PE_FrameWindow, option, painter, widget);
             break;
         }
@@ -2226,7 +2226,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element,
                     painter->drawPoint(offset + xySwitch(QPoint(add + 8, i),
                                        horizontal));
             }
-            
+
             break;
         }
         case PE_IndicatorToolBarSeparator: {
@@ -2591,7 +2591,7 @@ int JavaStyle::styleHint(StyleHint hint, const QStyleOption *option,
             break;
         }
         case QStyle::SH_Menu_Scrollable:
-            ret = 1; 
+            ret = 1;
             break;
         default:
             ret = QCommonStyle::styleHint(hint, option, widget, returnData);
@@ -2719,7 +2719,7 @@ QSize JavaStyle::sizeFromContents(ContentsType type,
             int height = 0;
 
             if (!menuItem->icon.isNull()) {
-                width += 20; 
+                width += 20;
                 height += 20;
             }
             if (!menuItem->text.isEmpty()) {
diff --git a/src/widgets/doc/snippets/layouts/layouts.cpp b/src/widgets/doc/snippets/layouts/layouts.cpp
index c41f370070..9ec2349615 100644
--- a/src/widgets/doc/snippets/layouts/layouts.cpp
+++ b/src/widgets/doc/snippets/layouts/layouts.cpp
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
     window->show();
 //! [5]
     }
-    
+
     {
 //! [6]
     QWidget *window = new QWidget;
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
     window->show();
 //! [11]
     }
-    
+
     {
 //! [12]
     QWidget *window = new QWidget;
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
     window->setWindowTitle("QFormLayout");
 //! [23]
     window->show();
-//! [23]    
+//! [23]
     }
 
     {
diff --git a/src/widgets/doc/snippets/mainwindowsnippet.cpp b/src/widgets/doc/snippets/mainwindowsnippet.cpp
index 1ba58ca0e7..a9a9012d46 100644
--- a/src/widgets/doc/snippets/mainwindowsnippet.cpp
+++ b/src/widgets/doc/snippets/mainwindowsnippet.cpp
@@ -55,10 +55,10 @@ void MainWindow::createMenus()
     //setMenuWidget(new QPushButton("Hello"));
     QMenu *menu = new QMenu("File");
     menu->addAction("Save &As");
-    
+
     QMenuBar *bar = new QMenuBar;
     bar->addMenu(menu);
-    
+
     setMenuWidget(new QWidget());
 }
 
@@ -84,9 +84,9 @@ void MainWindow::createDockWidgets()
 
 //! [0]
     QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this);
-    dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | 
+    dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea |
 				Qt::RightDockWidgetArea);
     dockWidget->setWidget(dockWidgetContents);
-    addDockWidget(Qt::LeftDockWidgetArea, dockWidget); 
+    addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
 //! [0]
 }
diff --git a/src/widgets/doc/snippets/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiareasnippets.cpp
index 51555f8984..42902b4cd7 100644
--- a/src/widgets/doc/snippets/mdiareasnippets.cpp
+++ b/src/widgets/doc/snippets/mdiareasnippets.cpp
@@ -57,7 +57,7 @@ void addingSubWindowsExample()
 {
     QWidget *internalWidget1 = new QWidget;
     QWidget *internalWidget2 = new QWidget;
-    
+
 //! [1]
     QMdiArea mdiArea;
     QMdiSubWindow *subWindow1 = new QMdiSubWindow;
diff --git a/src/widgets/doc/snippets/myscrollarea.cpp b/src/widgets/doc/snippets/myscrollarea.cpp
index 48434952c3..675acf89ef 100644
--- a/src/widgets/doc/snippets/myscrollarea.cpp
+++ b/src/widgets/doc/snippets/myscrollarea.cpp
@@ -121,7 +121,7 @@ int main(int argv, char **args)
     MyScrollArea area(&label);
     area.resize(300, 300);
     area.show();
-    
+
     area.setWidget(&label);
 
     return app.exec();
diff --git a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
index d9f9853d9c..85b5baf56e 100644
--- a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
@@ -117,7 +117,7 @@ void MainWindow::averageItems()
     foreach (item, selected) {
         bool ok;
         double value = item->text().toDouble(&ok);
-        
+
         if (ok && !item->text().isEmpty()) {
             total += value;
             number++;
diff --git a/src/widgets/doc/snippets/simplemodel-use/main.cpp b/src/widgets/doc/snippets/simplemodel-use/main.cpp
index ed435f9897..d291a02b6b 100644
--- a/src/widgets/doc/snippets/simplemodel-use/main.cpp
+++ b/src/widgets/doc/snippets/simplemodel-use/main.cpp
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     title->setBackgroundRole(QPalette::Base);
     title->setMargin(8);
     layout->addWidget(title);
-    
+
 //! [0]
     QFileSystemModel *model = new QFileSystemModel;
     QModelIndex parentIndex = model->index(QDir::currentPath());
diff --git a/src/widgets/doc/snippets/stringlistmodel/model.cpp b/src/widgets/doc/snippets/stringlistmodel/model.cpp
index 3bf91ec326..b1fa2abdf0 100644
--- a/src/widgets/doc/snippets/stringlistmodel/model.cpp
+++ b/src/widgets/doc/snippets/stringlistmodel/model.cpp
@@ -60,7 +60,7 @@ int StringListModel::rowCount(const QModelIndex &parent) const
 
 
 #ifdef 0
-// This represents a read-only version of data(), an early stage in the 
+// This represents a read-only version of data(), an early stage in the
 // development of the example leading to an editable StringListModel.
 
 /*!
@@ -103,7 +103,7 @@ QVariant StringListModel::data(const QModelIndex &index, int role) const
 
     if (index.row() >= stringList.size())
         return QVariant();
-        
+
     if (role == Qt::DisplayRole || role == Qt::EditRole)
         return stringList.at(index.row());
     else
diff --git a/src/widgets/doc/snippets/timeline/main.cpp b/src/widgets/doc/snippets/timeline/main.cpp
index eb2e8a2c70..9e4d218a88 100644
--- a/src/widgets/doc/snippets/timeline/main.cpp
+++ b/src/widgets/doc/snippets/timeline/main.cpp
@@ -47,17 +47,17 @@ int main(int argv, char *args[])
 
 //! [0]
     QGraphicsItem *ball = new QGraphicsEllipseItem(0, 0, 20, 20);
-    
+
     QTimeLine *timer = new QTimeLine(5000);
     timer->setFrameRange(0, 100);
-    
+
     QGraphicsItemAnimation *animation = new QGraphicsItemAnimation;
     animation->setItem(ball);
     animation->setTimeLine(timer);
 
-    for (int i = 0; i < 200; ++i) 
+    for (int i = 0; i < 200; ++i)
 	animation->setPosAt(i / 200.0, QPointF(i, i));
-    
+
     QGraphicsScene *scene = new QGraphicsScene();
     scene->setSceneRect(0, 0, 250, 250);
     scene->addItem(ball);
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc
index a1c6a29066..6bcd0943a1 100644
--- a/src/widgets/doc/src/model-view-programming.qdoc
+++ b/src/widgets/doc/src/model-view-programming.qdoc
@@ -280,7 +280,7 @@
 
     In the above example, we neglected to mention how to handle selections
     of items. This subject is covered in more detail in the section about
-    \l{Handling Selections in Item Views}. 
+    \l{Handling Selections in Item Views}.
 
     \section1 Model classes
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 5cb7775c32..427d5a24d6 100644
--- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -34,7 +34,7 @@
     \keyword keyboard focus
 
     Qt's widgets handle keyboard focus in the ways that have become
-    customary in GUIs. 
+    customary in GUIs.
 
     The basic issue is that the user's key strokes can be directed at any
     of several windows on the screen, and any of several widgets inside
@@ -47,7 +47,7 @@
     \section1 Focus Motion
 
     The customs which have evolved for directing keyboard focus to a
-    particular widget are these: 
+    particular widget are these:
 
     \list 1
 
@@ -89,7 +89,7 @@
     For example, in a data entry dialog, there might be a field that
     is only necessary in one per cent of all cases. In such a dialog,
     \uicontrol Tab could skip this field, and the dialog could use one of
-    these mechanisms: 
+    these mechanisms:
 
     \list 1
 
diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
index b658fc809c..f74da2fa0a 100644
--- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
@@ -70,7 +70,7 @@
     \endlist
 
     \section1 Qt's Layout Classes
-    
+
     Qt's layout classes were designed for hand-written C++ code, allowing
     measurements to be specified in pixels for simplicity, so they are easy to
     understand and use. The code generated for forms created using Qt Designer also
@@ -136,11 +136,11 @@
     the fifth argument to QGridLayout::addWidget().
 
     QFormLayout will add two widgets on a row, commonly a QLabel and a QLineEdit
-    to create forms. Adding a QLabel and a QLineEdit on the same row will set 
-    the QLineEdit as the QLabel's buddy. The following code will use the 
+    to create forms. Adding a QLabel and a QLineEdit on the same row will set
+    the QLineEdit as the QLabel's buddy. The following code will use the
     QFormLayout to place three \l{QPushButton}{QPushButtons} and a corresponding
-    QLineEdit on a row. 
-    
+    QLineEdit on a row.
+
     \snippet layouts/layouts.cpp 18
     \snippet layouts/layouts.cpp 19
     \snippet layouts/layouts.cpp 20
@@ -327,7 +327,7 @@
     Then we define two functions that iterate over the layout: \c{itemAt()}
     and \c{takeAt()}. These functions are used internally by the layout system
     to handle deletion of widgets. They are also available for application
-    programmers. 
+    programmers.
 
     \c{itemAt()} returns the item at the given index. \c{takeAt()} removes the
     item at the given index, and returns it. In this case we use the list index
@@ -348,7 +348,7 @@
     \snippet code/doc_src_layout.cpp 4
 
     The layout takes over responsibility of the items added. Since QLayoutItem
-    does not inherit QObject, we must delete the items manually. In the 
+    does not inherit QObject, we must delete the items manually. In the
     destructor, we remove each item from the list using \c{takeAt()}, and
     then delete it.
 
diff --git a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
index 5aae7fb02b..1f1d8154da 100644
--- a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
+++ b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc
@@ -29,7 +29,7 @@
     \group standard-dialogs
     \ingroup qt-gui-concepts
     \title Standard Dialogs
-    \brief A list of Qt classes for implementing standard dialogs. 
+    \brief A list of Qt classes for implementing standard dialogs.
 */
 
 /*!
@@ -37,7 +37,7 @@
     \title Dialog Windows
     \ingroup qt-gui-concepts
     \brief An overview over dialog windows.
-    
+
     \previouspage Application Main Window
     \contentspage Application Windows and Dialogs
     \nextpage Desktop Integration
diff --git a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
index 1d7d9d1b4c..9315acb85f 100644
--- a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -49,7 +49,7 @@
     be listed in the desktop's task bar. This is usually only wanted for one
     window in the application, the \e{primary window}.
 
-    In addition, a QWidget that has a parent can become a window by setting the 
+    In addition, a QWidget that has a parent can become a window by setting the
     Qt::Window flag. Depending on the window management system
     such \e{secondary windows} are usually stacked on top of their respective parent
     window, and not have a task bar entry of their own.
diff --git a/src/widgets/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp
index 8e3d4a62f8..b8955aa23f 100644
--- a/src/widgets/graphicsview/qgraphicslayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicslayout_p.cpp
@@ -187,7 +187,7 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item)
                 layout->invalidate();   // ### LOOKS SUSPICIOUSLY WRONG!!???
             }
         }
-        
+
         for (int i = layout->count() - 1; i >= 0; --i) {
             QGraphicsLayoutItem *childItem = layout->itemAt(i);
             if (childItem)
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index c3661f5c50..3fed14cd4f 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -248,7 +248,7 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b
                 if (right)
                     r = qMax(r, wr.right() - lir.right());
             }
-        }        
+        }
     }
 #endif
     if (left)
@@ -509,7 +509,7 @@ void QBoxLayoutPrivate::calcHfw(int w)
 
     \list
     \li setContentsMargins() sets the width of the outer border on
-       each side of the widget. This is the width of the reserved space 
+       each side of the widget. This is the width of the reserved space
        along each of the QBoxLayout's four sides.
     \li setSpacing() sets the width between neighboring boxes. (You
        can use addSpacing() to get more space at a particular spot.)
@@ -595,7 +595,7 @@ int QBoxLayout::spacing() const
 
 /*!
   Reimplements QLayout::setSpacing(). Sets the spacing
-  property to \a spacing. 
+  property to \a spacing.
 
   \sa QLayout::setSpacing(), spacing()
  */
diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc
index 15ddd3b32f..789a812afb 100644
--- a/src/widgets/kernel/qdesktopwidget.qdoc
+++ b/src/widgets/kernel/qdesktopwidget.qdoc
@@ -120,9 +120,9 @@
 
 /*!
     \fn int QDesktopWidget::numScreens() const
-    
+
     Returns the number of available screens.
-    
+
     \obsolete
 
     This function is deprecated. Use screenCount instead.
@@ -239,7 +239,7 @@
     \brief the number of screens currently available on the system.
 
     \since 4.6
-    
+
     \sa screenCountChanged()
 */
 
@@ -265,6 +265,6 @@
     \since 4.6
 
     This signal is emitted when the number of screens changes to \a newCount.
-    
+
     \sa screenCount
 */
diff --git a/src/widgets/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp
index 24ae437b48..2767bd9924 100644
--- a/src/widgets/kernel/qgesture.cpp
+++ b/src/widgets/kernel/qgesture.cpp
@@ -367,7 +367,7 @@ void QPanGesture::setAcceleration(qreal value)
 
 /*!
     \enum QPinchGesture::ChangeFlag
-    
+
     This enum describes the changes that can occur to the properties of
     the gesture object.
 
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 493a04d2ba..c32eddd148 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -1270,7 +1270,7 @@ QRect QLayout::alignmentRect(const QRect &r) const
     Removes the widget \a widget from the layout. After this call, it
     is the caller's responsibility to give the widget a reasonable
     geometry or to put the widget back into a layout.
-    
+
     \b{Note:} The ownership of \a widget remains the same as
     when it was added.
 
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 31276d015d..6524d8f2b8 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -150,7 +150,7 @@ QSizePolicy::operator QVariant() const
     \brief The QWidgetItem class is a layout item that represents a widget.
 
     \inmodule QtWidgets
- 
+
     Normally, you don't need to use this class directly. Qt's
     built-in layout managers provide the following functions for
     manipulating widgets in layouts:
@@ -446,20 +446,20 @@ void QWidgetItem::setGeometry(const QRect &rect)
     QRect r = !wid->testAttribute(Qt::WA_LayoutUsesWidgetRect)
             ? fromLayoutItemRect(wid->d_func(), rect)
             : rect;
-    const QSize widgetRectSurplus = r.size() - rect.size(); 
-
-    /* 
-       For historical reasons, this code is done using widget rect 
-       coordinates, not layout item rect coordinates. However, 
-       QWidgetItem's sizeHint(), maximumSize(), and heightForWidth() 
-       all work in terms of layout item rect coordinates, so we have to 
-       add or subtract widgetRectSurplus here and there. The code could 
-       be much simpler if we did everything using layout item rect 
-       coordinates and did the conversion right before the call to 
-       QWidget::setGeometry(). 
-     */ 
-
-    QSize s = r.size().boundedTo(maximumSize() + widgetRectSurplus);  
+    const QSize widgetRectSurplus = r.size() - rect.size();
+
+    /*
+       For historical reasons, this code is done using widget rect
+       coordinates, not layout item rect coordinates. However,
+       QWidgetItem's sizeHint(), maximumSize(), and heightForWidth()
+       all work in terms of layout item rect coordinates, so we have to
+       add or subtract widgetRectSurplus here and there. The code could
+       be much simpler if we did everything using layout item rect
+       coordinates and did the conversion right before the call to
+       QWidget::setGeometry().
+     */
+
+    QSize s = r.size().boundedTo(maximumSize() + widgetRectSurplus);
     int x = r.x();
     int y = r.y();
     if (align & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask)) {
@@ -474,8 +474,8 @@ void QWidgetItem::setGeometry(const QRect &rect)
             s.setWidth(qMin(s.width(), pref.width()));
         if (align & Qt::AlignVertical_Mask) {
             if (hasHeightForWidth())
-                s.setHeight(qMin(s.height(), 
-                                 heightForWidth(s.width() - widgetRectSurplus.width()) 
+                s.setHeight(qMin(s.height(),
+                                 heightForWidth(s.width() - widgetRectSurplus.width())
                                  + widgetRectSurplus.height()));
             else
                 s.setHeight(qMin(s.height(), pref.height()));
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 7840cddd5d..39cbe1da3f 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -678,7 +678,7 @@ void QWidget::setAutoFillBackground(bool enabled)
     (to move the keyboard focus), and passes on most of the other events to
     one of the more specialized handlers above.
 
-    Events and the mechanism used to deliver them are covered in 
+    Events and the mechanism used to deliver them are covered in
     \l{The Event System}.
 
     \section1 Groups of Functions and Properties
@@ -9284,7 +9284,7 @@ int QWidget::heightForWidth(int w) const
     \since 5.0
 
     Returns true if the widget's preferred height depends on its width; otherwise returns false.
-*/ 
+*/
 bool QWidget::hasHeightForWidth() const
 {
     Q_D(const QWidget);
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index b65ce29b84..43a49e52f9 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -1033,6 +1033,6 @@ void qt_qpa_set_cursor(QWidget *w, bool force)
         unsetCursor(nativeParent);
     }
 }
-#endif //QT_NO_CURSOR 
+#endif //QT_NO_CURSOR
 
 QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h
index 3956445bc8..93c0898197 100644
--- a/src/widgets/kernel/qwidgetaction.h
+++ b/src/widgets/kernel/qwidgetaction.h
@@ -59,13 +59,13 @@ class Q_WIDGETS_EXPORT QWidgetAction : public QAction
 public:
     explicit QWidgetAction(QObject *parent);
     virtual ~QWidgetAction();
-    
+
     void setDefaultWidget(QWidget *w);
     QWidget *defaultWidget() const;
 
     QWidget *requestWidget(QWidget *parent);
     void releaseWidget(QWidget *widget);
-    
+
 protected:
     virtual bool event(QEvent *);
     virtual bool eventFilter(QObject *, QEvent *);
diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h
index a95fe07534..2fc5dcd86c 100644
--- a/src/widgets/kernel/qwidgetaction_p.h
+++ b/src/widgets/kernel/qwidgetaction_p.h
@@ -66,7 +66,7 @@ public:
     QList<QWidget *> createdWidgets;
     uint defaultWidgetInUse : 1;
     uint autoCreated : 1; // created by QToolBar::addWidget and the like
-    
+
     inline void _q_widgetDestroyed(QObject *o) {
         createdWidgets.removeAll(static_cast<QWidget *>(o));
     }
diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp
index e574dd7406..1c2a4b373e 100644
--- a/src/widgets/statemachine/qguistatemachine.cpp
+++ b/src/widgets/statemachine/qguistatemachine.cpp
@@ -138,7 +138,7 @@ static QEvent *cloneEvent(QEvent *e)
         return new QEvent(*e);
     case QEvent::DeferredDelete:
         return new QEvent(*e);
-#ifndef QT_NO_DRAGANDDROP 
+#ifndef QT_NO_DRAGANDDROP
    case QEvent::DragEnter:
         return new QDragEnterEvent(*static_cast<QDragEnterEvent*>(e));
     case QEvent::DragMove:
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 269b887909..e2c5bab47f 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -3003,7 +3003,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
     case SE_ToolBarHandle:
         if (const QStyleOptionToolBar *tbopt = qstyleoption_cast<const QStyleOptionToolBar *>(opt)) {
             if (tbopt->features & QStyleOptionToolBar::Movable) {
-                ///we need to access the widget here because the style option doesn't 
+                ///we need to access the widget here because the style option doesn't
                 //have all the information we need (ie. the layout's margin)
                 const QToolBar *tb = qobject_cast<const QToolBar*>(widget);
                 const int margin = tb && tb->layout() ? tb->layout()->margin() : 2;
diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h
index d11f57dac0..01eca4664f 100644
--- a/src/widgets/styles/qcommonstyle.h
+++ b/src/widgets/styles/qcommonstyle.h
@@ -51,7 +51,7 @@ class QCommonStylePrivate;
 class Q_WIDGETS_EXPORT QCommonStyle: public QStyle
 {
     Q_OBJECT
-    
+
 public:
     QCommonStyle();
     ~QCommonStyle();
diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp
index 0f73a16bcb..1c154650c8 100644
--- a/src/widgets/styles/qdrawutil.cpp
+++ b/src/widgets/styles/qdrawutil.cpp
@@ -748,10 +748,10 @@ void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &c,
     \since 4.6
 
     \inmodule QtWidgets
- 
+
     \brief The QTileRules class provides the rules used to draw a
     pixmap or image split into nine segments.
- 
+
     Spliiting is similar to \l{http://www.w3.org/TR/css3-background/}{CSS3 border-images}.
 
     \sa Qt::TileRule, QMargins
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp
index 9ebab8d52d..8c9fc93288 100644
--- a/src/widgets/styles/qgtkstyle.cpp
+++ b/src/widgets/styles/qgtkstyle.cpp
@@ -2121,7 +2121,7 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom
             label.state = bflags;
             GtkWidget *gtkButton = d->gtkWidget("GtkToolButton.GtkButton");
             QPalette pal = toolbutton->palette;
-            if (option->state & State_Enabled && 
+            if (option->state & State_Enabled &&
                 option->state & State_MouseOver && !(widget && widget->testAttribute(Qt::WA_SetPalette))) {
                 GdkColor gdkText = d->gtk_widget_get_style(gtkButton)->fg[GTK_STATE_PRELIGHT];
                 QColor textColor = QColor(gdkText.red>>8, gdkText.green>>8, gdkText.blue>>8);
@@ -2971,7 +2971,7 @@ void QGtkStyle::drawControl(ControlElement element,
 
             if (option->state & State_Sunken)
                 shadow = GTK_SHADOW_IN;
-            
+
             gtkPainter->paintBox(gtkTreeHeader, "button", option->rect.adjusted(-1, 0, 0, 0), state, shadow, d->gtk_widget_get_style(gtkTreeHeader));
         }
 
diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
index 9f5299032f..9ee464667a 100644
--- a/src/widgets/styles/qmacstyle.qdoc
+++ b/src/widgets/styles/qmacstyle.qdoc
@@ -104,43 +104,43 @@
 */
 
 /*! \fn void QMacStyle::polish(QPalette &pal)
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::polish(QApplication *)
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::unpolish(QApplication *)
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::polish(QWidget* w)
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::unpolish(QWidget* w)
-    \reimp 
+    \reimp
 */
 
 /*! \fn int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QPalette QMacStyle::standardPalette() const
-    \reimp 
+    \reimp
 */
 
 /*! \fn int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *hret) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QPixmap QMacStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QPixmap QMacStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*!
@@ -199,41 +199,41 @@
 
 /*! \fn void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const
 
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w) const
 
-    \reimp 
+    \reimp
 */
 
 /*! \fn QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *widget) const
 
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QRect QMacStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &csz, const QWidget *widget) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn void QMacStyle::drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal, bool enabled, const QString &text, QPalette::ColorRole textRole) const
-    \reimp 
+    \reimp
 */
 
 /*! \fn bool QMacStyle::event(QEvent *e)
-    \reimp 
+    \reimp
 */
 
 /*! \fn QIcon QMacStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index 9a8d768e2a..18eb5e6c44 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -41,7 +41,7 @@
 
 /*
   Note: The qdoc comments for QMacStyle are contained in
-  .../doc/src/qstyles.qdoc. 
+  .../doc/src/qstyles.qdoc.
 */
 
 #include <Cocoa/Cocoa.h>
@@ -3402,7 +3402,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                                 } else {
                                     pr.setHeight(pixmap.size().height() + 6);
                                     cr.adjust(0, pr.bottom(), 0, -3);
-                                }       
+                                }
                                 alignment |= Qt::AlignCenter;
                             } else {
                                 pr.setWidth(pixmap.width() + 8);
@@ -5292,7 +5292,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
                     else
                         x += br.width() / 2 - p->fontMetrics().width(titlebar->text) / 2;
                     if (iw)
-                        p->drawPixmap(x - iw, y, 
+                        p->drawPixmap(x - iw, y,
                                       titlebar->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize), QIcon::Normal));
                     drawItemText(p, br, Qt::AlignCenter, opt->palette, tds == kThemeStateActive,
                                     titlebar->text, QPalette::Text);
@@ -6002,12 +6002,12 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                 ------------------------------  <- top of stack widget
 
 
-        To summarize: 
-             * 2 is the distance between the pane and the contentsRect 
+        To summarize:
+             * 2 is the distance between the pane and the contentsRect
              * The 14 and the 1's are the distance from the contentsRect to the stack widget.
                (same value as used in SE_TabWidgetTabContents)
              * overlap is how much the pane should overlap the tab bar
-        */	
+        */
         // then add the size between the stackwidget and the "contentsRect"
 
         if (const QStyleOptionTabWidgetFrame *twf
diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp
index 911223cae2..d89390cb01 100644
--- a/src/widgets/styles/qproxystyle.cpp
+++ b/src/widgets/styles/qproxystyle.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     \since 4.6
 
     \inmodule QtWidgets
- 
+
     A QProxyStyle wraps a QStyle (usually the default system style) for the
     purpose of dynamically overriding painting or other specific style behavior.
 
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 1d4e4bd570..c3f22994ca 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -137,7 +137,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     state.
 
     \endtable
-    
+
     For more information about widget styling and appearance, see the
     \l{Styles and Style Aware Widgets}.
 */
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index eff6837c5a..6eb81e8fb8 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -374,7 +374,7 @@ QStyleOption &QStyleOption::operator=(const QStyleOption &other)
     parameters for drawing a focus rectangle with QStyle.
 
     \inmodule QtWidgets
- 
+
     For performance reasons, the access to the member variables is
     direct (i.e., using the \c . or \c -> operator). This low-level feel
     makes the structures straightforward to use and emphasizes that
@@ -458,7 +458,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
     parameters for drawing a frame.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionFrame is used for drawing several built-in Qt widgets,
     including QFrame, QGroupBox, QLineEdit, and QMenu.
 
@@ -738,7 +738,7 @@ QStyleOptionGroupBox::QStyleOptionGroupBox(int version)
     parameters for drawing a header.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionHeader contains all the information that QStyle
     functions need to draw the item views' header pane, header sort
     arrow, and header label.
@@ -925,7 +925,7 @@ QStyleOptionHeader::QStyleOptionHeader(int version)
     parameters for drawing buttons.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionButton contains all the information that QStyle
     functions need to draw graphical elements like QPushButton,
     QCheckBox, and QRadioButton.
@@ -1237,7 +1237,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
     parameters for drawing a tab bar.
 
     \inmodule QtWidgets
- 
+
     The QStyleOptionTab class is used for drawing several built-in Qt
     widgets including \l QTabBar and the panel for \l QTabWidget.
 
@@ -1662,7 +1662,7 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version)
     parameter necessary for drawing a menu item.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionMenuItem contains all the information that QStyle
     functions need to draw the menu items from \l QMenu. It is also
     used for drawing other menu-related widgets.
@@ -1862,7 +1862,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
     common to all complex controls.
 
     \inmodule QtWidgets
- 
+
     This class is not used on its own. Instead it is used to derive
     other complex control options, for example QStyleOptionSlider and
     QStyleOptionSpinBox.
@@ -1953,7 +1953,7 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type)
     parameters needed for drawing a slider.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionSlider contains all the information that QStyle
     functions need to draw QSlider and QScrollBar.
 
@@ -2152,7 +2152,7 @@ QStyleOptionSlider::QStyleOptionSlider(int version)
     parameters necessary for drawing a spin box.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionSpinBox contains all the information that QStyle
     functions need to draw QSpinBox and QDateTimeEdit.
 
@@ -2257,7 +2257,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
     parameters for drawing a dock widget.
 
     \inmodule QtWidgets
- 
+
     QStyleOptionDockWidget contains all the information that QStyle
     functions need to draw graphical elements like QDockWidget.
 
diff --git a/src/widgets/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp
index 2b30bf5a2d..55c9495b1a 100644
--- a/src/widgets/styles/qwindowsmobilestyle.cpp
+++ b/src/widgets/styles/qwindowsmobilestyle.cpp
@@ -90,7 +90,7 @@ static const int windowsMobileExclusiveIndicatorSize = 14;
 static const int windowsMobileSliderThickness        = 6;
 static const int windowsMobileIconSize               = 16;
 static const int PE_IndicatorArrowUpBig         = 0xf000101;
-static const int PE_IndicatorArrowDownBig       = 0xf000102;  
+static const int PE_IndicatorArrowDownBig       = 0xf000102;
 static const int PE_IndicatorArrowLeftBig       = 0xf000103;
 static const int PE_IndicatorArrowRightBig      = 0xf000104;
 
@@ -241,7 +241,7 @@ static const char *const radiochecked_xpm[] = {
 static const char * const radiochecked_low_xpm[] = {
     "9 9 2 1",
     "         c None",
-    ".        c #000000", 
+    ".        c #000000",
     "   ...   ",
     " ....... ",
     " ....... ",
@@ -3904,39 +3904,39 @@ QColor fromHsl(QColor c)
     qreal ca[3] = {0, 0, 0};
 
     if (s == 0 || h == 1) {
-        // achromatic case 
+        // achromatic case
         ca[0] = ca[1] = ca[2] = l;
-    } else { 
-        // chromatic case 
-        qreal temp2; 
-        if (l < qreal(0.5)) 
-            temp2 = l * (qreal(1.0) + s); 
-        else 
-            temp2 = l + s - (l * s); 
-
-        const qreal temp1 = (qreal(2.0) * l) - temp2; 
-        qreal temp3[3] = { h + (qreal(1.0) / qreal(3.0)), 
-            h, 
-            h - (qreal(1.0) / qreal(3.0)) }; 
-
-        for (int i = 0; i != 3; ++i) { 
-            if (temp3[i] < qreal(0.0)) 
-                temp3[i] += qreal(1.0); 
-            else if (temp3[i] > qreal(1.0)) 
+    } else {
+        // chromatic case
+        qreal temp2;
+        if (l < qreal(0.5))
+            temp2 = l * (qreal(1.0) + s);
+        else
+            temp2 = l + s - (l * s);
+
+        const qreal temp1 = (qreal(2.0) * l) - temp2;
+        qreal temp3[3] = { h + (qreal(1.0) / qreal(3.0)),
+            h,
+            h - (qreal(1.0) / qreal(3.0)) };
+
+        for (int i = 0; i != 3; ++i) {
+            if (temp3[i] < qreal(0.0))
+                temp3[i] += qreal(1.0);
+            else if (temp3[i] > qreal(1.0))
                 temp3[i] -= qreal(1.0);
 
             const qreal sixtemp3 = temp3[i] * qreal(6.0);
 
-            if (sixtemp3 < qreal(1.0)) 
-                ca[i] = ((temp1 + (temp2 - temp1) * sixtemp3)); 
-            else if ((temp3[i] * qreal(2.0)) < qreal(1.0)) 
-                ca[i] = (temp2); 
-            else if ((temp3[i] * qreal(3.0)) < qreal(2.0)) 
+            if (sixtemp3 < qreal(1.0))
+                ca[i] = ((temp1 + (temp2 - temp1) * sixtemp3));
+            else if ((temp3[i] * qreal(2.0)) < qreal(1.0))
+                ca[i] = (temp2);
+            else if ((temp3[i] * qreal(3.0)) < qreal(2.0))
                 ca[i] = temp1 + (temp2 -temp1) * (qreal(2.0) /qreal(3.0) - temp3[i]) * qreal(6.0);
             else ca[i] = temp1;
         }
     }
-    
+
     return QColor::fromRgbF(ca[0], ca[1], ca[2]);
 }
 
@@ -3945,7 +3945,7 @@ QColor fromHsl(QColor c)
 
 QColor toHsl(QColor c)
 {
-    QColor color; 
+    QColor color;
     qreal h;
     qreal s;
     qreal l;
@@ -3953,36 +3953,36 @@ QColor toHsl(QColor c)
     const qreal r = c.redF();
     const qreal g = c.greenF();
     const qreal b = c.blueF();
-    const qreal max = Q_MAX_3(r, g, b); 
-    const qreal min = Q_MIN_3(r, g, b); 
-    const qreal delta = max - min;  
-    const qreal delta2 = max + min; 
-    const qreal lightness = qreal(0.5) * delta2; 
+    const qreal max = Q_MAX_3(r, g, b);
+    const qreal min = Q_MIN_3(r, g, b);
+    const qreal delta = max - min;
+    const qreal delta2 = max + min;
+    const qreal lightness = qreal(0.5) * delta2;
     l = (lightness);
-    if (qFuzzyIsNull(delta)) { 
-        // achromatic case, hue is undefined 
+    if (qFuzzyIsNull(delta)) {
+        // achromatic case, hue is undefined
         h = 0;
-        s = 0; 
+        s = 0;
     } else {
-        // chromatic case 
-        qreal hue = 0; 
-        if (lightness < qreal(0.5)) 
-            s = ((delta / delta2)); 
-        else 
-            s = ((delta / (qreal(2.0) - delta2))); 
-        if (qFuzzyCompare(r, max)) { 
-            hue = ((g - b) /delta); 
-        } else if (qFuzzyCompare(g, max)) { 
-            hue = (2.0 + (b - r) / delta); 
-        } else if (qFuzzyCompare(b, max)) { 
-            hue = (4.0 + (r - g) / delta); 
-        } else { 
-            Q_ASSERT_X(false, "QColor::toHsv", "internal error"); 
+        // chromatic case
+        qreal hue = 0;
+        if (lightness < qreal(0.5))
+            s = ((delta / delta2));
+        else
+            s = ((delta / (qreal(2.0) - delta2)));
+        if (qFuzzyCompare(r, max)) {
+            hue = ((g - b) /delta);
+        } else if (qFuzzyCompare(g, max)) {
+            hue = (2.0 + (b - r) / delta);
+        } else if (qFuzzyCompare(b, max)) {
+            hue = (4.0 + (r - g) / delta);
+        } else {
+            Q_ASSERT_X(false, "QColor::toHsv", "internal error");
         }
-        hue *= 60.0; 
-        if (hue < 0.0) 
-            hue += 360.0; 
-        h = (hue * 100); 
+        hue *= 60.0;
+        if (hue < 0.0)
+            hue += 360.0;
+        h = (hue * 100);
     }
 
     h = h / 36000;
@@ -4083,7 +4083,7 @@ void QWindowsMobileStylePrivate::tintListViewHighlight(QColor color)
 
     imageListViewHighlightMiddle = QImage(listviewhighmiddle_xpm);
     tintImage(&imageListViewHighlightMiddle, color, qreal(0.0));
-     
+
      int height = imageListViewHighlightMiddle.height();
      if (!doubleControls) {
          height = height / 2;
@@ -4218,7 +4218,7 @@ void QWindowsMobileStylePrivate::drawPanelItemViewSelected(QPainter *painter, co
         QRect r;
         if (rect.isValid())
             r = rect;
-        else 
+        else
             r = option->rect;
         tintImagesHigh(option->palette.highlight().color());
 
@@ -4892,7 +4892,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp
             } else {
                 QRect r = QRect(option->rect.x(), option->rect.y(), windowsMobileitemViewCheckBoxSize, windowsMobileitemViewCheckBoxSize);
                 qDrawPlainRect(painter, r, option->palette.shadow().color(), 1);
-            }            
+            }
             if (option->state & State_Enabled)
                 d->imageChecked.setColor(1, option->palette.shadow().color().rgba());
             else
@@ -5129,7 +5129,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp
                 image.setColor(1, color.rgba());
                 painter->drawImage(option->rect.x() + xoffset, option->rect.y() + yoffset, image);
             }
-            else {                
+            else {
                  QPoint points[7];
                  switch (element) {
                      case PE_IndicatorArrowUp:
@@ -5194,7 +5194,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp
                         painter->drawLine(points[2], points[3]);
                         painter->drawLine(points[4], points[5]);
                         painter->drawPoint(points[6]);
-                    }                
+                    }
             }
         painter->restore();
         break; }
@@ -5432,7 +5432,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption
 
    QWindowsMobileStylePrivate *d = const_cast<QWindowsMobileStylePrivate*>(d_func());
 
-   
+
    painter->setClipping(false);
    switch (element) {
    case CE_MenuBarEmptyArea:
@@ -5527,7 +5527,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption
         break;
     case CE_TabBarTabShape:
         if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(option)) {
-            
+
             if (tab->shape == QTabBar::RoundedNorth || tab->shape == QTabBar::RoundedEast ||
                 tab->shape == QTabBar::RoundedSouth || tab->shape == QTabBar::RoundedWest) {
                     d->drawTabBarTab(painter, tab);
@@ -5564,7 +5564,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption
             proxy()->drawControl(CE_HeaderSection, header, painter, widget);
             QStyleOptionHeader subopt = *header;
             subopt.rect = proxy()->subElementRect(SE_HeaderLabel, header, widget);
-            if (header->state & State_Sunken) 
+            if (header->state & State_Sunken)
                 subopt.palette.setColor(QPalette::ButtonText, header->palette.brightText().color());
             subopt.state |= QStyle::State_On;
             if (subopt.rect.isValid())
@@ -7079,7 +7079,7 @@ int QWindowsMobileStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, co
        }
         break;
    case PM_ScrollBarExtent: {
-       
+
        if (d->smartphone)
            ret = 9;
        else
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
index e9bc17f78f..0102bc2b7d 100644
--- a/src/widgets/styles/qwindowsvistastyle.cpp
+++ b/src/widgets/styles/qwindowsvistastyle.cpp
@@ -273,15 +273,15 @@ void QWindowsVistaAnimation::paint(QPainter *painter, const QStyleOption *option
 
 /*!
  \internal
- 
+
   Animations are used for some state transitions on specific widgets.
- 
+
   Only one running animation can exist for a widget at any specific
   time.  Animations can be added through
   QWindowsVistaStylePrivate::startAnimation(Animation *) and any
   existing animation on a widget can be retrieved with
   QWindowsVistaStylePrivate::widgetAnimation(Widget *).
- 
+
   Once an animation has been started,
   QWindowsVistaStylePrivate::timerEvent(QTimerEvent *) will
   continuously call update() on the widget until it is stopped,
@@ -798,17 +798,17 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
                             || vopt->viewItemPosition == QStyleOptionViewItem::Invalid)
                             painter->drawPixmap(pixmapRect.topLeft(), pixmap);
                         else if (reverse ? rightSection : leftSection){
-                            painter->drawPixmap(QRect(pixmapRect.topLeft(), 
-                                                QSize(frame, pixmapRect.height())), pixmap, 
+                            painter->drawPixmap(QRect(pixmapRect.topLeft(),
+                                                QSize(frame, pixmapRect.height())), pixmap,
                                                 QRect(QPoint(0, 0), QSize(frame, pixmapRect.height())));
-                            painter->drawPixmap(pixmapRect.adjusted(frame, 0, 0, 0), 
+                            painter->drawPixmap(pixmapRect.adjusted(frame, 0, 0, 0),
                                                 pixmap, srcRect.adjusted(frame, 0, -frame, 0));
                         } else if (reverse ? leftSection : rightSection) {
-                            painter->drawPixmap(QRect(pixmapRect.topRight() - QPoint(frame - 1, 0), 
-                                                QSize(frame, pixmapRect.height())), pixmap, 
-                                                QRect(QPoint(pixmapRect.width() - frame, 0), 
+                            painter->drawPixmap(QRect(pixmapRect.topRight() - QPoint(frame - 1, 0),
+                                                QSize(frame, pixmapRect.height())), pixmap,
+                                                QRect(QPoint(pixmapRect.width() - frame, 0),
                                                 QSize(frame, pixmapRect.height())));
-                            painter->drawPixmap(pixmapRect.adjusted(0, 0, -frame, 0), 
+                            painter->drawPixmap(pixmapRect.adjusted(0, 0, -frame, 0),
                                                 pixmap, srcRect.adjusted(frame, 0, -frame, 0));
                         } else if (vopt->viewItemPosition == QStyleOptionViewItem::Middle)
                             painter->drawPixmap(pixmapRect, pixmap,
@@ -1110,7 +1110,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                     } else {
                         animRect = QRect(rect.left() - glowSize + animOffset,
                                          rect.top(), glowSize, rect.height());
-                        animRect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, 
+                        animRect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight,
                                                                 option->rect, animRect);
                         pixmapSize.setWidth(animRect.width());
                     }
@@ -1156,7 +1156,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                     double vc6_workaround = ((progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * maxWidth);
                     int width = isIndeterminate ? maxWidth : qMax(int(vc6_workaround), minWidth);
                     theme.rect.setWidth(width);
-                    theme.rect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, 
+                    theme.rect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight,
                                                               option->rect, theme.rect);
                 }
                 d->drawBackground(theme);
@@ -1522,7 +1522,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
                 QStyleOptionViewItem adjustedOption = *vopt;
                 adjustedOption.palette = palette;
                 // We hide the  focusrect in singleselection as it is not required
-                if ((view->selectionMode() == QAbstractItemView::SingleSelection) 
+                if ((view->selectionMode() == QAbstractItemView::SingleSelection)
                     && !(vopt->state & State_KeyboardFocusChange))
                 adjustedOption.state &= ~State_HasFocus;
                 QWindowsXPStyle::drawControl(element, &adjustedOption, painter, widget);
@@ -1944,7 +1944,7 @@ QSize QWindowsVistaStyle::sizeFromContents(ContentsType type, const QStyleOption
             minimumHeight = qMax<qint32>(size.cy + margins.cyBottomHeight+ margins.cyTopHeight, sz.height());
             sz.rwidth() += size.cx + margins.cxLeftWidth + margins.cxRightWidth;
         }
-        
+
         if (const QStyleOptionMenuItem *menuitem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
             if (menuitem->menuItemType != QStyleOptionMenuItem::Separator)
                 sz.setHeight(minimumHeight);
diff --git a/src/widgets/util/qcolormap.qdoc b/src/widgets/util/qcolormap.qdoc
index 48fe1c7eec..ae337b511c 100644
--- a/src/widgets/util/qcolormap.qdoc
+++ b/src/widgets/util/qcolormap.qdoc
@@ -67,7 +67,7 @@
 
 /*!
     \fn QColormap::~QColormap()
-    
+
     Destroys the colormap.
 */
 
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index d8186d795d..59ec6eb10d 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -45,7 +45,7 @@
     \since 4.2
 
     \inmodule QtWidgets
- 
+
     You can use QCompleter to provide auto completions in any Qt
     widget, such as QLineEdit and QComboBox.
     When the user starts typing a word, QCompleter suggests possible ways of
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index 1670d0ab57..add372c583 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -237,7 +237,7 @@ private:
     \since 5.0
 
     \inmodule QtWidgets
- 
+
     With kinetic scrolling, the user can push the widget in a given
     direction and it will continue to scroll in this direction until it is
     stopped either by the user or by friction.  Aspects of inertia, friction
diff --git a/src/widgets/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp
index ed593ea2cb..d0d9c23b68 100644
--- a/src/widgets/util/qscrollerproperties.cpp
+++ b/src/widgets/util/qscrollerproperties.cpp
@@ -94,7 +94,7 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
     \since 4.8
 
     \inmodule QtWidgets
- 
+
     The QScrollerProperties class stores the parameters used by QScroller.
 
     The default settings are platform dependent so that Qt emulates the
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index 48bba9701c..4cae15893c 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -379,7 +379,7 @@ bool QSystemTrayIcon::supportsMessages()
 
     On Mac OS X, the Growl notification system must be installed for this function to
     display messages.
- 
+
     \sa show(), supportsMessages()
   */
 void QSystemTrayIcon::showMessage(const QString& title, const QString& msg,
diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp
index 936e1a1bc1..2184a52af7 100644
--- a/src/widgets/util/qsystemtrayicon_win.cpp
+++ b/src/widgets/util/qsystemtrayicon_win.cpp
@@ -345,12 +345,12 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result )
             case NIN_KEYSELECT:
                 if (ignoreNextMouseRelease)
                     ignoreNextMouseRelease = false;
-                else 
+                else
                     emit q->activated(QSystemTrayIcon::Trigger);
                 break;
 
             case WM_LBUTTONDBLCLK:
-                ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse 
+                ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse
                                                // release we must ignore it
                 emit q->activated(QSystemTrayIcon::DoubleClick);
                 break;
diff --git a/src/widgets/util/qsystemtrayicon_wince.cpp b/src/widgets/util/qsystemtrayicon_wince.cpp
index b6937aee2f..a0c278b1a3 100644
--- a/src/widgets/util/qsystemtrayicon_wince.cpp
+++ b/src/widgets/util/qsystemtrayicon_wince.cpp
@@ -166,7 +166,7 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result )
                 break;
 
             case WM_LBUTTONDBLCLK:
-                ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse 
+                ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse
                                                // release we must ignore it
                 emit q->activated(QSystemTrayIcon::DoubleClick);
                 break;
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index 77726adf27..eff12a7c4d 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \since 4.2
 
     \inmodule QtWidgets
- 
+
     For an overview of Qt's Undo Framework, see the
     \l{Overview of Qt's Undo Framework}{overview document}.
 
@@ -324,7 +324,7 @@ const QUndoCommand *QUndoCommand::child(int index) const
     \since 4.2
 
     \inmodule QtWidgets
- 
+
     For an overview of Qt's Undo Framework, see the
     \l{Overview of Qt's Undo Framework}{overview document}.
 
@@ -1009,7 +1009,7 @@ void QUndoStack::endMacro()
 
   This function returns a const pointer, because modifying a command,
   once it has been pushed onto the stack and executed, almost always
-  causes corruption of the state of the document, if the command is 
+  causes corruption of the state of the document, if the command is
   later undone or redone.
 
   \sa QUndoCommand::child()
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 5e9d100214..c96f77cbf2 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -380,7 +380,7 @@ void QAbstractButtonPrivate::moveFocus(int key)
     QAbstractButton *fb = qobject_cast<QAbstractButton *>(f);
     if (!fb || !buttonList.contains(fb))
         return;
-    
+
     QAbstractButton *candidate = 0;
     int bestScore = -1;
     QRect target = f->rect().translated(f->mapToGlobal(QPoint(0,0)));
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 391a06917c..b27bc2fff8 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -452,7 +452,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
     // no corner widget. Also, on the Mac we paint if there is a native
     // (transparent) sizegrip in the area where a corner widget would be.
     if ((needv && needh && hasCornerWidget == false && scrollOverlap == 0)
-        || ((needv || needh) 
+        || ((needv || needh)
 #ifdef Q_WS_MAC
         && hasMacSizeGrip
 #endif
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp
index 5932e1be9b..5372b21430 100644
--- a/src/widgets/widgets/qabstractslider.cpp
+++ b/src/widgets/widgets/qabstractslider.cpp
@@ -724,7 +724,7 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb
 #else
         // Native UI-elements on Mac can scroll hundreds of lines at a time as
         // a result of acceleration. So keep the same behaviour in Qt, and
-        // don't restrict stepsToScroll to certain maximum (pageStep): 
+        // don't restrict stepsToScroll to certain maximum (pageStep):
         stepsToScroll = int(offset_accumulated);
 #endif
         offset_accumulated -= int(offset_accumulated);
diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h
index 42f25501b1..7b07aa3be9 100644
--- a/src/widgets/widgets/qabstractslider_p.h
+++ b/src/widgets/widgets/qabstractslider_p.h
@@ -87,7 +87,7 @@ public:
     QBasicTimer repeatActionTimer;
     int repeatActionTime;
     QAbstractSlider::SliderAction repeatAction;
-    
+
 #ifdef QT_KEYPAD_NAVIGATION
     int origValue;
 
diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp
index 3da81f8360..2bd67d19e1 100644
--- a/src/widgets/widgets/qbuttongroup.cpp
+++ b/src/widgets/widgets/qbuttongroup.cpp
@@ -139,7 +139,7 @@
     \fn void QButtonGroup::buttonPressed(QAbstractButton *button)
     \since 4.2
 
-    This signal is emitted when the given \a button is pressed down. 
+    This signal is emitted when the given \a button is pressed down.
 
     \sa QAbstractButton::pressed()
 */
@@ -158,7 +158,7 @@
     \fn void QButtonGroup::buttonReleased(QAbstractButton *button)
     \since 4.2
 
-    This signal is emitted when the given \a button is released. 
+    This signal is emitted when the given \a button is released.
 
     \sa QAbstractButton::released()
 */
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 0fdf039bc3..d61ae023ef 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -2591,7 +2591,7 @@ QCalendarWidget::HorizontalHeaderFormat QCalendarWidget::horizontalHeaderFormat(
 }
 
 
-/*! 
+/*!
     \enum QCalendarWidget::VerticalHeaderFormat
 
     This enum type defines the various formats the vertical header can display.
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 0004e3d5ab..4676668610 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -282,8 +282,8 @@ private:
     QComboBox *mCombo;
 };
 
-// Note that this class is intentionally not using QStyledItemDelegate 
-// Vista does not use the new theme for combo boxes and there might 
+// Note that this class is intentionally not using QStyledItemDelegate
+// Vista does not use the new theme for combo boxes and there might
 // be other side effects from using the new class
 class QComboBoxDelegate : public QItemDelegate
 { Q_OBJECT
diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
index 7631014905..6c15e9016f 100644
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@@ -2004,7 +2004,7 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList<QDockWidget*>
             //we need to make sure the element is in the list so the dock widget can eventually be docked correctly
             if (!testing)
                 item_list.append(item);
-            
+
             //here we need to make sure we change the item in the item_list
             QDockAreaLayoutItem &lastItem = testing ? item : item_list.last();
 
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
index 8cd944e133..c43ed9848b 100644
--- a/src/widgets/widgets/qeffects.cpp
+++ b/src/widgets/widgets/qeffects.cpp
@@ -276,7 +276,7 @@ void QAlphaWidget::render()
 #endif // Q_OS_WIN
                 widget->hide();
             } else {
-                //Since we are faking the visibility of the widget 
+                //Since we are faking the visibility of the widget
                 //we need to unset the hidden state on it before calling show
                 widget->setAttribute(Qt::WA_WState_Hidden, true);
                 widget->show();
@@ -541,7 +541,7 @@ void QRollEffect::scroll()
 #endif
                 widget->hide();
             } else {
-                //Since we are faking the visibility of the widget 
+                //Since we are faking the visibility of the widget
                 //we need to unset the hidden state on it before calling show
                 widget->setAttribute(Qt::WA_WState_Hidden, true);
                 widget->show();
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index 6c8da10b8e..a491b3218b 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -121,7 +121,7 @@ void QGroupBox::initStyleOption(QStyleOptionGroupBox *option) const
             option->state |= QStyle::State_Sunken;
     }
 
-    if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active : 
+    if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active :
                                     QPalette::Disabled, QPalette::WindowText))
         option->textColor = QColor(style()->styleHint(QStyle::SH_GroupBox_TextLabelColor,
                                    option, this));
@@ -229,7 +229,7 @@ void QGroupBoxPrivate::init()
     overCheckBox = false;
     pressedControl = QStyle::SC_None;
     calculateFrame();
-    q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, 
+    q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred,
                      QSizePolicy::GroupBox));
 }
 
diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h
index cfe32df3cc..cdef4c4548 100644
--- a/src/widgets/widgets/qgroupbox.h
+++ b/src/widgets/widgets/qgroupbox.h
@@ -95,7 +95,7 @@ protected:
     void changeEvent(QEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);  
+    void mouseReleaseEvent(QMouseEvent *event);
     void initStyleOption(QStyleOptionGroupBox *option) const;
 
 
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 5187968ddf..5155df8e23 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -139,9 +139,9 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const
 
     The length of the text can be constrained to maxLength(). The text
     can be arbitrarily constrained using a validator() or an
-    inputMask(), or both. When switching between a validator and an input mask 
-    on the same line edit, it is best to clear the validator or input mask to 
-    prevent undefined behavior. 
+    inputMask(), or both. When switching between a validator and an input mask
+    on the same line edit, it is best to clear the validator or input mask to
+    prevent undefined behavior.
 
 
     A related class is QTextEdit which allows multi-line, rich text
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index 7f800d831f..10329293b3 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -180,7 +180,7 @@ void QLineEditPrivate::init(const QString& txt)
 #endif
     QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)),
             q, SLOT(updateMicroFocus()));
-    
+
     QObject::connect(control, SIGNAL(textChanged(QString)),
             q, SLOT(updateMicroFocus()));
 
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 1eadb62d5c..7077772be4 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -112,7 +112,7 @@ QMacCocoaViewContainerPrivate::~QMacCocoaViewContainerPrivate()
 
 /*!
     \fn QMacCocoaViewContainer::QMacCocoaViewContainer(void *cocoaViewToWrap, QWidget *parent)
- 
+
     Create a new QMacCocoaViewContainer using the NSView pointer in \a
     cocoaViewToWrap with parent, \a parent. QMacCocoaViewContainer will
     retain \a cocoaViewToWrap.
diff --git a/src/widgets/widgets/qmenu_wince.cpp b/src/widgets/widgets/qmenu_wince.cpp
index 68a2022e97..ec1560f5e2 100644
--- a/src/widgets/widgets/qmenu_wince.cpp
+++ b/src/widgets/widgets/qmenu_wince.cpp
@@ -116,14 +116,14 @@ static void resolveAygLibs()
     }
 }
 
-static void qt_wce_enable_soft_key(HWND handle, uint command) 
+static void qt_wce_enable_soft_key(HWND handle, uint command)
 {
     resolveAygLibs();
     if (ptrEnableSoftKey)
         ptrEnableSoftKey(handle, command, false, true);
 }
 
-static void qt_wce_disable_soft_key(HWND handle, uint command) 
+static void qt_wce_disable_soft_key(HWND handle, uint command)
 {
     resolveAygLibs();
     if (ptrEnableSoftKey)
@@ -148,7 +148,7 @@ static QAction* qt_wce_get_quit_action(QList<QAction *> actionItems)
         QAction *action = actionItems.at(i);
         if (action->menuRole() == QAction::QuitRole)
             returnAction = action;
-        else 
+        else
             if (action->menu())
                 returnAction = qt_wce_get_quit_action(action->menu()->actions());
         if (returnAction)
@@ -252,7 +252,7 @@ static void qt_wce_insert_action(HMENU menu, QWceMenuAction *action)
         if (action->action->isCheckable())
             if (action->action->isChecked())
                 CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_CHECKED);
-            else 
+            else
                 CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_UNCHECKED);
     }
 }
@@ -264,8 +264,8 @@ static void qt_wce_clear_menu(HMENU hMenu)
 }
 
 /*!
-    \internal 
-    
+    \internal
+
     This function refreshes the native Windows CE menu.
 */
 
@@ -281,8 +281,8 @@ void QMenuBarPrivate::wceRefresh()
 }
 
 /*!
-    \internal 
-    
+    \internal
+
     This function sends native Windows CE commands to Qt menus.
 */
 
@@ -293,8 +293,8 @@ QAction* QMenu::wceCommands(uint command)
 }
 
 /*!
-    \internal 
-    
+    \internal
+
     This function sends native Windows CE commands to Qt menu bars
     and all their child menus.
 */
@@ -457,7 +457,7 @@ void QMenuPrivate::QWceMenuPrivate::addAction(QWceMenuAction *action, QWceMenuAc
 
 /*!
     \internal
-    
+
     This function will return the HMENU used to create the native
     Windows CE menu bar bindings.
 */
@@ -642,7 +642,7 @@ void QMenuBarPrivate::QWceMenuBarPrivate::rebuild()
                 qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, leftButtonAction->text());
                 qt_wce_enable_soft_key(menubarHandle, leftButtonCommand);
             } else {
-                qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String(""));           
+                qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String(""));
                 qt_wce_disable_soft_key(menubarHandle, leftButtonCommand);
             }
         } else {
diff --git a/src/widgets/widgets/qmenu_wince.rc b/src/widgets/widgets/qmenu_wince.rc
index 631cd9d47a..0bcd32c7e5 100644
--- a/src/widgets/widgets/qmenu_wince.rc
+++ b/src/widgets/widgets/qmenu_wince.rc
@@ -14,19 +14,19 @@
 #define I_IMAGENONE     (-2)
 #define NOMENU          0xFFFF
 
-IDR_MAIN_MENU MENU DISCARDABLE 
+IDR_MAIN_MENU MENU DISCARDABLE
 BEGIN
     POPUP "Menu"
     BEGIN
-      MENUITEM "About",                       IDM_ABOUT  
+      MENUITEM "About",                       IDM_ABOUT
     END
 END
 
-IDR_MAIN_MENU2 MENU DISCARDABLE 
+IDR_MAIN_MENU2 MENU DISCARDABLE
 BEGIN
     POPUP "Menu"
     BEGIN
-      MENUITEM "About",                       IDM_ABOUT  
+      MENUITEM "About",                       IDM_ABOUT
     END
     POPUP "Display"
     BEGIN
@@ -35,7 +35,7 @@ BEGIN
 END
 
 
-IDR_MAIN_MENU3 MENU DISCARDABLE 
+IDR_MAIN_MENU3 MENU DISCARDABLE
 BEGIN
     POPUP "Menu1"
     BEGIN
@@ -55,7 +55,7 @@ BEGIN
     END
 END
 
-IDR_MAIN_MENU4 MENU DISCARDABLE 
+IDR_MAIN_MENU4 MENU DISCARDABLE
 BEGIN
     POPUP "Menu1"
     BEGIN
@@ -83,7 +83,7 @@ BEGIN
     END
 END
 
-IDR_MAIN_MENU5 MENU DISCARDABLE 
+IDR_MAIN_MENU5 MENU DISCARDABLE
 BEGIN
     POPUP "Menu1"
     BEGIN
@@ -119,8 +119,8 @@ BEGIN
     END
 END
 
-STRINGTABLE  
-BEGIN   
+STRINGTABLE
+BEGIN
    IDS_EXIT	"Exit"
    IDS_MENU	"Menu"
    IDS_LEFTMENU "Display"
@@ -136,31 +136,31 @@ END
 
 IDR_MAIN_MENU SHMENUBAR DISCARDABLE
 BEGIN
-    IDR_MAIN_MENU, 
+    IDR_MAIN_MENU,
     2,
 
     I_IMAGENONE, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE,
     IDS_EXIT, 0, NOMENU,
-    
+
     I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
     IDS_MENU, 0, 0,
 END
 
 IDR_MAIN_MENU2 SHMENUBAR DISCARDABLE
 BEGIN
-    IDR_MAIN_MENU2, 
+    IDR_MAIN_MENU2,
     2,
 
     I_IMAGENONE, IDM_LEFTMENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
     IDS_LEFTMENU, 0, 1,
-    
+
     I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
     IDS_MENU, 0, 0,
 END
 
 IDR_MAIN_MENU3 SHMENUBAR DISCARDABLE
 BEGIN
-    IDR_MAIN_MENU3, 
+    IDR_MAIN_MENU3,
     4,
 
     I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
@@ -178,7 +178,7 @@ END
 
 IDR_MAIN_MENU4 SHMENUBAR DISCARDABLE
 BEGIN
-    IDR_MAIN_MENU4, 
+    IDR_MAIN_MENU4,
     6,
 
     I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
@@ -202,7 +202,7 @@ END
 
 IDR_MAIN_MENU5 SHMENUBAR DISCARDABLE
 BEGIN
-    IDR_MAIN_MENU5, 
+    IDR_MAIN_MENU5,
     8,
 
     I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE,
diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h
index 1638123e0e..3154c0dedb 100644
--- a/src/widgets/widgets/qpushbutton.h
+++ b/src/widgets/widgets/qpushbutton.h
@@ -103,7 +103,7 @@ public:
 private:
     Q_DISABLE_COPY(QPushButton)
     Q_DECLARE_PRIVATE(QPushButton)
-#ifndef QT_NO_MENU        
+#ifndef QT_NO_MENU
     Q_PRIVATE_SLOT(d_func(), void _q_popupPressed())
 #endif
 };
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 590225e850..0de63a5a47 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -240,7 +240,7 @@ QWidget *QScrollArea::widget() const
     The \a widget becomes a child of the scroll area, and will be
     destroyed when the scroll area is deleted or when a new widget is
     set.
-    
+
     The widget's \l{QWidget::setAutoFillBackground()}{autoFillBackground}
     property will be set to \c{true}.
 
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index 3711b2f43e..4b24c9dfef 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -80,7 +80,7 @@ public:
    be shown during application startup.
 
    \inmodule QtWidgets
- 
+
    A splash screen is a widget that is usually displayed when an
    application is being started. Splash screens are often used for
    applications that have long start up times (e.g. database or
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index a8399ed8d5..e39b79c67a 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -1665,7 +1665,7 @@ bool QSplitter::restoreState(const QByteArray &state)
     have a stretch factor of \a stretch.
 
     \a stretch is not the effective stretch factor; the effective
-    stretch factor is calculated by taking the initial size of the 
+    stretch factor is calculated by taking the initial size of the
     widget and multiplying it with \a stretch.
 
     This function is provided for convenience. It is equivalent to
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index 880ddfaf35..4c9be611bb 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -534,7 +534,7 @@ void QStatusBar::reformat()
 }
 
 /*!
-  
+
   Hides the normal status indications and displays the given \a
   message for the specified number of milli-seconds (\a{timeout}). If
   \a{timeout} is 0 (default), the \a {message} remains displayed until
@@ -744,7 +744,7 @@ bool QStatusBar::event(QEvent *e)
             }
         }
     }
-    
+
 // On Mac OS X Leopard it is possible to drag the window by clicking
 // on the tool bar on most applications.
 #ifndef Q_WS_MAC
@@ -755,7 +755,7 @@ bool QStatusBar::event(QEvent *e)
 
     // Enable drag-click only if the status bar is the status bar for a
     // QMainWindow with a unifed toolbar.
-    if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 || 
+    if (parent() == 0 || qobject_cast<QMainWindow *>(parent()) == 0 ||
         qobject_cast<QMainWindow *>(parent())->unifiedTitleAndToolBarOnMac() == false )
         return QWidget::event(e);
 
diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp
index 02279ad014..969bb8a7fd 100644
--- a/src/widgets/widgets/qtoolbararealayout.cpp
+++ b/src/widgets/widgets/qtoolbararealayout.cpp
@@ -810,7 +810,7 @@ QLayoutItem *QToolBarAreaLayout::insertToolBar(QToolBar *before, QToolBar *toolB
     QInternal::DockPosition pos = findToolBar(before);
     if (pos == QInternal::DockCount)
         return 0;
-    
+
     return docks[pos].insertToolBar(before, toolBar);
 }
 
@@ -869,7 +869,7 @@ void QToolBarAreaLayout::insertItem(QToolBar *before, QLayoutItem *item)
     QInternal::DockPosition pos = findToolBar(before);
     if (pos == QInternal::DockCount)
         return;
-    
+
     docks[pos].insertItem(before, item);
 }
 
diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h
index 5cbb4a4756..e052a71044 100644
--- a/src/widgets/widgets/qtoolbararealayout_p.h
+++ b/src/widgets/widgets/qtoolbararealayout_p.h
@@ -169,7 +169,7 @@ public:
     void removeToolBar(QToolBar *toolBar);
     void insertToolBarBreak(QToolBar *before);
     void removeToolBarBreak(QToolBar *before);
-    void moveToolBar(QToolBar *toolbar, int pos); 
+    void moveToolBar(QToolBar *toolbar, int pos);
 
     QList<int> gapIndex(const QPoint &pos, int *maxDistance) const;
     bool insertGap(const QList<int> &path, QLayoutItem *item);
@@ -215,7 +215,7 @@ public:
     void insertToolBarBreak(QToolBar *before);
     void removeToolBarBreak(QToolBar *before);
     void addToolBarBreak(QInternal::DockPosition pos);
-    void moveToolBar(QToolBar *toolbar, int pos); 
+    void moveToolBar(QToolBar *toolbar, int pos);
 
     void insertItem(QInternal::DockPosition pos, QLayoutItem *item);
     void insertItem(QToolBar *before, QLayoutItem *item);
diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp
index 1dde9c0a1d..7a4f3b17d0 100644
--- a/src/widgets/widgets/qtoolbarlayout.cpp
+++ b/src/widgets/widgets/qtoolbarlayout.cpp
@@ -409,7 +409,7 @@ void QToolBarLayout::setGeometry(const QRect &rect)
         }
     }
 #endif
-    
+
 }
 
 bool QToolBarLayout::layoutActions(const QSize &size)
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 797f3e9b76..9780d3c24c 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -145,7 +145,7 @@ SOURCES += \
 false:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
                widgets/qmaccocoaviewcontainer_mac.h
-    OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ 
+    OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \
                          widgets/qcocoamenu_mac_p.h
     OBJECTIVE_SOURCES += widgets/qmaccocoaviewcontainer_mac.mm \
                          widgets/qcocoatoolbardelegate_mac.mm \
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 689c75774e..47e137976b 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -3037,10 +3037,10 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing()
     A common way to perform incremental parsing is to connect the \c
     readyRead() signal of a \l{QNetworkReply} {network reply} a slot,
     and handle the incoming data there. See QNetworkAccessManager.
-    
+
     Aspects of the parsing behavior can be adapted using setFeature()
     and setProperty().
-    
+
     \snippet code/src_xml_sax_qxml.cpp 0
 
     QXmlSimpleReader is not reentrant. If you want to use the class
diff --git a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
index 69d1535ccf..4ce11f208f 100644
--- a/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
+++ b/tests/auto/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
@@ -100,7 +100,6 @@ void tst_QtConcurrentFilter::filter()
         QCOMPARE(vector, QVector<int>() << 2 << 4);
     }
 
-
     // function
     {
         QList<int> list;
@@ -554,7 +553,6 @@ void tst_QtConcurrentFilter::filteredReduced()
         int sum = QtConcurrent::filteredReduced<int>(vector, KeepEvenIntegers(), IntSumReduce());
         QCOMPARE(sum, 6);
     }
-
     {
         int sum = QtConcurrent::filteredReduced<int>(list.begin(),
                                                      list.end(),
@@ -1396,43 +1394,42 @@ void tst_QtConcurrentFilter::filteredReduced()
     // ### the same as above, with an initial result value
 }
 
-bool filterfn(int i)  
-{ 
+bool filterfn(int i)
+{
     return (i % 2);
-} 
+}
 
 void tst_QtConcurrentFilter::resultAt()
 {
 
-    QList<int> ints; 
+    QList<int> ints;
     for (int i=0; i < 1000; ++i)
         ints << i;
 
     QFuture<int> future = QtConcurrent::filtered(ints, filterfn);
-    future.waitForFinished(); 
+    future.waitForFinished();
 
-    
     for (int i = 0; i < future.resultCount(); ++i) {
         QCOMPARE(future.resultAt(i), ints.at(i * 2 + 1));
     }
 
 }
 
-bool waitFilterfn(const int &i)  
-{ 
+bool waitFilterfn(const int &i)
+{
     QTest::qWait(1);
     return (i % 2);
-} 
+}
 
 void tst_QtConcurrentFilter::incrementalResults()
 {
     const int count = 200;
-    QList<int> ints; 
+    QList<int> ints;
     for (int i=0; i < count; ++i)
         ints << i;
 
     QFuture<int> future = QtConcurrent::filtered(ints, waitFilterfn);
-    
+
     QList<int> results;
 
     while (future.isFinished() == false) {
diff --git a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index 3613e8df60..33133e876f 100644
--- a/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/concurrent/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -112,7 +112,7 @@ public:
         return false;
     }
     bool runIteration(TestIterator it, int index , void *result)
-    { 
+    {
         return runIterations(it, index, index + 1, result);
     }
 
@@ -132,7 +132,7 @@ public:
         return false;
     }
     bool runIteration(TestIterator it, int index , void *result)
-    { 
+    {
         return runIterations(it, index, index + 1, result);
     }
 };
@@ -166,7 +166,7 @@ public:
         return false;
     }
     bool runIteration(TestIterator it, int index , void *result)
-    { 
+    {
         return runIterations(it, index, index + 1, result);
     }
 };
@@ -217,13 +217,13 @@ public:
         if (100 >= begin && 100 < end) {
             throttling = true;
         }
-        
+
         QTest::qWait(1);
 
         return false;
     }
     bool runIteration(TestIterator it, int index , void *result)
-    { 
+    {
         return runIterations(it, index, index + 1, result);
     }
 
diff --git a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
index eeacf2ccbb..1743ec3459 100644
--- a/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
+++ b/tests/auto/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
@@ -2226,12 +2226,12 @@ int mapper(const int &i)
 void tst_QtConcurrentMap::incrementalResults()
 {
     const int count = 200;
-    QList<int> ints; 
+    QList<int> ints;
     for (int i=0; i < count; ++i)
         ints << i;
 
     QFuture<int> future = QtConcurrent::mapped(ints, mapper);
-    
+
     QList<int> results;
 
     while (future.isFinished() == false) {
@@ -2311,7 +2311,7 @@ void tst_QtConcurrentMap::stlContainers()
     QCOMPARE(list2.size(), (std::vector<int>::size_type)(2));
 
     QtConcurrent::mapped(list, mapper).waitForFinished();
-    
+
     QtConcurrent::blockingMap(list, multiplyBy2Immutable);
 }
 
diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index ab1b0e9d06..8a289ff4e1 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -137,10 +137,10 @@ public:
 void tst_QtConcurrentRun::returnValue()
 {
     QFuture<int> f;
-    
+
     f = run(returnInt0);
     QCOMPARE(f.result(), 10);
-    
+
     A a;
     f = run(&a, &A::member0);
     QCOMPARE(f.result(), 10);
@@ -214,7 +214,7 @@ void tst_QtConcurrentRun::functionObject()
 {
     QFuture<void> f;
     TestClass c;
-    
+
     f = run(c);
     f = run(&c);
     f = run(c, 10);
diff --git a/tests/auto/corelib/global/qrand/tst_qrand.cpp b/tests/auto/corelib/global/qrand/tst_qrand.cpp
index 6f64ad74b2..4cbbb8de0f 100644
--- a/tests/auto/corelib/global/qrand/tst_qrand.cpp
+++ b/tests/auto/corelib/global/qrand/tst_qrand.cpp
@@ -64,7 +64,7 @@ void tst_QRand::testqrand()
     for (int i=0; i<numTestValues; ++i)
         if (generatedNumbers[i] != qrand())
             generatesSameSequence = false;
-    
+
     QVERIFY(generatesSameSequence);
 
     for (unsigned int seed=1; seed < 10; seed+=100) {
diff --git a/tests/auto/corelib/io/qfile/stdinprocess/main.cpp b/tests/auto/corelib/io/qfile/stdinprocess/main.cpp
index 1c22da45b3..9ca531f615 100644
--- a/tests/auto/corelib/io/qfile/stdinprocess/main.cpp
+++ b/tests/auto/corelib/io/qfile/stdinprocess/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
         printf("echos all its input to its output.\n");
         return 1;
     }
-    
+
     QFile file;
 
     if (strcmp(argv[1], "all") == 0) {
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 0d27246d82..929865d4d6 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -1322,7 +1322,7 @@ void tst_QFile::copyFallback()
     QVERIFY(QFile::exists("file-copy-destination.txt"));
     QVERIFY(!file.isOpen());
 
-    file.close(); 
+    file.close();
     QFile::setPermissions("file-copy-destination.txt",
             QFile::ReadOwner | QFile::WriteOwner);
 }
@@ -2928,8 +2928,8 @@ void tst_QFile::map()
     // exotic test to make sure that multiple maps work
 
     // note: windows ce does not reference count mutliple maps
-    // it's essentially just the same reference but it 
-    // cause a resource lock on the file which prevents it 
+    // it's essentially just the same reference but it
+    // cause a resource lock on the file which prevents it
     // from being removed    uchar *memory1 = file.map(0, file.size());
     uchar *memory1 = file.map(0, file.size());
     QCOMPARE(file.error(), QFile::NoError);
diff --git a/tests/auto/corelib/io/qprocess/testProcessEchoGui/main_win.cpp b/tests/auto/corelib/io/qprocess/testProcessEchoGui/main_win.cpp
index 270666deb6..df96e1cbf3 100644
--- a/tests/auto/corelib/io/qprocess/testProcessEchoGui/main_win.cpp
+++ b/tests/auto/corelib/io/qprocess/testProcessEchoGui/main_win.cpp
@@ -50,8 +50,8 @@ int APIENTRY WinMain(HINSTANCE /* hInstance */,
 
     HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
     HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
-    
-    HANDLE hStderr = GetStdHandle(STD_ERROR_HANDLE); 
+
+    HANDLE hStderr = GetStdHandle(STD_ERROR_HANDLE);
 
     for (;;) {
 
diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/main_unix.cpp b/tests/auto/corelib/io/qprocess/testSoftExit/main_unix.cpp
index 02cc31168b..c7f5f88f9c 100644
--- a/tests/auto/corelib/io/qprocess/testSoftExit/main_unix.cpp
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/main_unix.cpp
@@ -55,7 +55,7 @@ int main()
 
     printf("Ready\n");
     fflush(stdout);
-    
+
     for (int i = 0; i < 5; ++i)
         sleep(1);
     return 0;
diff --git a/tests/auto/corelib/io/qprocess/testSoftExit/main_win.cpp b/tests/auto/corelib/io/qprocess/testSoftExit/main_win.cpp
index bed8d921b3..e478a18bd6 100644
--- a/tests/auto/corelib/io/qprocess/testSoftExit/main_win.cpp
+++ b/tests/auto/corelib/io/qprocess/testSoftExit/main_win.cpp
@@ -53,6 +53,6 @@ int main()
         if (msg.message == WM_CLOSE)
             PostQuitMessage(0);
     }
-    
+
     return int(msg.wParam);
 }
diff --git a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
index 11dbc1e9c1..515a10426c 100644
--- a/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
+++ b/tests/auto/corelib/io/qresourceengine/tst_qresourceengine.cpp
@@ -402,7 +402,7 @@ void tst_QResourceEngine::checkUnregisterResource_data()
     QTest::addColumn<int>("size");
 
     QTest::newRow("currentdir.txt") << QFINDTESTDATA("runtime_resource.rcc") << QString("/check_unregister/")
-                                    << QString(":/check_unregister/runtime_resource/test/abc/123/+++/currentdir.txt") 
+                                    << QString(":/check_unregister/runtime_resource/test/abc/123/+++/currentdir.txt")
                                     << (int)QFileInfo(QFINDTESTDATA("testqrc/currentdir.txt")).size();
 }
 
diff --git a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
index 651fa3b1db..21e067bc73 100644
--- a/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
+++ b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 {
     Q_UNUSED(argc)
     Q_UNUSED(argv)
-    
+
     // First, break QUuid.
     qrand();
 
diff --git a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
index 9d7bbd4f5c..ae32731cbc 100644
--- a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
+++ b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
@@ -77,7 +77,7 @@ public:
 public slots:
     void slot() { called = true; }
 
-    
+
 };
 
 void tst_QState::assignProperty()
@@ -89,7 +89,7 @@ void tst_QState::assignProperty()
 
     QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
-    
+
     machine.setInitialState(s1);
     machine.start();
     QCoreApplication::processEvents();
@@ -107,7 +107,7 @@ void tst_QState::assignPropertyTwice()
     QState *s1 = new QState(&machine);
     s1->assignProperty(object, "fooBar", 20);
     s1->assignProperty(object, "fooBar", 30);
-    
+
     machine.setInitialState(s1);
     machine.start();
     QCoreApplication::processEvents();
@@ -118,7 +118,7 @@ void tst_QState::assignPropertyTwice()
 class EventTestTransition: public QAbstractTransition
 {
 public:
-    EventTestTransition(QEvent::Type type, QState *targetState) 
+    EventTestTransition(QEvent::Type type, QState *targetState)
         : QAbstractTransition(), m_type(type)
     {
         setTargetState(targetState);
@@ -134,18 +134,18 @@ protected:
 
 private:
     QEvent::Type m_type;
-    
+
 };
 
-void tst_QState::historyInitialState() 
+void tst_QState::historyInitialState()
 {
     QStateMachine machine;
 
     QState *s1 = new QState(&machine);
-    
+
     QState *s2 = new QState(&machine);
     QHistoryState *h1 = new QHistoryState(s2);
-    
+
     s2->setInitialState(h1);
 
     QState *s3 = new QState(s2);
diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
index c9a41b29f8..c86befdf1b 100644
--- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
@@ -243,13 +243,13 @@ void tst_QFuture::resultStore()
         store.addResult(2, &int2); // add result at index 2
         QCOMPARE(store.contains(2), false); // but 1 is missing, so this 2 won't be reported yet.
 
-        store.addResult(1, &int1); 
+        store.addResult(1, &int1);
         QCOMPARE(store.contains(1), true);
         QCOMPARE(store.contains(2), true); // 2 should be visible now.
 
-        store.addResult(4, &int0); 
-        store.addResult(5, &int0); 
-        store.addResult(7, &int0); 
+        store.addResult(4, &int0);
+        store.addResult(5, &int0);
+        store.addResult(7, &int0);
         QCOMPARE(store.contains(4), false);
         QCOMPARE(store.contains(5), false);
         QCOMPARE(store.contains(7), false);
@@ -273,9 +273,9 @@ void tst_QFuture::resultStore()
 
         store.addResult(0, &int0);
         QCOMPARE(store.contains(0), true);
-        
+
         store.addResult(2, &int0);
-        QCOMPARE(store.contains(2), false);       
+        QCOMPARE(store.contains(2), false);
 
         store.addCanceledResult(1); // report no result at 1
 
@@ -289,7 +289,7 @@ void tst_QFuture::resultStore()
         store.addResult(6, &int0);
         store.addResult(7, &int0);
         QCOMPARE(store.contains(3), false);
- 
+
         store.addCanceledResult(4);
         store.addCanceledResult(5);
 
@@ -311,10 +311,10 @@ void tst_QFuture::resultStore()
         store.addResult(0, &int0);
         QCOMPARE(store.count(), 1); // result 0 becomes available
         QCOMPARE(store.contains(0), true);
-        
+
         store.addResult(2, &int0);
         QCOMPARE(store.count(), 1);
-        QCOMPARE(store.contains(2), false);       
+        QCOMPARE(store.contains(2), false);
 
         store.addCanceledResult(1);
         QCOMPARE(store.count(), 2); // result 2 is renamed to 1 and becomes available
@@ -332,7 +332,7 @@ void tst_QFuture::resultStore()
         store.addResult(7, &int0);
         QCOMPARE(store.count(), 3);
         QCOMPARE(store.contains(3), false);
- 
+
         store.addCanceledResult(4);
         store.addCanceledResult(5);
         QCOMPARE(store.count(), 5); // 6 and 7 is renamed to 3 and 4 and becomes available
@@ -347,13 +347,13 @@ void tst_QFuture::resultStore()
         QCOMPARE(store.contains(6), false);
         QCOMPARE(store.contains(7), false);
     }
-    
+
     {
         // test resultCount in non-filtered mode. It should always be possible
         // to iterate through the results 0 to resultCount.
         QtPrivate::ResultStore<int> store;
         store.addResult(0, &int0);
-        
+
         QCOMPARE(store.count(), 1);
 
         store.addResult(2, &int0);
@@ -440,7 +440,7 @@ void tst_QFuture::resultStore()
         store.addCanceledResults(0, 3);
         QCOMPARE(store.count(), 2);  // results at 3 and 4 become available at index 0, 1
 
-        store.addResult(5, &int0); 
+        store.addResult(5, &int0);
         QCOMPARE(store.count(), 3);// result 5 becomes available at index 2
     }
 
@@ -1112,9 +1112,9 @@ void tst_QFuture::iterators()
         for (int i = 0; i < resultCount; ++i) {
             e.reportResult(i);
         }
-    
+
         e.reportFinished();
-    
+
         {
             QFutureIterator<int> it(f);
             QFutureIterator<int> it2(it);
@@ -1122,7 +1122,7 @@ void tst_QFuture::iterators()
 
         {
             QFutureIterator<int> it(f);
-    
+
             for (int i = 0; i < resultCount - 1; ++i) {
                 QVERIFY(it.hasNext());
                 QCOMPARE(it.peekNext(), i);
diff --git a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
index 467dd4b348..b2b0eace34 100644
--- a/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/corelib/thread/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -797,7 +797,7 @@ public:
     ResultReadyTester(QFutureWatcher<int> *watcher)
     :m_watcher(watcher), filter(false), ok(true), count(0)
     {
-        
+
     }
 public slots:
     void resultReadyAt(int index)
@@ -834,7 +834,7 @@ void tst_QFutureWatcher::incrementalMapResults()
     connect(&watcher, SIGNAL(resultReadyAt(int)), &resultReadyTester, SLOT(resultReadyAt(int)));
 
     const int count = 10000;
-    QList<int> ints; 
+    QList<int> ints;
     for (int i = 0; i < count; ++i)
         ints << i;
 
@@ -846,7 +846,7 @@ void tst_QFutureWatcher::incrementalMapResults()
     QCOMPARE(resultReadyTester.count, count);
     QVERIFY(resultReadyTester.ok);
     QVERIFY(watcher.isFinished());
-    future.waitForFinished(); 
+    future.waitForFinished();
 }
 
 bool filterer(int i)
@@ -873,7 +873,7 @@ void tst_QFutureWatcher::incrementalFilterResults()
     connect(&watcher, SIGNAL(resultReadyAt(int)), &resultReadyTester, SLOT(resultReadyAt(int)));
 
     const int count = 10000;
-    QList<int> ints; 
+    QList<int> ints;
     for (int i = 0; i < count; ++i)
         ints << i;
 
@@ -885,12 +885,12 @@ void tst_QFutureWatcher::incrementalFilterResults()
     QCOMPARE(resultReadyTester.count, count / 2);
     QVERIFY(resultReadyTester.ok);
     QVERIFY(watcher.isFinished());
-    future.waitForFinished(); 
+    future.waitForFinished();
 }
 
 void tst_QFutureWatcher::qfutureSynchronizer()
 {
-    int taskCount = 1000; 
+    int taskCount = 1000;
     QTime t;
     t.start();
 
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index e6d824be96..7fbb5e9f5f 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -1026,7 +1026,7 @@ void tst_QThread::exitAndExec()
     thread.sem2.acquire();
     int v = thread.value;
     QCOMPARE(v, 556);
-    
+
     //test that the thread is running by executing queued connected signal there
     Syncronizer sync1;
     sync1.moveToThread(&thread);
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index 57a43a2b33..a93a94a470 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -783,7 +783,7 @@ void tst_QThreadPool::waitForDoneTimeout()
     public:
       QMutex mutex;
       BlockedTask() { setAutoDelete(false); }
-      
+
       void run()
         {
           mutex.lock();
diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index e941ceb456..de252a5d5e 100644
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -169,19 +169,19 @@ void tst_QCryptographicHash::sha1()
 //      A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
     QCOMPARE(QCryptographicHash::hash("abc", QCryptographicHash::Sha1).toHex().toUpper(),
              QByteArray("A9993E364706816ABA3E25717850C26C9CD0D89D"));
-             
+
 //  SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") =
 //      84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
     QCOMPARE(QCryptographicHash::hash("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
                                       QCryptographicHash::Sha1).toHex().toUpper(),
              QByteArray("84983E441C3BD26EBAAE4AA1F95129E5E54670F1"));
-             
+
 //  SHA1(A million repetitions of "a") =
 //      34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
     QByteArray as;
     for (int i = 0; i < 1000000; ++i)
         as += 'a';
-    QCOMPARE(QCryptographicHash::hash(as, QCryptographicHash::Sha1).toHex().toUpper(), 
+    QCOMPARE(QCryptographicHash::hash(as, QCryptographicHash::Sha1).toHex().toUpper(),
              QByteArray("34AA973CD4C4DAA4F61EEB2BDBAD27316534016F"));
 }
 
diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index 80311079d4..d22e771b79 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -74,7 +74,7 @@ void tst_QMargins::getSetCheck()
     margins.setRight(5);
     QVERIFY(!margins.isNull());
     QCOMPARE(margins, QMargins(5, 0, 5, 0));
-} 
+}
 
 void tst_QMargins::operators()
 {
diff --git a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
index 88de03e4bf..2fdde3c613 100644
--- a/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
+++ b/tests/auto/corelib/tools/qqueue/tst_qqueue.cpp
@@ -63,15 +63,15 @@ void tst_QQueue::enqueue_dequeue_data()
 
 void tst_QQueue::enqueue_dequeue()
 {
-    QFETCH(int, num_items);    
-    
-    int *values = new int[num_items];    
-    QQueue<int>  queue_v;    
-    QQueue<int*> queue_p;    
+    QFETCH(int, num_items);
+
+    int *values = new int[num_items];
+    QQueue<int>  queue_v;
+    QQueue<int*> queue_p;
 
     QVERIFY(queue_v.empty());
     QVERIFY(queue_p.empty());
-    
+
     for (int i = 0; i < num_items; i++ ) {
         values[i] = i;
         queue_p.enqueue(values + i);
@@ -84,11 +84,11 @@ void tst_QQueue::enqueue_dequeue()
         v = queue_v.head();
         p = queue_p.head();
         QCOMPARE(*p, v);
-        QCOMPARE(v, i);       
+        QCOMPARE(v, i);
         v = queue_v.dequeue();
         p = queue_p.dequeue();
-        QCOMPARE(*p, v);        
-        QCOMPARE(v, values[i]);        
+        QCOMPARE(*p, v);
+        QCOMPARE(v, values[i]);
     }
     QVERIFY(queue_v.empty());
     QVERIFY(queue_p.empty());
diff --git a/tests/auto/corelib/tools/qsharedpointer/externaltests.pri b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri
index 10d30e3c76..b3a01f7990 100644
--- a/tests/auto/corelib/tools/qsharedpointer/externaltests.pri
+++ b/tests/auto/corelib/tools/qsharedpointer/externaltests.pri
@@ -4,4 +4,4 @@ cleanedQMAKESPEC = $$replace(QMAKESPEC, \\\\, /)
 DEFINES += DEFAULT_MAKESPEC=\\\"$$cleanedQMAKESPEC\\\"
 
 cross_compile:DEFINES += QTEST_NO_RTTI QTEST_CROSS_COMPILED
-wince*:DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI 
+wince*:DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI
diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
index 7b7ad1800c..6340f0f7a6 100644
--- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
+++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
@@ -442,7 +442,7 @@ void tst_QDBusMetaObject::types()
 class MethodTest1: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     void method() { }
 };
@@ -452,7 +452,7 @@ const char MethodTest1_xml[] =
 class MethodTest2: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     void method(int) { }
 };
@@ -462,7 +462,7 @@ const char MethodTest2_xml[] =
 class MethodTest3: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     void method(int input0) { Q_UNUSED(input0); }
 };
@@ -472,7 +472,7 @@ const char MethodTest3_xml[] =
 class MethodTest4: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     int method() { return 0; }
 };
@@ -484,7 +484,7 @@ const char MethodTest4_xml2[] =
 class MethodTest5: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     int method(int input0) { return input0; }
 };
@@ -497,7 +497,7 @@ const char MethodTest5_xml[] =
 class MethodTest6: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     int method(int input0, int input1) { Q_UNUSED(input0); return input1; }
 };
@@ -511,7 +511,7 @@ const char MethodTest6_xml[] =
 class MethodTest7: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     int method(int input0, int input1, int &output1) { output1 = input1; return input0; }
 };
@@ -526,7 +526,7 @@ const char MethodTest7_xml[] =
 class MethodTest8: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     int method(int input0, int input1, int &output1, int &output2) { output1 = output2 = input1; return input0; }
 };
@@ -542,7 +542,7 @@ const char MethodTest8_xml[] =
 class MethodTest9: public QObject
 {
     Q_OBJECT
-    
+
 public slots:
     Q_NOREPLY void method(int) { }
 };
@@ -577,7 +577,7 @@ void tst_QDBusMetaObject::methods()
 class SignalTest1: public QObject
 {
     Q_OBJECT
-    
+
 signals:
     void signal();
 };
@@ -587,7 +587,7 @@ const char SignalTest1_xml[] =
 class SignalTest2: public QObject
 {
     Q_OBJECT
-    
+
 signals:
     void signal(int);
 };
@@ -597,7 +597,7 @@ const char SignalTest2_xml[] =
 class SignalTest3: public QObject
 {
     Q_OBJECT
-    
+
 signals:
     void signal(int output0);
 };
@@ -607,7 +607,7 @@ const char SignalTest3_xml[] =
 class SignalTest4: public QObject
 {
     Q_OBJECT
-    
+
 signals:
     void signal(int output0, int);
 };
diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
index 08b8ce3db3..8c94f87fd6 100644
--- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -96,7 +96,7 @@ void tst_QDBusXmlParser::parsing_data()
 
     QTest::newRow("null") << QString() << 0 << 0 << 0 << introspection;
     QTest::newRow("empty") << QString("") << 0 << 0 << 0 << introspection;
-    
+
     QTest::newRow("junk") << "<junk/>" << 0 << 0 << 0 << introspection;
     QTest::newRow("interface-inside-junk") << "<junk><interface name=\"iface.iface1\" /></junk>"
                                            << 0 << 0 << 0 << introspection;
@@ -429,7 +429,7 @@ void tst_QDBusXmlParser::signals__data()
     QTest::newRow("one-out-no-direction") <<
         "<signal name=\"Signal\">"
         "<arg type=\"s\"/>"
-        "</signal>" << map;    
+        "</signal>" << map;
 
     // two args with name
     signal.outputArgs << arg("i", "bar");
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 11fd5f9b2e..c21f725b55 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -80,7 +80,7 @@ private:
     const static QIcon staticIcon;
 };
 
-// Creating an icon statically should not cause a crash. 
+// Creating an icon statically should not cause a crash.
 // But we do not officially support this. See QTBUG-8666
 const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find");
 
diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
index d76e954ccd..f7d8eef721 100644
--- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
@@ -63,7 +63,7 @@ class MyImageIOHandler : public QImageIOHandler
 {
 public:
     MyImageIOHandler() : QImageIOHandler() { }
-    bool canRead() const { return true; }    
+    bool canRead() const { return true; }
     bool read(QImage *) { return true; }
 };
 
diff --git a/tests/auto/gui/image/qimagereader/images/black.xpm b/tests/auto/gui/image/qimagereader/images/black.xpm
index d7925bf211..4a1f4ec861 100644
--- a/tests/auto/gui/image/qimagereader/images/black.xpm
+++ b/tests/auto/gui/image/qimagereader/images/black.xpm
@@ -15,21 +15,21 @@ static char * ddd_xpm[] = {
 "+ c white     m white g white  g4 white  s Light      ",
 "*      c DarkGreen m black g grey25 g4 grey25 s Eye        ",
 /* Pixels */
-"                .            .                  ",    
-"                .           ..                  ",    
-"                 .          .                   ",    
-"                 ..        .                    ",    
-"   ..             ..      ..                    ",    
-"     ..            .     .               .      ",    
-"       .            . . .              ..       ",    
-"        .            .X.              .         ",    
-"         .          *.X.*           ..          ",    
-"         ..     ..  .XXX.  ..     ...           ",    
-"          .     .X...XXX...X.     .             ",    
-"          ..   ..XXX.XXX.XXX.   ..              ",    
-"            .....XXXX...XXXX.   .               ",    
-"             .. ..XXXXXXXXX.. ..                ",    
-"                ...XXXXXXX.....                 ",    
+"                .            .                  ",
+"                .           ..                  ",
+"                 .          .                   ",
+"                 ..        .                    ",
+"   ..             ..      ..                    ",
+"     ..            .     .               .      ",
+"       .            . . .              ..       ",
+"        .            .X.              .         ",
+"         .          *.X.*           ..          ",
+"         ..     ..  .XXX.  ..     ...           ",
+"          .     .X...XXX...X.     .             ",
+"          ..   ..XXX.XXX.XXX.   ..              ",
+"            .....XXXX...XXXX.   .               ",
+"             .. ..XXXXXXXXX.. ..                ",
+"                ...XXXXXXX.....                 ",
 "                  .........                     ",
 "                  .XXXXXXX.                     ",
 "                .....XXX.....                   ",
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index 3e628981b6..2e766c5bf5 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -174,28 +174,28 @@ void tst_QPicture::operator_lt_lt()
 {
     // streaming of null pictures
     {
-	QPicture pic1, pic2;
-	QByteArray ba( 100, 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
- 	QVERIFY( pic2.isNull() );
+        QPicture pic1, pic2;
+        QByteArray ba( 100, 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QVERIFY( pic2.isNull() );
     }
 
     // picture with a simple line, checking bitwise equality
     {
-	QPicture pic1, pic2;
-	QPainter p( &pic1 );
-	p.drawLine( 10, 20, 30, 40 );
-	p.end();
-	QByteArray ba( 10 * pic1.size(), 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
-	QCOMPARE( pic1.size(), pic2.size() );
-	QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
+        QPicture pic1, pic2;
+        QPainter p( &pic1 );
+        p.drawLine( 10, 20, 30, 40 );
+        p.end();
+        QByteArray ba( 10 * pic1.size(), 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QCOMPARE( pic1.size(), pic2.size() );
+        QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
     }
 }
 
@@ -268,7 +268,6 @@ void tst_QPicture::boundaryValues_data()
 
     QTest::newRow("min x, max y") << INT_MIN << INT_MAX;
     QTest::newRow("max x, min y") << INT_MAX << INT_MIN;
-
 }
 
 void tst_QPicture::boundaryValues()
@@ -283,8 +282,6 @@ void tst_QPicture::boundaryValues()
     painter.drawPoint(QPoint(x, y));
 
     painter.end();
-
-    
 }
 
 
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 9aebe135ef..5934776c5b 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -414,7 +414,7 @@ void tst_QTouchEvent::touchBeginPropagatesWhenIgnored()
     // QGraphicsView
     {
         QGraphicsScene scene;
-        tst_QTouchEventGraphicsItem root, child, grandchild;        
+        tst_QTouchEventGraphicsItem root, child, grandchild;
         QGraphicsView view(&scene);
         scene.addItem(&root);
         root.setPos(100, 100);
@@ -778,7 +778,7 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     QVERIFY(rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchBeginPoints.count(), 1);    
+    QCOMPARE(leftWidget.touchBeginPoints.count(), 1);
     QCOMPARE(rightWidget.touchBeginPoints.count(), 1);
     {
         QTouchEvent::TouchPoint leftTouchPoint = leftWidget.touchBeginPoints.first();
@@ -1633,4 +1633,4 @@ void tst_QTouchEvent::testMultiDevice()
 
 QTEST_MAIN(tst_QTouchEvent)
 
-#include "tst_qtouchevent.moc"      
+#include "tst_qtouchevent.moc"
diff --git a/tests/auto/gui/painting/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp
index d7f0d6d59b..3bc2484578 100644
--- a/tests/auto/gui/painting/qpathclipper/paths.cpp
+++ b/tests/auto/gui/painting/qpathclipper/paths.cpp
@@ -127,7 +127,7 @@ QPainterPath Paths::body()
     path.cubicTo(105.28125,81.341000, 89.784000,65.812500, 70.531250,65.812500);
     path.lineTo(54.437500,65.812500);
     path.closeSubpath();
-        
+
     return path;
 }
 
@@ -143,7 +143,7 @@ QPainterPath Paths::mailbox()
     path.lineTo(443.62570,100.11509);
     path.lineTo(355.22951,136.82424);
     path.closeSubpath();
-    
+
     return path;
 }
 
@@ -271,7 +271,7 @@ QPainterPath Paths::lips()
     path.cubicTo(283.58862,123.78263, 270.15105,136.64382, 243.62716,155.61729);
     path.cubicTo(217.47805,174.32266, 199.38332,176.65905, 177.02257,176.65905);
     path.closeSubpath();
-        
+
     return path;
 }
 
@@ -290,14 +290,14 @@ QPainterPath Paths::bezier2()
     QPainterPath path;
     path.moveTo(200,200);
     path.cubicTo(200,125, 500,100, 500,500);
-    
+
     return path;
 }
 
 QPainterPath Paths::random1()
 {
     QPainterPath path;
-    
+
     path.moveTo(65.714286,91.428571);
     path.lineTo(217.14286, 102.85714);
     path.cubicTo(219.04762, 106.66666,
@@ -341,7 +341,7 @@ QPainterPath Paths::random1()
 QPainterPath Paths::random2()
 {
     QPainterPath path;
-    
+
     path.moveTo(314.28571,160);
     path.cubicTo(434.28571,125.71429,
                  505.71429,200,
@@ -573,7 +573,7 @@ QPainterPath Paths::triangle1()
 }
 
 QPainterPath Paths::triangle2()
-{  
+{
     QPainterPath path;
 
     path.moveTo(0, 120);
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index f62e5f188b..46f97840af 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -224,7 +224,7 @@ void tst_QStaticText::drawToRect()
 #endif
 
     QVERIFY(imageDrawText.toImage() != m_whiteSquare);
-    QCOMPARE(imageDrawStaticText, imageDrawText);   
+    QCOMPARE(imageDrawStaticText, imageDrawText);
 }
 
 void tst_QStaticText::prepareToCorrectData()
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index fa2a2985f0..5484c9ed93 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -527,26 +527,26 @@ void tst_QSyntaxHighlighter::rehighlight()
 void tst_QSyntaxHighlighter::rehighlightBlock()
 {
     TestHighlighter *hl = new TestHighlighter(doc);
-    
+
     cursor.movePosition(QTextCursor::Start);
     cursor.beginEditBlock();
     cursor.insertText("Hello");
     cursor.insertBlock();
     cursor.insertText("World");
     cursor.endEditBlock();
-    
+
     hl->callCount = 0;
     hl->highlightedText.clear();
     QTextBlock block = doc->begin();
     hl->rehighlightBlock(block);
-    
+
     QCOMPARE(hl->highlightedText, QString("Hello"));
     QCOMPARE(hl->callCount, 1);
-    
+
     hl->callCount = 0;
     hl->highlightedText.clear();
     hl->rehighlightBlock(block.next());
-    
+
     QCOMPARE(hl->highlightedText, QString("World"));
     QCOMPARE(hl->callCount, 1);
 }
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index f7b4456c43..1eb073d3b4 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
@@ -72,7 +72,7 @@ private slots:
 
 /*! \internal
   This (used to) trigger a crash in:
- 
+
     QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
   which is most easily produced through QSettings.
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/main.cpp b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
index 1dcdc28d81..f3fa42ec2e 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
@@ -81,7 +81,7 @@ void MyEdit::setText(const QString &str)
     result = "Using font '" + e->fontEngine(e->layoutData->items[0])->fontDef.family + "'\n\n";
 
     result += "{ { ";
-    for (int i = 0; i < str.length(); ++i) 
+    for (int i = 0; i < str.length(); ++i)
         result += "0x" + QString::number(str.at(i).unicode(), 16) + ", ";
     result += "0x0 },\n  { ";
     for (int i = 0; i < e->layoutData->items[0].num_glyphs; ++i)
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index 2e2c965cc9..eebac28323 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -48,7 +48,7 @@
 
 class tst_QTextScriptEngine : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     tst_QTextScriptEngine();
@@ -210,93 +210,93 @@ void tst_QTextScriptEngine::devanagari_data()
     {
         if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) {
             QFont f("Raghindi");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0915, 0x0 },
-		  { 0x0080, 0x0 } },
-		// Ka Halant
-		{ { 0x0915, 0x094d, 0x0 },
-		  { 0x0080, 0x0051, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0915, 0x094d, 0x0915, 0x0 },
-		  { 0x00c8, 0x0080, 0x0 } },
-		// Ka MatraI
-		{ { 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0080, 0x005b, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x005b, 0x0 } },
-		// MatraI
-		{ { 0x093f, 0x0 },
-		  { 0x01d4, 0x029c, 0x0 } },
-		// Ka Nukta
-		{ { 0x0915, 0x093c, 0x0 },
-		  { 0x00a4, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0915, 0x094d, 0x0930, 0x0 },
-		  { 0x0110, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0158, 0x0080, 0x0 } },
-		{ { 0x0930, 0x094d, 0x200d, 0x0 },
-		  { 0x00e2, 0x0 } },
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x200d, 0x0 },
-		  { 0x0158, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Raghindi");
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0915, 0x0 },
+                  { 0x0080, 0x0 } },
+                // Ka Halant
+                { { 0x0915, 0x094d, 0x0 },
+                  { 0x0080, 0x0051, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0915, 0x094d, 0x0915, 0x0 },
+                  { 0x00c8, 0x0080, 0x0 } },
+                // Ka MatraI
+                { { 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x0 } },
+                // Ra Halant Ka
+                { { 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0080, 0x005b, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x005b, 0x0 } },
+                // MatraI
+                { { 0x093f, 0x0 },
+                  { 0x01d4, 0x029c, 0x0 } },
+                // Ka Nukta
+                { { 0x0915, 0x093c, 0x0 },
+                  { 0x00a4, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0915, 0x094d, 0x0930, 0x0 },
+                  { 0x0110, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0158, 0x0080, 0x0 } },
+                { { 0x0930, 0x094d, 0x200d, 0x0 },
+                  { 0x00e2, 0x0 } },
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x200d, 0x0 },
+                  { 0x0158, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Raghindi");
     }
 
     {
         if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Mangal")) {
             QFont f("Mangal");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0915, 0x0 },
-		  { 0x0080, 0x0 } },
-		// Ka Halant
-		{ { 0x0915, 0x094d, 0x0 },
-		  { 0x0080, 0x0051, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0915, 0x094d, 0x0915, 0x0 },
-		  { 0x00c8, 0x0080, 0x0 } },
-		// Ka MatraI
-		{ { 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0080, 0x005b, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x005b, 0x0 } },
-		// MatraI
-		{ { 0x093f, 0x0 },
-		  { 0x01d4, 0x029c, 0x0 } },
-		// Ka Nukta
-		{ { 0x0915, 0x093c, 0x0 },
-		  { 0x00a4, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0915, 0x094d, 0x0930, 0x0 },
-		  { 0x0110, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0158, 0x0080, 0x0 } },
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0915, 0x0 },
+                  { 0x0080, 0x0 } },
+                // Ka Halant
+                { { 0x0915, 0x094d, 0x0 },
+                  { 0x0080, 0x0051, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0915, 0x094d, 0x0915, 0x0 },
+                  { 0x00c8, 0x0080, 0x0 } },
+                // Ka MatraI
+                { { 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x0 } },
+                // Ra Halant Ka
+                { { 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0080, 0x005b, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x005b, 0x0 } },
+                // MatraI
+                { { 0x093f, 0x0 },
+                  { 0x01d4, 0x029c, 0x0 } },
+                // Ka Nukta
+                { { 0x0915, 0x093c, 0x0 },
+                  { 0x00a4, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0915, 0x094d, 0x0930, 0x0 },
+                  { 0x0110, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0158, 0x0080, 0x0 } },
 
                 { { 0x92b, 0x94d, 0x930, 0x0 },
                   { 0x125, 0x0 } },
                 { { 0x92b, 0x93c, 0x94d, 0x930, 0x0 },
-                  { 0x149, 0x0 } }, 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find mangal");
+                  { 0x149, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find mangal");
     }
 }
 
@@ -317,224 +317,224 @@ void tst_QTextScriptEngine::bengali_data()
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) {
             QFont f("Akaash");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0995, 0x0 },
-		  { 0x0151, 0x0 } },
-		// Ka Halant
-		{ { 0x0995, 0x09cd, 0x0 },
-		  { 0x0151, 0x017d, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0995, 0x09cd, 0x0995, 0x0 },
-		  { 0x019b, 0x0 } },
-		// Ka MatraI
-		{ { 0x0995, 0x09bf, 0x0 },
-		  { 0x0173, 0x0151, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x0151, 0x0276, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
-		  { 0x0173, 0x0151, 0x0276, 0x0 } },
-		// Ka Nukta
-		{ { 0x0995, 0x09bc, 0x0 },
-		  { 0x0151, 0x0171, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0995, 0x09cd, 0x09b0, 0x0 },
-		  { 0x01f4, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0995, 0x09cd, 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x025c, 0x0276, 0x0151, 0x0 } },
-		// Ya + Halant
-		{ { 0x09af, 0x09cd, 0x0 },
-		  { 0x016a, 0x017d, 0x0 } },
-		// Da Halant Ya -> Da Ya-Phala
-		{ { 0x09a6, 0x09cd, 0x09af, 0x0 },
-		  { 0x01e5, 0x0 } },
-		// A Halant Ya -> A Ya-phala
-		{ { 0x0985, 0x09cd, 0x09af, 0x0 },
-		  { 0x0145, 0x01cf, 0x0 } },
-		// Na Halant Ka
-		{ { 0x09a8, 0x09cd, 0x0995, 0x0 },
-		  { 0x026f, 0x0151, 0x0 } },
-		// Na Halant ZWNJ Ka
-		{ { 0x09a8, 0x09cd, 0x200c, 0x0995, 0x0 },
-		  { 0x0164, 0x017d, 0x0151, 0x0 } },
-		// Na Halant ZWJ Ka
-		{ { 0x09a8, 0x09cd, 0x200d, 0x0995, 0x0 },
-		  { 0x026f, 0x0151, 0x0 } },
-		// Ka Halant ZWNJ Ka
-		{ { 0x0995, 0x09cd, 0x200c, 0x0995, 0x0 },
-		  { 0x0151, 0x017d, 0x0151, 0x0 } },
-		// Ka Halant ZWJ Ka
-		{ { 0x0995, 0x09cd, 0x200d, 0x0995, 0x0 },
-		  { 0x025c, 0x0151, 0x0 } },
-		// Na Halant Ra
-		{ { 0x09a8, 0x09cd, 0x09b0, 0x0 },
-		  { 0x0207, 0x0 } },
-		// Na Halant ZWNJ Ra
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
-		  { 0x0164, 0x017d, 0x016b, 0x0 } },
-		// Na Halant ZWJ Ra
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09b0, 0x0 },
-		  { 0x026f, 0x016b, 0x0 } },
-		// Na Halant Ba
-		{ { 0x09a8, 0x09cd, 0x09ac, 0x0 },
-		  { 0x022f, 0x0 } },
-		// Na Halant ZWNJ Ba
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09ac, 0x0 },
-		  { 0x0164, 0x017d, 0x0167, 0x0 } },
-		// Na Halant ZWJ Ba
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09ac, 0x0 },
-		  { 0x026f, 0x0167, 0x0 } },
-		// Na Halant Dha
-		{ { 0x09a8, 0x09cd, 0x09a7, 0x0 },
-		  { 0x01d3, 0x0 } },
-		// Na Halant ZWNJ Dha
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
-		  { 0x0164, 0x017d, 0x0163, 0x0 } },
-		// Na Halant ZWJ Dha
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
-		  { 0x026f, 0x0163, 0x0 } },
-		// Ra Halant Ka MatraAU
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09cc, 0x0 },
-		  { 0x0179, 0x0151, 0x0276, 0x017e, 0x0 } },
-		// Ra Halant Ba Halant Ba
-		{ { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
-		  { 0x0232, 0x0276, 0x0 } },
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0995, 0x0 },
+                  { 0x0151, 0x0 } },
+                // Ka Halant
+                { { 0x0995, 0x09cd, 0x0 },
+                  { 0x0151, 0x017d, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0995, 0x09cd, 0x0995, 0x0 },
+                  { 0x019b, 0x0 } },
+                // Ka MatraI
+                { { 0x0995, 0x09bf, 0x0 },
+                  { 0x0173, 0x0151, 0x0 } },
+                // Ra Halant Ka
+                { { 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x0151, 0x0276, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
+                  { 0x0173, 0x0151, 0x0276, 0x0 } },
+                // Ka Nukta
+                { { 0x0995, 0x09bc, 0x0 },
+                  { 0x0151, 0x0171, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0995, 0x09cd, 0x09b0, 0x0 },
+                  { 0x01f4, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0995, 0x09cd, 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x025c, 0x0276, 0x0151, 0x0 } },
+                // Ya + Halant
+                { { 0x09af, 0x09cd, 0x0 },
+                  { 0x016a, 0x017d, 0x0 } },
+                // Da Halant Ya -> Da Ya-Phala
+                { { 0x09a6, 0x09cd, 0x09af, 0x0 },
+                  { 0x01e5, 0x0 } },
+                // A Halant Ya -> A Ya-phala
+                { { 0x0985, 0x09cd, 0x09af, 0x0 },
+                  { 0x0145, 0x01cf, 0x0 } },
+                // Na Halant Ka
+                { { 0x09a8, 0x09cd, 0x0995, 0x0 },
+                  { 0x026f, 0x0151, 0x0 } },
+                // Na Halant ZWNJ Ka
+                { { 0x09a8, 0x09cd, 0x200c, 0x0995, 0x0 },
+                  { 0x0164, 0x017d, 0x0151, 0x0 } },
+                // Na Halant ZWJ Ka
+                { { 0x09a8, 0x09cd, 0x200d, 0x0995, 0x0 },
+                  { 0x026f, 0x0151, 0x0 } },
+                // Ka Halant ZWNJ Ka
+                { { 0x0995, 0x09cd, 0x200c, 0x0995, 0x0 },
+                  { 0x0151, 0x017d, 0x0151, 0x0 } },
+                // Ka Halant ZWJ Ka
+                { { 0x0995, 0x09cd, 0x200d, 0x0995, 0x0 },
+                  { 0x025c, 0x0151, 0x0 } },
+                // Na Halant Ra
+                { { 0x09a8, 0x09cd, 0x09b0, 0x0 },
+                  { 0x0207, 0x0 } },
+                // Na Halant ZWNJ Ra
+                { { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
+                  { 0x0164, 0x017d, 0x016b, 0x0 } },
+                // Na Halant ZWJ Ra
+                { { 0x09a8, 0x09cd, 0x200d, 0x09b0, 0x0 },
+                  { 0x026f, 0x016b, 0x0 } },
+                // Na Halant Ba
+                { { 0x09a8, 0x09cd, 0x09ac, 0x0 },
+                  { 0x022f, 0x0 } },
+                // Na Halant ZWNJ Ba
+                { { 0x09a8, 0x09cd, 0x200c, 0x09ac, 0x0 },
+                  { 0x0164, 0x017d, 0x0167, 0x0 } },
+                // Na Halant ZWJ Ba
+                { { 0x09a8, 0x09cd, 0x200d, 0x09ac, 0x0 },
+                  { 0x026f, 0x0167, 0x0 } },
+                // Na Halant Dha
+                { { 0x09a8, 0x09cd, 0x09a7, 0x0 },
+                  { 0x01d3, 0x0 } },
+                // Na Halant ZWNJ Dha
+                { { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
+                  { 0x0164, 0x017d, 0x0163, 0x0 } },
+                // Na Halant ZWJ Dha
+                { { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
+                  { 0x026f, 0x0163, 0x0 } },
+                // Ra Halant Ka MatraAU
+                { { 0x09b0, 0x09cd, 0x0995, 0x09cc, 0x0 },
+                  { 0x0179, 0x0151, 0x0276, 0x017e, 0x0 } },
+                // Ra Halant Ba Halant Ba
+                { { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
+                  { 0x0232, 0x0276, 0x0 } },
                 { { 0x9b0, 0x9cd, 0x995, 0x9be, 0x982, 0x0 },
                   { 0x151, 0x276, 0x172, 0x143, 0x0 } },
                 { { 0x9b0, 0x9cd, 0x995, 0x9be, 0x983, 0x0 },
-                  { 0x151, 0x276, 0x172, 0x144, 0x0 } }, 
+                  { 0x151, 0x276, 0x172, 0x144, 0x0 } },
                 // test decomposed two parts matras
                 { { 0x995, 0x9c7, 0x9be, 0x0 },
                   { 0x179, 0x151, 0x172, 0x0 } },
                 { { 0x995, 0x9c7, 0x9d7, 0x0 },
                   { 0x179, 0x151, 0x17e, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Akaash");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Akaash");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) {
             QFont f("Mukti Narrow");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0995, 0x0 },
-		  { 0x0073, 0x0 } },
-		// Ka Halant
-		{ { 0x0995, 0x09cd, 0x0 },
-		  { 0x00b9, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0995, 0x09cd, 0x0995, 0x0 },
-		  { 0x0109, 0x0 } },
-		// Ka MatraI
-		{ { 0x0995, 0x09bf, 0x0 },
-		  { 0x0095, 0x0073, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x0073, 0x00e1, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
-		  { 0x0095, 0x0073, 0x00e1, 0x0 } },
-		// MatraI
- 		{ { 0x09bf, 0x0 },
-		  { 0x0095, 0x01c8, 0x0 } },
-		// Ka Nukta
-		{ { 0x0995, 0x09bc, 0x0 },
-		  { 0x0073, 0x0093, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0995, 0x09cd, 0x09b0, 0x0 },
-		  { 0x00e5, 0x0 } },
-		// Ka Halant Ra Halant Ka
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0995, 0x0 },
+                  { 0x0073, 0x0 } },
+                // Ka Halant
+                { { 0x0995, 0x09cd, 0x0 },
+                  { 0x00b9, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0995, 0x09cd, 0x0995, 0x0 },
+                  { 0x0109, 0x0 } },
+                // Ka MatraI
+                { { 0x0995, 0x09bf, 0x0 },
+                  { 0x0095, 0x0073, 0x0 } },
+                // Ra Halant Ka
+                { { 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x0073, 0x00e1, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
+                  { 0x0095, 0x0073, 0x00e1, 0x0 } },
+                // MatraI
+                { { 0x09bf, 0x0 },
+                  { 0x0095, 0x01c8, 0x0 } },
+                // Ka Nukta
+                { { 0x0995, 0x09bc, 0x0 },
+                  { 0x0073, 0x0093, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0995, 0x09cd, 0x09b0, 0x0 },
+                  { 0x00e5, 0x0 } },
+                // Ka Halant Ra Halant Ka
                 { { 0x995, 0x9cd, 0x9b0, 0x9cd, 0x995, 0x0 },
-                  { 0x234, 0x24e, 0x73, 0x0 } }, 
-		// Ya + Halant
-		{ { 0x09af, 0x09cd, 0x0 },
-		  { 0x00d2, 0x0 } },
-		// Da Halant Ya -> Da Ya-Phala
-		{ { 0x09a6, 0x09cd, 0x09af, 0x0 },
-		  { 0x0084, 0x00e2, 0x0 } },
-		// A Halant Ya -> A Ya-phala
-		{ { 0x0985, 0x09cd, 0x09af, 0x0 },
-		  { 0x0067, 0x00e2, 0x0 } },
-		// Na Halant Ka
-		{ { 0x09a8, 0x09cd, 0x0995, 0x0 },
-		  { 0x0188, 0x0 } },
-		// Na Halant ZWNJ Ka
+                  { 0x234, 0x24e, 0x73, 0x0 } },
+                // Ya + Halant
+                { { 0x09af, 0x09cd, 0x0 },
+                  { 0x00d2, 0x0 } },
+                // Da Halant Ya -> Da Ya-Phala
+                { { 0x09a6, 0x09cd, 0x09af, 0x0 },
+                  { 0x0084, 0x00e2, 0x0 } },
+                // A Halant Ya -> A Ya-phala
+                { { 0x0985, 0x09cd, 0x09af, 0x0 },
+                  { 0x0067, 0x00e2, 0x0 } },
+                // Na Halant Ka
+                { { 0x09a8, 0x09cd, 0x0995, 0x0 },
+                  { 0x0188, 0x0 } },
+                // Na Halant ZWNJ Ka
                 { { 0x9a8, 0x9cd, 0x200c, 0x995, 0x0 },
-                  { 0xcc, 0x73, 0x0 } }, 
-		// Na Halant ZWJ Ka
+                  { 0xcc, 0x73, 0x0 } },
+                // Na Halant ZWJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Ka Halant ZWNJ Ka
+                  { 0x247, 0x73, 0x0 } },
+                // Ka Halant ZWNJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Ka Halant ZWJ Ka
+                  { 0x247, 0x73, 0x0 } },
+                // Ka Halant ZWJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Na Halant Ra
-		{ { 0x09a8, 0x09cd, 0x09b0, 0x0 },
-		  { 0x00f8, 0x0 } },
-		// Na Halant ZWNJ Ra
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
-		  { 0xcc, 0x8d, 0x0 } },
-		// Na Halant ZWJ Ra
+                  { 0x247, 0x73, 0x0 } },
+                // Na Halant Ra
+                { { 0x09a8, 0x09cd, 0x09b0, 0x0 },
+                  { 0x00f8, 0x0 } },
+                // Na Halant ZWNJ Ra
+                { { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
+                  { 0xcc, 0x8d, 0x0 } },
+                // Na Halant ZWJ Ra
                 { { 0x9a8, 0x9cd, 0x200d, 0x9b0, 0x0 },
-                  { 0x247, 0x8d, 0x0 } }, 
-		// Na Halant Ba
-		{ { 0x09a8, 0x09cd, 0x09ac, 0x0 },
-		  { 0x0139, 0x0 } },
-		// Na Halant ZWNJ Ba
+                  { 0x247, 0x8d, 0x0 } },
+                // Na Halant Ba
+                { { 0x09a8, 0x09cd, 0x09ac, 0x0 },
+                  { 0x0139, 0x0 } },
+                // Na Halant ZWNJ Ba
                 { { 0x9a8, 0x9cd, 0x200c, 0x9ac, 0x0 },
-                  { 0xcc, 0x89, 0x0 } }, 
-		// Na Halant ZWJ Ba
+                  { 0xcc, 0x89, 0x0 } },
+                // Na Halant ZWJ Ba
                 { { 0x9a8, 0x9cd, 0x200d, 0x9ac, 0x0 },
-                  { 0x247, 0x89, 0x0 } }, 
-		// Na Halant Dha
-		{ { 0x09a8, 0x09cd, 0x09a7, 0x0 },
-		  { 0x0145, 0x0 } },
-		// Na Halant ZWNJ Dha
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
-		  { 0xcc, 0x85, 0x0 } },
-		// Na Halant ZWJ Dha
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
-		  { 0x247, 0x85, 0x0 } },
-		// Ra Halant Ka MatraAU
+                  { 0x247, 0x89, 0x0 } },
+                // Na Halant Dha
+                { { 0x09a8, 0x09cd, 0x09a7, 0x0 },
+                  { 0x0145, 0x0 } },
+                // Na Halant ZWNJ Dha
+                { { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
+                  { 0xcc, 0x85, 0x0 } },
+                // Na Halant ZWJ Dha
+                { { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
+                  { 0x247, 0x85, 0x0 } },
+                // Ra Halant Ka MatraAU
                 { { 0x9b0, 0x9cd, 0x995, 0x9cc, 0x0 },
-                  { 0x232, 0x73, 0xe1, 0xa0, 0x0 } }, 
-		// Ra Halant Ba Halant Ba
-		{ { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
-		  { 0x013b, 0x00e1, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Mukti");
+                  { 0x232, 0x73, 0xe1, 0xa0, 0x0 } },
+                // Ra Halant Ba Halant Ba
+                { { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
+                  { 0x013b, 0x00e1, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Mukti");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) {
             QFont f("Likhan");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0x9a8, 0x9cd, 0x9af, 0x0 },
                   { 0x1ca, 0x0 } },
-		{ { 0x09b8, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b8, 0x09cd, 0x09af, 0x0 },
                   { 0x020e, 0x0 } },
-		{ { 0x09b6, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b6, 0x09cd, 0x09af, 0x0 },
                   { 0x01f4, 0x0 } },
-		{ { 0x09b7, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b7, 0x09cd, 0x09af, 0x0 },
                   { 0x01fe, 0x0 } },
-		{ { 0x09b0, 0x09cd, 0x09a8, 0x09cd, 0x200d, 0x0 },
+                { { 0x09b0, 0x09cd, 0x09a8, 0x09cd, 0x200d, 0x0 },
                   { 0x10b, 0x167, 0x0 } },
 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Likhan");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Likhan");
     }
 }
 
@@ -555,14 +555,14 @@ void tst_QTextScriptEngine::gurmukhi_data()
     {
         if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) {
             QFont f("Lohit Punjabi");
-	    const ShapeTable shape_table [] = {
-		{ { 0xA15, 0xA4D, 0xa39, 0x0 },
-		  { 0x3b, 0x8b, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Lohit Punjabi");
+            const ShapeTable shape_table [] = {
+                { { 0xA15, 0xA4D, 0xa39, 0x0 },
+                  { 0x3b, 0x8b, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Lohit Punjabi");
     }
 }
 
@@ -583,27 +583,27 @@ void tst_QTextScriptEngine::oriya_data()
     {
         if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) {
             QFont f("utkal");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0xb15, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x150, 0x125, 0x0 } }, 
+                  { 0x150, 0x125, 0x0 } },
                 { { 0xb24, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x151, 0x120, 0x0 } }, 
+                  { 0x151, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x152, 0x120, 0x0 } }, 
+                  { 0x152, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x152, 0x120, 0x0 } }, 
+                  { 0x152, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x176, 0x0 } }, 
+                  { 0x176, 0x0 } },
                 { { 0xb38, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x177, 0x0 } }, 
+                  { 0x177, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb30, 0xb4d, 0xb2f, 0x0 },
-                  { 0x176, 0x124, 0x0 } }, 
+                  { 0x176, 0x124, 0x0 } },
                 { {0}, {0} }
 
             };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find utkal");
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find utkal");
     }
 }
 
@@ -624,51 +624,51 @@ void tst_QTextScriptEngine::tamil_data()
     {
         if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) {
             QFont f("AkrutiTml1");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0b95, 0x0bc2, 0x0 },
-		  { 0x004e, 0x0 } },
-		{ { 0x0bae, 0x0bc2, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0b9a, 0x0bc2, 0x0 },
-		  { 0x0058, 0x0 } },
-		{ { 0x0b99, 0x0bc2, 0x0 },
-		  { 0x0053, 0x0 } },
-		{ { 0x0bb0, 0x0bc2, 0x0 },
-		  { 0x00a8, 0x0 } },
-		{ { 0x0ba4, 0x0bc2, 0x0 },
-		  { 0x008e, 0x0 } },
-		{ { 0x0b9f, 0x0bc2, 0x0 },
-		  { 0x0062, 0x0 } },
-		{ { 0x0b95, 0x0bc6, 0x0 },
-		  { 0x000a, 0x0031, 0x0 } },
-		{ { 0x0b95, 0x0bca, 0x0 },
-		  { 0x000a, 0x0031, 0x0007, 0x0 } },
-		{ { 0x0b95, 0x0bc6, 0x0bbe, 0x0 },
-		  { 0x000a, 0x0031, 0x007, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0 },
-		  { 0x0049, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0bca, 0x0 },
-		  { 0x000a, 0x0049, 0x007, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0bc6, 0x0bbe, 0x0 },
-		  { 0x000a, 0x0049, 0x007, 0x0 } },
-		{ { 0x0b9f, 0x0bbf, 0x0 },
-		  { 0x005f, 0x0 } },
-		{ { 0x0b9f, 0x0bc0, 0x0 },
-		  { 0x0060, 0x0 } },
-		{ { 0x0bb2, 0x0bc0, 0x0 },
-		  { 0x00ab, 0x0 } },
-		{ { 0x0bb2, 0x0bbf, 0x0 },
-		  { 0x00aa, 0x0 } },
-		{ { 0x0bb0, 0x0bcd, 0x0 },
-		  { 0x00a4, 0x0 } },
-		{ { 0x0bb0, 0x0bbf, 0x0 },
-		  { 0x00a5, 0x0 } },
-		{ { 0x0bb0, 0x0bc0, 0x0 },
-		  { 0x00a6, 0x0 } },
-		{ { 0x0b83, 0x0 },
-		  { 0x0025, 0x0 } },
-		{ { 0x0b83, 0x0b95, 0x0 },
-		  { 0x0025, 0x0031, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0b95, 0x0bc2, 0x0 },
+                  { 0x004e, 0x0 } },
+                { { 0x0bae, 0x0bc2, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0b9a, 0x0bc2, 0x0 },
+                  { 0x0058, 0x0 } },
+                { { 0x0b99, 0x0bc2, 0x0 },
+                  { 0x0053, 0x0 } },
+                { { 0x0bb0, 0x0bc2, 0x0 },
+                  { 0x00a8, 0x0 } },
+                { { 0x0ba4, 0x0bc2, 0x0 },
+                  { 0x008e, 0x0 } },
+                { { 0x0b9f, 0x0bc2, 0x0 },
+                  { 0x0062, 0x0 } },
+                { { 0x0b95, 0x0bc6, 0x0 },
+                  { 0x000a, 0x0031, 0x0 } },
+                { { 0x0b95, 0x0bca, 0x0 },
+                  { 0x000a, 0x0031, 0x0007, 0x0 } },
+                { { 0x0b95, 0x0bc6, 0x0bbe, 0x0 },
+                  { 0x000a, 0x0031, 0x007, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0 },
+                  { 0x0049, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0bca, 0x0 },
+                  { 0x000a, 0x0049, 0x007, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0bc6, 0x0bbe, 0x0 },
+                  { 0x000a, 0x0049, 0x007, 0x0 } },
+                { { 0x0b9f, 0x0bbf, 0x0 },
+                  { 0x005f, 0x0 } },
+                { { 0x0b9f, 0x0bc0, 0x0 },
+                  { 0x0060, 0x0 } },
+                { { 0x0bb2, 0x0bc0, 0x0 },
+                  { 0x00ab, 0x0 } },
+                { { 0x0bb2, 0x0bbf, 0x0 },
+                  { 0x00aa, 0x0 } },
+                { { 0x0bb0, 0x0bcd, 0x0 },
+                  { 0x00a4, 0x0 } },
+                { { 0x0bb0, 0x0bbf, 0x0 },
+                  { 0x00a5, 0x0 } },
+                { { 0x0bb0, 0x0bc0, 0x0 },
+                  { 0x00a6, 0x0 } },
+                { { 0x0b83, 0x0 },
+                  { 0x0025, 0x0 } },
+                { { 0x0b83, 0x0b95, 0x0 },
+                  { 0x0025, 0x0031, 0x0 } },
                 { { 0xb95, 0xbc6, 0xbbe, 0x0 },
                   { 0xa, 0x31, 0x7, 0x0 } },
                 { { 0xb95, 0xbc7, 0xbbe, 0x0 },
@@ -676,11 +676,11 @@ void tst_QTextScriptEngine::tamil_data()
                 { { 0xb95, 0xbc6, 0xbd7, 0x0 },
                   { 0xa, 0x31, 0x40, 0x0 } },
 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find AkrutiTml1");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find AkrutiTml1");
     }
 }
 
@@ -701,35 +701,35 @@ void tst_QTextScriptEngine::telugu_data()
     {
         if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) {
             QFont f("Pothana2000");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0xc15, 0xc4d, 0x0 },
-                  { 0xbb, 0x0 } }, 
+                  { 0xbb, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0x0 },
-                  { 0x4b, 0x0 } }, 
+                  { 0x4b, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0xc4d, 0x0 },
-                  { 0xe0, 0x0 } }, 
+                  { 0xe0, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0xc4d, 0xc23, 0x0 },
-                  { 0x4b, 0x91, 0x0 } }, 
+                  { 0x4b, 0x91, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0x0 },
-                  { 0x5a, 0xb2, 0x0 } }, 
+                  { 0x5a, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc4d, 0x0 },
-                  { 0xbb, 0xb2, 0x0 } }, 
+                  { 0xbb, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc4d, 0xc15, 0x0 },
-                  { 0x5a, 0xb2, 0x83, 0x0 } }, 
+                  { 0x5a, 0xb2, 0x83, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc3f, 0x0 },
-                  { 0xe2, 0xb2, 0x0 } }, 
+                  { 0xe2, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc15, 0xc48, 0x0 },
                   { 0xe6, 0xb3, 0x83, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc48, 0x0 },
-                  { 0xe6, 0xb3, 0x9f, 0x0 } }, 
+                  { 0xe6, 0xb3, 0x9f, 0x0 } },
                 { { 0xc15, 0xc46, 0xc56, 0x0 },
                   { 0xe6, 0xb3, 0x0 } },
                 { {0}, {0} }
 
             };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Pothana2000");
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Pothana2000");
     }
 }
 
@@ -750,42 +750,42 @@ void tst_QTextScriptEngine::kannada_data()
     {
         if (QFontDatabase().families(QFontDatabase::Kannada).contains("Sampige")) {
             QFont f("Sampige");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0ca8, 0x0ccd, 0x0ca8, 0x0 },
-		  { 0x0049, 0x00ba, 0x0 } },
-		{ { 0x0ca8, 0x0ccd, 0x0ca1, 0x0 },
-		  { 0x0049, 0x00b3, 0x0 } },
-		{ { 0x0caf, 0x0cc2, 0x0 },
-		  { 0x004f, 0x005d, 0x0 } },
-		{ { 0x0ce0, 0x0 },
-		  { 0x006a, 0x0 } },
-		{ { 0x0ce6, 0x0ce7, 0x0ce8, 0x0 },
-		  { 0x006b, 0x006c, 0x006d, 0x0 } },
-		{ { 0x0cb5, 0x0ccb, 0x0 },
-		  { 0x015f, 0x0067, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x0cae, 0x0 },
-		  { 0x004e, 0x0082, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x0c95, 0x0 },
-		  { 0x0036, 0x0082, 0x0 } },
-		{ { 0x0c95, 0x0ccd, 0x0cb0, 0x0 },
-		  { 0x0036, 0x00c1, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x200d, 0x0c95, 0x0 },
-		  { 0x0050, 0x00a7, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Sampige");
+            const ShapeTable shape_table [] = {
+                { { 0x0ca8, 0x0ccd, 0x0ca8, 0x0 },
+                  { 0x0049, 0x00ba, 0x0 } },
+                { { 0x0ca8, 0x0ccd, 0x0ca1, 0x0 },
+                  { 0x0049, 0x00b3, 0x0 } },
+                { { 0x0caf, 0x0cc2, 0x0 },
+                  { 0x004f, 0x005d, 0x0 } },
+                { { 0x0ce0, 0x0 },
+                  { 0x006a, 0x0 } },
+                { { 0x0ce6, 0x0ce7, 0x0ce8, 0x0 },
+                  { 0x006b, 0x006c, 0x006d, 0x0 } },
+                { { 0x0cb5, 0x0ccb, 0x0 },
+                  { 0x015f, 0x0067, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x0cae, 0x0 },
+                  { 0x004e, 0x0082, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x0c95, 0x0 },
+                  { 0x0036, 0x0082, 0x0 } },
+                { { 0x0c95, 0x0ccd, 0x0cb0, 0x0 },
+                  { 0x0036, 0x00c1, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x200d, 0x0c95, 0x0 },
+                  { 0x0050, 0x00a7, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Sampige");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) {
             QFont f("Tunga");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0cb7, 0x0cc6, 0x0 },
-		  { 0x00b0, 0x006c, 0x0 } },
-		{ { 0x0cb7, 0x0ccd, 0x0 },
-		  { 0x0163, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0cb7, 0x0cc6, 0x0 },
+                  { 0x00b0, 0x006c, 0x0 } },
+                { { 0x0cb7, 0x0ccd, 0x0 },
+                  { 0x0163, 0x0 } },
                 { { 0xc95, 0xcbf, 0xcd5, 0x0 },
                   { 0x114, 0x73, 0x0 } },
                 { { 0xc95, 0xcc6, 0xcd5, 0x0 },
@@ -796,11 +796,11 @@ void tst_QTextScriptEngine::kannada_data()
                   { 0x90, 0x6c, 0x69, 0x0 } },
                 { { 0xc95, 0xcca, 0xcd5, 0x0 },
                   { 0x90, 0x6c, 0x69, 0x73, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Tunga");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Tunga");
     }
 }
 
@@ -821,33 +821,33 @@ void tst_QTextScriptEngine::malayalam_data()
     {
         if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) {
             QFont f("AkrutiMal2");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0d15, 0x0d46, 0x0 },
-		  { 0x005e, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d47, 0x0 },
-		  { 0x005f, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4b, 0x0 },
-		  { 0x005f, 0x0034, 0x0058, 0x0 } },
-		{ { 0x0d15, 0x0d48, 0x0 },
-		  { 0x0060, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4a, 0x0 },
-		  { 0x005e, 0x0034, 0x0058, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x0d15, 0x0 },
-		  { 0x009e, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4d, 0x0d35, 0x0 },
-		  { 0x0034, 0x007a, 0x0 } },
-		{ { 0x0d15, 0x0d4d, 0x0d2f, 0x0 },
-		  { 0x0034, 0x00a2, 0x0 } },
-		{ { 0x0d1f, 0x0d4d, 0x0d1f, 0x0 },
-		  { 0x0069, 0x0 } },
-		{ { 0x0d26, 0x0d4d, 0x0d26, 0x0 },
-		  { 0x0074, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x200c, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x200d, 0x0 },
-		  { 0x009e, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0d15, 0x0d46, 0x0 },
+                  { 0x005e, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d47, 0x0 },
+                  { 0x005f, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4b, 0x0 },
+                  { 0x005f, 0x0034, 0x0058, 0x0 } },
+                { { 0x0d15, 0x0d48, 0x0 },
+                  { 0x0060, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4a, 0x0 },
+                  { 0x005e, 0x0034, 0x0058, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x0d15, 0x0 },
+                  { 0x009e, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4d, 0x0d35, 0x0 },
+                  { 0x0034, 0x007a, 0x0 } },
+                { { 0x0d15, 0x0d4d, 0x0d2f, 0x0 },
+                  { 0x0034, 0x00a2, 0x0 } },
+                { { 0x0d1f, 0x0d4d, 0x0d1f, 0x0 },
+                  { 0x0069, 0x0 } },
+                { { 0x0d26, 0x0d4d, 0x0d26, 0x0 },
+                  { 0x0074, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x200c, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x200d, 0x0 },
+                  { 0x009e, 0x0 } },
                 { { 0xd15, 0xd46, 0xd3e, 0x0 },
                   { 0x5e, 0x34, 0x58, 0x0 } },
                 { { 0xd15, 0xd47, 0xd3e, 0x0 },
@@ -856,11 +856,11 @@ void tst_QTextScriptEngine::malayalam_data()
                   { 0x5e, 0x34, 0x65, 0x0 } },
                 { { 0xd15, 0xd57, 0x0 },
                   { 0x34, 0x65, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find AkrutiMal2");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find AkrutiMal2");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) {
@@ -879,7 +879,7 @@ void tst_QTextScriptEngine::malayalam_data()
 
                 { {0}, {0} }
             };
-        prepareShapingTest(f, shape_table);
+            prepareShapingTest(f, shape_table);
         } else
             QSKIP("couldn't find Rachana");
     }
@@ -917,7 +917,7 @@ void tst_QTextScriptEngine::sinhala_data()
                   { 0x4a, 0x61, 0x42, 0x41, 0x0 } },
                 { {0}, {0} }
             };
-        prepareShapingTest(f, shape_table);
+            prepareShapingTest(f, shape_table);
         } else
             QSKIP("couldn't find Malithi Web");
     }
@@ -940,30 +940,30 @@ void tst_QTextScriptEngine::khmer_data()
     {
         if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) {
             QFont f("Khmer OS");
-	    const ShapeTable shape_table [] = {
-		{ { 0x179a, 0x17cd, 0x0 },
-		  { 0x24c, 0x27f, 0x0 } },
-		{ { 0x179f, 0x17c5, 0x0 },
-		  { 0x273, 0x203, 0x0 } },
-		{ { 0x1790, 0x17d2, 0x1784, 0x17c3, 0x0 },
-		  { 0x275, 0x242, 0x182, 0x0 } },
-		{ { 0x179a, 0x0 },
-		  { 0x24c, 0x0 } },
-		{ { 0x1781, 0x17d2, 0x1798, 0x17c2, 0x0 },
-		  { 0x274, 0x233, 0x197, 0x0 } },
-		{ { 0x1798, 0x17b6, 0x0 },
-		  { 0x1cb, 0x0 } },
-		{ { 0x179a, 0x17b8, 0x0 },
-		  { 0x24c, 0x26a, 0x0 } },
-		{ { 0x1787, 0x17b6, 0x0 },
-		  { 0x1ba, 0x0 } },
-		{ { 0x1798, 0x17d2, 0x1796, 0x17bb, 0x0 },
-		  { 0x24a, 0x195, 0x26d, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Khmer OS");
+            const ShapeTable shape_table [] = {
+                { { 0x179a, 0x17cd, 0x0 },
+                  { 0x24c, 0x27f, 0x0 } },
+                { { 0x179f, 0x17c5, 0x0 },
+                  { 0x273, 0x203, 0x0 } },
+                { { 0x1790, 0x17d2, 0x1784, 0x17c3, 0x0 },
+                  { 0x275, 0x242, 0x182, 0x0 } },
+                { { 0x179a, 0x0 },
+                  { 0x24c, 0x0 } },
+                { { 0x1781, 0x17d2, 0x1798, 0x17c2, 0x0 },
+                  { 0x274, 0x233, 0x197, 0x0 } },
+                { { 0x1798, 0x17b6, 0x0 },
+                  { 0x1cb, 0x0 } },
+                { { 0x179a, 0x17b8, 0x0 },
+                  { 0x24c, 0x26a, 0x0 } },
+                { { 0x1787, 0x17b6, 0x0 },
+                  { 0x1ba, 0x0 } },
+                { { 0x1798, 0x17d2, 0x1796, 0x17bb, 0x0 },
+                  { 0x24a, 0x195, 0x26d, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Khmer OS");
     }
 }
 
@@ -984,14 +984,14 @@ void tst_QTextScriptEngine::linearB_data()
     {
         if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) {
             QFont f("Penuturesu");
-	    const ShapeTable shape_table [] = {
-		{ { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03,  0 },
+            const ShapeTable shape_table [] = {
+                { { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03,  0 },
                   { 0x5, 0x6, 0x7, 0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Penuturesu");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Penuturesu");
     }
 }
 
diff --git a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index d629b30ca6..7bb435952b 100644
--- a/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -875,17 +875,17 @@ void tst_QHttpNetworkConnection::getMultipleWithPipeliningAndMultiplePriorities(
             request = new QHttpNetworkRequest("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt", QHttpNetworkRequest::Get);
         else
             request = new QHttpNetworkRequest("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt", QHttpNetworkRequest::Head);
-        
+
         if (i % 2 || i % 3)
             request->setPipeliningAllowed(true);
-        
+
         if (i % 3)
             request->setPriority(QHttpNetworkRequest::HighPriority);
         else if (i % 5)
             request->setPriority(QHttpNetworkRequest::NormalPriority);
         else if (i % 7)
             request->setPriority(QHttpNetworkRequest::LowPriority);
-        
+
         requests.append(request);
         QHttpNetworkReply *reply = connection.sendRequest(*request);
         replies.append(reply);
diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 55eb1fed82..54b560cc1b 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -79,7 +79,7 @@ private slots:
 
     void oldCacheVersionFile_data();
     void oldCacheVersionFile();
-    
+
     void sync();
 
     void crashWhenParentingCache();
diff --git a/tests/auto/network/access/qnetworkreply/echo/main.cpp b/tests/auto/network/access/qnetworkreply/echo/main.cpp
index 6a4a959cdc..1f91c5da97 100644
--- a/tests/auto/network/access/qnetworkreply/echo/main.cpp
+++ b/tests/auto/network/access/qnetworkreply/echo/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **)
         printf("echos all its input to its output.\n");
         return 1;
     }
-    
+
     QFile file;
     file.open(stdin, QFile::ReadWrite);
     QByteArray data = file.readAll();
diff --git a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index a38b5f5338..f4cbfbe8f2 100644
--- a/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
@@ -96,7 +96,7 @@ void tst_QNetworkConfiguration::invalidPoint()
 void tst_QNetworkConfiguration::comparison()
 {
     //test copy constructor and assignment operator
-    //compare invalid connection points 
+    //compare invalid connection points
     QNetworkConfiguration pt1;
     QVERIFY(!pt1.isValid());
     QVERIFY(pt1.type() == QNetworkConfiguration::Invalid);
@@ -110,7 +110,7 @@ void tst_QNetworkConfiguration::comparison()
     QVERIFY(pt1.state() == pt2.state());
     QVERIFY(pt1.purpose() == pt2.purpose());
 
-    
+
     QNetworkConfiguration pt3;
     pt3 = pt1;
     QVERIFY(pt1==pt3);
@@ -170,12 +170,12 @@ void tst_QNetworkConfiguration::isRoamingAvailable()
 {
     QNetworkConfigurationManager manager;
     QList<QNetworkConfiguration> configs = manager.allConfigurations();
-    
+
     //force update to get maximum list
     QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
     manager.updateConfigurations(); //initiate scans
     QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 1, TestTimeOut); //wait for scan to complete
-    
+
     foreach(QNetworkConfiguration c, configs)
     {
         QVERIFY(QNetworkConfiguration::UserChoice != c.type());
diff --git a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
index 835b9aecfb..18aba51fe6 100644
--- a/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
@@ -64,7 +64,7 @@ private slots:
 #ifndef QT_NO_BEARERMANAGEMENT
 void printConfigurationDetails(const QNetworkConfiguration& p)
 {
-    qDebug() << p.name() <<":  isvalid->" <<p.isValid() << " type->"<< p.type() << 
+    qDebug() << p.name() <<":  isvalid->" <<p.isValid() << " type->"<< p.type() <<
                 " roaming->" << p.isRoamingAvailable() << "identifier->" << p.identifier() <<
                 " purpose->" << p.purpose() << " state->" << p.state();
 }
@@ -189,7 +189,7 @@ void tst_QNetworkConfigurationManager::configurationFromIdentifier()
     QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
     manager.updateConfigurations(); //initiate scans
     QTRY_VERIFY_WITH_TIMEOUT(spy.count() == 1, TestTimeOut); //wait for scan to complete
-    
+
     QList<QNetworkConfiguration> configs = manager.allConfigurations();
 
     foreach(QNetworkConfiguration c, configs) {
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
index 529f45f001..5dede11e5b 100644
--- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
@@ -139,7 +139,7 @@ void tst_QNetworkSession::cleanupTestCase()
 }
 
 // Robustness test for calling interfaces in nonsense order / with nonsense parameters
-void tst_QNetworkSession::robustnessBombing() 
+void tst_QNetworkSession::robustnessBombing()
 {
     QNetworkConfigurationManager mgr;
     QNetworkSession testSession(mgr.defaultConfiguration());
@@ -199,18 +199,18 @@ void tst_QNetworkSession::invalidSession()
     QVERIFY(!session.isOpen());
     QVERIFY(session.state() == QNetworkSession::Invalid);
     QVERIFY(session.error() == QNetworkSession::InvalidConfigurationError);
-    
+
     // 2. Verify that opening session with invalid configuration both 1) emits invalidconfigurationerror and 2) sets session's state as invalid.
     QSignalSpy errorSpy(&session, SIGNAL(error(QNetworkSession::SessionError)));
     session.open();
     session.waitForOpened(1000); // Should bail out right away
-    QVERIFY(errorSpy.count() == 1); 
+    QVERIFY(errorSpy.count() == 1);
     QNetworkSession::SessionError error =
            qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
     QVERIFY(error == QNetworkSession::InvalidConfigurationError);
     QVERIFY(session.error() == QNetworkSession::InvalidConfigurationError);
     QVERIFY(session.state() == QNetworkSession::Invalid);
-    	
+
 #ifdef QNETWORKSESSION_MANUAL_TESTS
 
     QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
@@ -354,7 +354,7 @@ void tst_QNetworkSession::repeatedOpenClose()
     QNetworkSession permanentSession(config);
     if (!openSession(&permanentSession) || !closeSession(&permanentSession))
         QSKIP("Unable to open/close session, skipping this round of repeated open-close test.");
-    for (int i = 0; i < repeatTimes; i++) { 
+    for (int i = 0; i < repeatTimes; i++) {
        qDebug() << "Opening, loop number " << i;
        QVERIFY(openSession(&permanentSession));
        qDebug() << "Closing, loop number, then waiting 5 seconds: " << i;
@@ -469,7 +469,7 @@ void tst_QNetworkSession::userChoiceSession()
 
             QVERIFY(activeConfiguration.isValid());
             QVERIFY(activeConfiguration.type() == QNetworkConfiguration::InternetAccessPoint);
-            
+
             //resetting ActiveConfiguration is ignored (read only property)
             session.setSessionProperty("ActiveConfiguration", testIdentifier);
             QVERIFY(session.sessionProperty("ActiveConfiguration").toString() != testIdentifier);
@@ -612,7 +612,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
         QVERIFY(session.error() == QNetworkSession::UnknownSessionError);
 
         session2.open();
-	    
+
         QTRY_VERIFY_WITH_TIMEOUT(!sessionOpenedSpy2.isEmpty() || !errorSpy2.isEmpty(), TestTimeOut);
 
         if (errorSpy2.isEmpty()) {
@@ -666,10 +666,10 @@ void tst_QNetworkSession::sessionOpenCloseStop()
 
         QVERIFY(errorSpy.isEmpty());
         QVERIFY(errorSpy2.isEmpty());
-        
-        // Wait for Disconnected state 
+
+        // Wait for Disconnected state
         QTRY_NOOP(session2.state() == QNetworkSession::Disconnected);
-	
+
         if (expectStateChange)
             QTRY_VERIFY_WITH_TIMEOUT(stateChangedSpy2.count() >= 1 || !errorSpy2.isEmpty(), TestTimeOut);
 
@@ -722,14 +722,14 @@ void tst_QNetworkSession::sessionOpenCloseStop()
                     } else {
                         QFAIL("Unexpected amount of state changes when roaming.");
                     }
-			
+
                     QTRY_VERIFY_WITH_TIMEOUT(session.state() == QNetworkSession::Roaming ||
                                 session.state() == QNetworkSession::Connected ||
                                 session.state() == QNetworkSession::Disconnected, TestTimeOut);
-                    
+
                     QTRY_VERIFY_WITH_TIMEOUT(stateChangedSpy.count() > 0, TestTimeOut);
-                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0));                    
-                    
+                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0));
+
                     for (int i = 0; i < stateChangedSpy.count(); i++) {
                         QNetworkSession::State state_temp =
                                 qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(i).at(0));
@@ -753,7 +753,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
                         QTRY_VERIFY_WITH_TIMEOUT(errorSpy.isEmpty(),TestTimeOut);
 
                         if (stateChangedSpy.count() > 1) {
-                            state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0));                        
+                            state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0));
                             QVERIFY(state == QNetworkSession::Roaming);
                         }
                         roamedSuccessfully = true;
@@ -778,7 +778,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
                         QVERIFY(!errorSpy.isEmpty());
                 } else {
                     QTest::qWait(2000); // Wait awhile to get all signals from platform
-        
+
                     if (stateChangedSpy2.count() == 2)  {
                         QNetworkSession::State state =
                             qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
@@ -797,7 +797,7 @@ void tst_QNetworkSession::sessionOpenCloseStop()
 
                         QNetworkSession::State state =
                                 qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(stateChangedSpy2.count() - 1).at(0));
-                        QVERIFY(state == QNetworkSession::Disconnected);	
+                        QVERIFY(state == QNetworkSession::Disconnected);
                     }
                 }
 
@@ -920,7 +920,7 @@ void tst_QNetworkSession::outOfProcessSession()
     // Cannot read/write to processes on WinCE.
     // Easiest alternative is to use sockets for IPC.
     QLocalServer oopServer;
-    // First remove possible earlier listening address which would cause listen to fail 
+    // First remove possible earlier listening address which would cause listen to fail
     // (e.g. previously abruptly ended unit test might cause this)
     QLocalServer::removeServer("tst_qnetworksession");
     oopServer.listen("tst_qnetworksession");
@@ -1034,7 +1034,7 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
                 // qDebug() << "Dumping config because bearer mismatches (cellular): " << config.name();
                 discoveredConfigs.removeOne(config);
             }
-        } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) && 
+        } else if ((config.type() == QNetworkConfiguration::InternetAccessPoint) &&
                     bearerType != config.bearerTypeName()) {
             // qDebug() << "Dumping config because bearer mismatches (WLAN): " << config.name();
             discoveredConfigs.removeOne(config);
@@ -1109,12 +1109,12 @@ bool openSession(QNetworkSession *session) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::error() - signal was detected.");
         result = false;
     }
-    if (sessionInitState != QNetworkSession::Connected && 
+    if (sessionInitState != QNetworkSession::Connected &&
         stateChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::stateChanged() - signals not detected.");
         result =  false;
     }
-    if (configInitState != QNetworkConfiguration::Active && 
+    if (configInitState != QNetworkConfiguration::Active &&
         configChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkConfigurationManager::configurationChanged() - signals not detected.");
         result =  false;
@@ -1132,7 +1132,7 @@ bool openSession(QNetworkSession *session) {
     qDebug() << "tst_QNetworkSession::openSession() name of the configuration is:  " << session->configuration().name();
     qDebug() << "tst_QNetworkSession::openSession() configuration state is:  " << session->configuration().state();
     qDebug() << "tst_QNetworkSession::openSession() session state is:  " << session->state();
-	    
+
     return result;
 }
 
@@ -1146,26 +1146,26 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
         qDebug("tst_QNetworkSession::closeSession() failure: NULL session given");
         return false;
     }
-    
+
     qDebug() << "tst_QNetworkSession::closeSession() name of the configuration to be closed:  " << session->configuration().name();
     qDebug() << "tst_QNetworkSession::closeSession() state of the configuration to be closed:  " << session->configuration().state();
     qDebug() << "tst_QNetworkSession::closeSession() state of the session to be closed:  " << session->state();
-    
-    if (session->state() != QNetworkSession::Connected || 
+
+    if (session->state() != QNetworkSession::Connected ||
         !session->isOpen()) {
         qDebug("tst_QNetworkSession::closeSession() failure: session is not opened.");
         return false;
-    }    
+    }
     QNetworkConfigurationManager mgr;
     QSignalSpy sessionClosedSpy(session, SIGNAL(closed()));
     QSignalSpy sessionStateChangedSpy(session, SIGNAL(stateChanged(QNetworkSession::State)));
     QSignalSpy sessionErrorSpy(session, SIGNAL(error(QNetworkSession::SessionError)));
     QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration)));
-    
+
     bool result = true;
     session->close();
     QTest::qWait(5000); // Wait a moment so that all signals are propagated
-    
+
     if (!sessionErrorSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::error() received.");
         result = false;
@@ -1174,7 +1174,7 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::closed() signal not received.");
         result = false;
     }
-    if (lastSessionOnConfiguration && 
+    if (lastSessionOnConfiguration &&
         sessionStateChangedSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::stateChanged() signals not received.");
         result = false;
@@ -1199,7 +1199,7 @@ bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration) {
 	    qDebug() << "tst_QNetworkSession::closeSession() closing session failed.";
     } else {
 	    qDebug() << "tst_QNetworkSession::closeSession() closing session succeeded.";
-    } 
+    }
     qDebug() << "tst_QNetworkSession::closeSession() name of the configuration is:  " << session->configuration().name();
     qDebug() << "tst_QNetworkSession::closeSession() configuration state is:  " << session->configuration().state();
     qDebug() << "tst_QNetworkSession::closeSession() session state is:  " << session->state();
diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index 3b4af27d4e..dd9202c748 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -266,7 +266,7 @@ void tst_QHostAddress::specialAddresses_data()
 
     QTest::newRow("null_1") << QString("") << (int)QHostAddress::Null << true;
     QTest::newRow("null_2") << QString("bjarne") << (int)QHostAddress::Null << true;
-    
+
     QTest::newRow("compare_from_null") << QString("") << (int)QHostAddress::Broadcast << false;
 
     QTest::newRow("broadcast_1") << QString("255.255.255.255") << (int)QHostAddress::Any << false;
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 0ffcb60090..159f276c77 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -986,7 +986,7 @@ public:
 
         if (!socket.waitForConnected(3000))
             exec();
-        connect(&socket, SIGNAL(bytesWritten(qint64)), 
+        connect(&socket, SIGNAL(bytesWritten(qint64)),
         this, SLOT(bytesWritten(qint64)), Qt::QueuedConnection);
         socket.write("testing\n");
         exec();
@@ -1004,9 +1004,9 @@ private:
     signal.
 
     Create a thread that will write to a socket.
-    If the bytesWritten(qint64) signal is generated, 
+    If the bytesWritten(qint64) signal is generated,
     the slot connected to it will exit the thread,
-    indicating test success.  
+    indicating test success.
 
 */
 void tst_QLocalSocket::bytesWrittenSignal()
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index 27f6640bdc..15ce1a0a12 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
@@ -48,7 +48,7 @@
 #include "Test.h"
 
 //------------------------------------------------------------------------------
-My4Socket::My4Socket(QObject *parent) 
+My4Socket::My4Socket(QObject *parent)
     : QTcpSocket(parent), safeShutDown(false)
 {
     connect(this, SIGNAL(readyRead()), this, SLOT(read()));
@@ -74,7 +74,7 @@ void My4Socket::read(void)
         if (reply == 42)
             ++reply;
     }
-    
+
     // Reply with a bigger number
     sendTest(reply);
 }
diff --git a/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
index 8bbe351b45..4376e872e8 100644
--- a/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
@@ -62,6 +62,6 @@ int main(int argc, char **argv)
     }
 
     Test test(type);
-    
+
     return app.exec();
 }
diff --git a/tests/auto/network/socket/qudpsocket/udpServer/main.cpp b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
index 6d866c2aa7..47adac3e77 100644
--- a/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
@@ -68,10 +68,10 @@ private slots:
         qint64 bytes = serverSocket.readDatagram(data, sizeof(data), &senderAddress, &senderPort);
         if (bytes == 1 && data[0] == '\0')
             QCoreApplication::instance()->quit();
-        
+
         for (int i = 0; i < bytes; ++i)
             data[i] += 1;
-        serverSocket.writeDatagram(data, bytes, senderAddress, senderPort);        
+        serverSocket.writeDatagram(data, bytes, senderAddress, senderPort);
     }
 
 private:
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
     QCoreApplication app(argc, argv);
 
     Server server(app.arguments().at(1).toInt());
-    
+
     return app.exec();
 }
 
diff --git a/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
index 4f375c8ab3..73537d124f 100644
--- a/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
+++ b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
@@ -81,7 +81,7 @@ public slots:
 private slots:
     void constructing();
 #endif
-    
+
 private:
     static int loopLevel;
 };
diff --git a/tests/auto/other/collections/tst_collections.cpp b/tests/auto/other/collections/tst_collections.cpp
index e145cc17df..df622602c3 100644
--- a/tests/auto/other/collections/tst_collections.cpp
+++ b/tests/auto/other/collections/tst_collections.cpp
@@ -3359,7 +3359,7 @@ void testVectorAlignment()
 
     for (int i = 0; i < 200; ++i)
         container.append(Aligned());
-    
+
     for (int i = 0; i < container.size(); ++i)
         QCOMPARE(quintptr(&container.at(i)) % Aligned::PreferredAlignment, quintptr(0));
 }
diff --git a/tests/auto/other/lancelot/scripts/background.qps b/tests/auto/other/lancelot/scripts/background.qps
index 000cfcdd91..d1efe5c178 100644
--- a/tests/auto/other/lancelot/scripts/background.qps
+++ b/tests/auto/other/lancelot/scripts/background.qps
@@ -14,12 +14,12 @@ path_lineTo path 0 50
 bitmap_load bitmap.png bitmap
 
 begin_block drawing
-  save 
+  save
     drawRect 0 0 50 50
 
     translate 60 0
     drawEllipse 0 0 50 50
-  
+
     translate 60 0
     drawPolygon [0 0 50 0 25 50 25 25]
 
@@ -28,9 +28,9 @@ begin_block drawing
 
     translate 60 0
     drawPie 0 0 50 50 1440 2000
-    
+
     translate 60 0
-    drawChord 0 0 50 50 1440 2000 
+    drawChord 0 0 50 50 1440 2000
 
     translate 60 0
     drawLine 0 0 50 0
@@ -44,10 +44,10 @@ begin_block drawing
     drawArc 0 0 50 50 1440 2000
 
     translate 60 0
-    drawText 0 10 "Jambi-Bambi"    
+    drawText 0 10 "Jambi-Bambi"
 
     translate 80 0
-    drawPixmap bitmap 0 0 
+    drawPixmap bitmap 0 0
   restore
 
   save
@@ -57,7 +57,7 @@ begin_block drawing
 
     translate 60 0
     drawEllipse 0 0 50 50
-  
+
     translate 60 0
     drawPolygon [0 0 50 0 25 50 25 25]
 
@@ -66,9 +66,9 @@ begin_block drawing
 
     translate 60 0
     drawPie 0 0 50 50 1440 2000
-    
+
     translate 60 0
-    drawChord 0 0 50 50 1440 2000 
+    drawChord 0 0 50 50 1440 2000
 
     translate 60 0
     drawLine 0 0 50 0
@@ -82,10 +82,10 @@ begin_block drawing
     drawArc 0 0 50 50 1440 2000
 
     translate 60 0
-    drawText 0 10 "Jambi-Bambi"    
+    drawText 0 10 "Jambi-Bambi"
 
     translate 80 0
-    drawPixmap bitmap 0 0 
+    drawPixmap bitmap 0 0
   restore
 end_block
 
@@ -102,12 +102,12 @@ repeat_block drawing
 translate 0 160
 setBackgroundMode Transparent
 setPen ff7f7f 4 dashline flatcap beveljoin
-repeat_block drawing    
+repeat_block drawing
 
 translate 0 160
 setBackgroundMode OpaqueMode
 setPen ff7f7f 4 dashline flatcap beveljoin
-repeat_block drawing    
+repeat_block drawing
 
 resetMatrix
 
diff --git a/tests/auto/other/lancelot/scripts/bitmaps.qps b/tests/auto/other/lancelot/scripts/bitmaps.qps
index a816b9d497..4966490337 100644
--- a/tests/auto/other/lancelot/scripts/bitmaps.qps
+++ b/tests/auto/other/lancelot/scripts/bitmaps.qps
@@ -122,12 +122,12 @@ translate 110 0
 save
   translate 20 -10
   rotate 10
-  setBackgroundMode Transparent  
+  setBackgroundMode Transparent
   repeat_block draw_subrected
 restore
 
 translate 110 0
-save 
+save
   translate 20 -10
   rotate 10
   setBackgroundMode Opaque
diff --git a/tests/auto/other/lancelot/scripts/clippaths.qps b/tests/auto/other/lancelot/scripts/clippaths.qps
index fba89784df..fe8e198a17 100644
--- a/tests/auto/other/lancelot/scripts/clippaths.qps
+++ b/tests/auto/other/lancelot/scripts/clippaths.qps
@@ -4,7 +4,7 @@
 path_addRect hor 0 0 50 10
 path_addRect ver 0 0 10 50
 
-translate 10 10 
+translate 10 10
 setPen NoPen
 
 begin_block clipping
@@ -13,7 +13,7 @@ save
   setBrush 0x7f7fff
   save
     setClipPath hor
-    drawRect 0 0 100 100 
+    drawRect 0 0 100 100
 
     setClipPath ver IntersectClip
     setBrush black CrossPattern
@@ -21,18 +21,18 @@ save
   restore
 
   translate 100 0
-  save 
+  save
     setClipPath hor
     drawRect 0 0 100 100
 
     setClipPath ver ReplaceClip
     setBrush black CrossPattern
-    drawRect 0 0 100 100 
+    drawRect 0 0 100 100
   restore
 
   translate 100 0
-  save 
-    setClipPath hor 
+  save
+    setClipPath hor
     drawRect 0 0 100 100
 
     setClipPath ver UniteClip
diff --git a/tests/auto/other/lancelot/scripts/cliprects.qps b/tests/auto/other/lancelot/scripts/cliprects.qps
index 0d28b035b4..aa0367eccf 100644
--- a/tests/auto/other/lancelot/scripts/cliprects.qps
+++ b/tests/auto/other/lancelot/scripts/cliprects.qps
@@ -3,7 +3,7 @@
 
 
 
-translate 10 10 
+translate 10 10
 setPen NoPen
 
 begin_block clipping
@@ -11,8 +11,8 @@ save
 
   setBrush 0x7f7fff
   save
-    setClipRect 0 0 50 10 
-    drawRect 0 0 100 100 
+    setClipRect 0 0 50 10
+    drawRect 0 0 100 100
 
     setClipRect 0 0 10 50 IntersectClip
     setBrush black CrossPattern
@@ -20,17 +20,17 @@ save
   restore
 
   translate 100 0
-  save 
+  save
     setClipRect 0 0 50 10
     drawRect 0 0 100 100
 
     setClipRect 0 0  10 50 ReplaceClip
     setBrush black CrossPattern
-    drawRect 0 0 100 100 
+    drawRect 0 0 100 100
   restore
 
   translate 100 0
-  save 
+  save
     setClipRect 0 0 50 10
     drawRect 0 0 100 100
 
diff --git a/tests/auto/other/lancelot/scripts/conical_gradients.qps b/tests/auto/other/lancelot/scripts/conical_gradients.qps
index 2e897b1813..d6eb860f3f 100644
--- a/tests/auto/other/lancelot/scripts/conical_gradients.qps
+++ b/tests/auto/other/lancelot/scripts/conical_gradients.qps
@@ -64,7 +64,7 @@ setBrush nobrush
 begin_block ellipse_draw
   setClipRect 0 0 100 100
   drawEllipse 35 35 11 11
-  save 
+  save
     translate 40 40
     rotate -50
     drawLine -100 0 100 0
diff --git a/tests/auto/other/lancelot/scripts/dashes.qps b/tests/auto/other/lancelot/scripts/dashes.qps
index 649f56cf66..185443a292 100644
--- a/tests/auto/other/lancelot/scripts/dashes.qps
+++ b/tests/auto/other/lancelot/scripts/dashes.qps
@@ -15,7 +15,7 @@ save
     setPen black 1 SolidLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 SolidLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -25,7 +25,7 @@ save
     setPen black 2 SolidLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 6 SolidLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -36,8 +36,8 @@ save
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
   restore
-  
-  
+
+
   translate 100 0
   save
     setPen black 1 DotLine FlatCap BevelJoin
@@ -49,7 +49,7 @@ save
     setPen black 1 DotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 DotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -59,7 +59,7 @@ save
     setPen black 2 DotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 6 DotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -70,7 +70,7 @@ save
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
   restore
-  
+
   translate 100 0
   save
     setPen black 1 DashLine FlatCap BevelJoin
@@ -82,7 +82,7 @@ save
     setPen black 1 DashLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 DashLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -92,7 +92,7 @@ save
     setPen black 2 DashLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 6 DashLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -103,9 +103,9 @@ save
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
   restore
-  
+
   translate 100 0
-  
+
   save
     setPen black 1 DashDotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
@@ -116,7 +116,7 @@ save
     setPen black 1 DashDotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 DashDotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -126,7 +126,7 @@ save
     setPen black 2 DashDotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 6 DashDotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -137,7 +137,7 @@ save
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
   restore
- 
+
   translate 100 0
 
   save
@@ -150,7 +150,7 @@ save
     setPen black 1 DashDotDotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 DashDotDotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -160,7 +160,7 @@ save
     setPen black 2 DashDotDotLine RoundCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 4 DashDotDotLine FlatCap BevelJoin
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
@@ -187,7 +187,7 @@ save
     pen_setDashPattern [1 4 9 4 27 4]
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 2 SolidLine FlatCap BevelJoin
     pen_setDashPattern [1 4 9 4 27 4]
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
@@ -200,7 +200,7 @@ save
     pen_setDashPattern [1 4 9 4 27 4]
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
     translate 0 40
-  
+
     setPen black 4 SolidLine FlatCap BevelJoin
     pen_setDashPattern [1 4 9 4 27 4]
     drawPolyline [0 0 80 0 80 30 40 20 0 30]
@@ -217,7 +217,7 @@ save
 
 restore
 end_block
-  
+
 translate 0 400
 setRenderHint Antialiasing
 repeat_block draw
diff --git a/tests/auto/other/lancelot/scripts/deviceclipping.qps b/tests/auto/other/lancelot/scripts/deviceclipping.qps
index cedfc1e363..8608a50994 100644
--- a/tests/auto/other/lancelot/scripts/deviceclipping.qps
+++ b/tests/auto/other/lancelot/scripts/deviceclipping.qps
@@ -22,7 +22,7 @@ begin_block drawing
   drawRect 300 -500000 1000000 1000000
 
   drawPath path
-  
+
 end_block
 
 save
diff --git a/tests/auto/other/lancelot/scripts/pixmap_scaling.qps b/tests/auto/other/lancelot/scripts/pixmap_scaling.qps
index 651896f4a3..8a5ab2c60e 100644
--- a/tests/auto/other/lancelot/scripts/pixmap_scaling.qps
+++ b/tests/auto/other/lancelot/scripts/pixmap_scaling.qps
@@ -8,8 +8,8 @@
 translate 5 25
 setFont "arial" 8
 
-save 
-  drawText 15 0 "opaque image" 
+save
+  drawText 15 0 "opaque image"
   translate 50 50
   save
     translate 1 1
@@ -21,23 +21,23 @@ save
     scale -20 20
     drawImage solid2x2.png 0 0
   restore
-  save 
+  save
     translate 1 -1
     scale 20 -20
     drawImage solid2x2.png 0 0
   restore
-  save 
+  save
     translate -1 -1
     scale -20 -20
     drawImage solid2x2.png 0 0
   restore
 
-  
-restore 
+
+restore
 
 save
   translate 150 0
-  drawText 15 0 "alpha image" 
+  drawText 15 0 "alpha image"
   translate 50 50
   save
     translate 1 1
@@ -49,12 +49,12 @@ save
     scale -20 20
     drawImage alpha2x2.png 0 0
   restore
-  save 
+  save
     translate 1 -1
     scale 20 -20
     drawImage alpha2x2.png 0 0
   restore
-  save 
+  save
     translate -1 -1
     scale -20 -20
     drawImage alpha2x2.png 0 0
@@ -64,7 +64,7 @@ restore
 
 save
   translate 0 150
-  drawText 15 0 "solid pixmap" 
+  drawText 15 0 "solid pixmap"
   translate 50 50
   save
     translate 1 1
@@ -76,12 +76,12 @@ save
     scale -20 20
     drawPixmap solid2x2.png 0 0
   restore
-  save 
+  save
     translate 1 -1
     scale 20 -20
     drawPixmap solid2x2.png 0 0
   restore
-  save 
+  save
     translate -1 -1
     scale -20 -20
     drawPixmap solid2x2.png 0 0
@@ -90,9 +90,9 @@ restore
 
 
 save
-  translate 150 150 
+  translate 150 150
   drawText 15 0 "alpha pixmap"
-  translate 50 50 
+  translate 50 50
   save
     translate 1 1
     scale 20 20
@@ -103,12 +103,12 @@ save
     scale -20 20
     drawPixmap alpha2x2.png 0 0
   restore
-  save 
+  save
     translate 1 -1
     scale 20 -20
     drawPixmap alpha2x2.png 0 0
   restore
-  save 
+  save
     translate -1 -1
     scale -20 -20
     drawPixmap alpha2x2.png 0 0
@@ -116,7 +116,7 @@ save
 restore
 
 
-save 
+save
   translate 300 10
   save
     drawText 0 -10 "subrect solid image"
@@ -143,7 +143,7 @@ save
     drawImage solid2x2.png 45 0 5 50  1.8 0 0.2 2
   restore
 
-  save  
+  save
     translate 150 0
     drawText 0 -10 "subrect solid image"
     drawImage alpha2x2.png 0  0 50 5  0 0.0 2 0.2
@@ -156,7 +156,7 @@ save
     drawImage alpha2x2.png 0 35 50 5  0 1.4 2 0.2
     drawImage alpha2x2.png 0 40 50 5  0 1.6 2 0.2
     drawImage alpha2x2.png 0 45 50 5  0 1.8 2 0.2
-    translate 60 0 
+    translate 60 0
     drawImage alpha2x2.png 0  0 5 50  0.0 0 0.2 2
     drawImage alpha2x2.png 5  0 5 50  0.2 0 0.2 2
     drawImage alpha2x2.png 10 0 5 50  0.4 0 0.2 2
diff --git a/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps b/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps
index 908f7c3465..d5b7b92fc9 100644
--- a/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps
+++ b/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps
@@ -6,7 +6,7 @@ translate 50 50
 
 # Pixmaps at 0.1 offset, unclipped
 begin_block draw_pixmaps
-save  
+save
   drawPixmap border.png 0 0
   translate 20.1 0.1
   drawPixmap border.png 0 0
@@ -27,7 +27,7 @@ save
   translate 20.1 0.1
   drawPixmap border.png 0 0
   translate 20.1 0.1
-  
+
   drawPixmap border.png 0 0
   translate 20.1 0.1
   drawPixmap border.png 0 0
@@ -49,12 +49,12 @@ save
   drawPixmap border.png 0 0
   translate 20.1 0.1
 restore
-end_block 
+end_block
 
 # Tiled pixmaps at 0.1 offsets, unclipped
 translate 0 50
 begin_block draw_tiled
-save  
+save
   drawTiledPixmap border.png 0 0 16 16 0 0
   translate 20.1 0.1
   drawTiledPixmap border.png 0 0 16 16 0 0
@@ -75,7 +75,7 @@ save
   translate 20.1 0.1
   drawTiledPixmap border.png 0 0 16 16 0 0
   translate 20.1 0.1
-  
+
   drawTiledPixmap border.png 0 0 16 16 0 0
   translate 20.1 0.1
   drawTiledPixmap border.png 0 0 16 16 0 0
@@ -97,7 +97,7 @@ save
   drawTiledPixmap border.png 0 0 16 16 0 0
   translate 20.1 0.1
 restore
-end_block 
+end_block
 
 
 path_moveTo clip 0 0
diff --git a/tests/auto/other/lancelot/scripts/pixmaps.qps b/tests/auto/other/lancelot/scripts/pixmaps.qps
index 8e60997acc..0b4ba2c4fb 100644
--- a/tests/auto/other/lancelot/scripts/pixmaps.qps
+++ b/tests/auto/other/lancelot/scripts/pixmaps.qps
@@ -15,13 +15,13 @@ save
   drawPixmap the_pixmap 0 0
 
   # sub recting
-  translate 120 0 
+  translate 120 0
   drawPixmap the_pixmap  0  0  40  40  0  0  40  40
   drawPixmap the_pixmap 60  0  40  40 60  0  40  40
   drawPixmap the_pixmap  0 60  40  40  0 60  40  40
   drawPixmap the_pixmap 60 60  40  40 60 60  40  40
   drawPixmap the_pixmap  0 40  40  20  0 40  40  20
-  drawPixmap the_pixmap 60 40  40  20 60 40  40  20 
+  drawPixmap the_pixmap 60 40  40  20 60 40  40  20
   drawPixmap the_pixmap 40  0  20 100 40  0  20 100
 
   # subrecting w/scale
@@ -30,15 +30,15 @@ save
   drawPixmap the_pixmap 50 0 50 50 25 0 25 25
   drawPixmap the_pixmap 0 50 50 50 0 25 25 25
   drawPixmap the_pixmap 50 50 50 50 25 25 25 25
-  
+
   # subrecting w/scale & smooth xform
   translate 120 0
-  setRenderHint SmoothPixmapTransformation 
+  setRenderHint SmoothPixmapTransformation
   drawPixmap the_pixmap 0 0 50 50 0 0 25 25
   drawPixmap the_pixmap 50 0 50 50 25 0 25 25
   drawPixmap the_pixmap 0 50 50 50 0 25 25 25
   drawPixmap the_pixmap 50 50 50 50 25 25 25 25
-  
+
 
   # Rotation w/o smooth xform
   translate 120 0
diff --git a/tests/auto/other/lancelot/scripts/rasterops.qps b/tests/auto/other/lancelot/scripts/rasterops.qps
index 21f943b543..d0f2da42df 100644
--- a/tests/auto/other/lancelot/scripts/rasterops.qps
+++ b/tests/auto/other/lancelot/scripts/rasterops.qps
@@ -13,9 +13,9 @@ begin_block drawShape
   setBrush 0xffff0000
   drawEllipse 5 5 30 30
   setBrush 0xff00ff00
-  drawRect 0 0 20 20 
+  drawRect 0 0 20 20
   setBrush 0xff0000ff
-  drawRect 20 20 20 20 
+  drawRect 20 20 20 20
 end_block
 
 begin_block loop
diff --git a/tests/auto/other/lancelot/scripts/sizes.qps b/tests/auto/other/lancelot/scripts/sizes.qps
index 68e01c3262..12b0f4af1e 100644
--- a/tests/auto/other/lancelot/scripts/sizes.qps
+++ b/tests/auto/other/lancelot/scripts/sizes.qps
@@ -4,7 +4,7 @@
 setPen NoPen
 setBrush black
 
-translate 10 10 
+translate 10 10
 
 begin_block testblock
 drawRect 0   0 10 10
@@ -75,9 +75,9 @@ drawChord 180  100 19 19 0 4320
 
 end_block
 
-setPen red 
+setPen red
 translate 0 150
-repeat_block testblock 
+repeat_block testblock
 
 setRenderHint LineAntialiasing
 
diff --git a/tests/auto/other/lancelot/scripts/text.qps b/tests/auto/other/lancelot/scripts/text.qps
index 88c8690ca0..e7d47448ea 100644
--- a/tests/auto/other/lancelot/scripts/text.qps
+++ b/tests/auto/other/lancelot/scripts/text.qps
@@ -7,47 +7,47 @@ begin_block text_drawing
 save
   setFont "sansserif" 10 normal
   drawText 0 20 "sansserif 10pt, normal"
-  
+
   setFont "sansserif" 12 normal
   drawText 0 40 "sansserif 12pt, normal"
-  
+
   setFont "sansserif" 10 bold
   drawText 0 60 "sansserif 12pt, bold"
-  
+
   setFont "sansserif" 10 bold italic
   drawText 0 80 "sansserif 10pt, bold italic"
-  
-  
+
+
   translate 0 100
   setPen #7fff0000
-  
+
   setFont "sansserif" 10 normal
   drawText 0 20 "alpha sansserif 10pt, normal"
-  
+
   setFont "sansserif" 12 normal
   drawText 0 40 "alpha sansserif 12pt, normal"
-  
+
   setFont "sansserif" 10 bold
   drawText 0 60 "alpha sansserif 12pt, bold"
-  
+
   setFont "sansserif" 10 bold italic
   drawText 0 80 "alpha sansserif 10pt, bold italic"
-  
-  
+
+
   translate 0 100
   setPen black
   save
     scale 0.9 0.9
-  
+
     setFont "sansserif" 10 normal
     drawText 0 20 "scaled sansserif 10pt, normal"
-  
+
     setFont "sansserif" 12 normal
     drawText 0 40 "scaled sansserif 12pt, normal"
-  
+
     setFont "sansserif" 10 bold
     drawText 0 60 "scaled sansserif 12pt, bold"
-  
+
     setFont "sansserif" 10 bold italic
     drawText 0 80 "scaled sansserif 10pt, bold italic"
   restore
@@ -75,36 +75,36 @@ save
   save
     translate 200 90
     rotate 185
-  
+
     setFont "sansserif" 10 normal
     drawText 0 20 "scaled sansserif 10pt, normal"
-  
+
     setFont "sansserif" 12 normal
     drawText 0 40 "scaled sansserif 12pt, normal"
-  
+
     setFont "sansserif" 10 bold
     drawText 0 60 "scaled sansserif 12pt, bold"
-  
+
     setFont "sansserif" 10 bold italic
     drawText 0 80 "scaled sansserif 10pt, bold italic"
   restore
-  
+
   translate 0 100
   gradient_appendStop 0 red
   gradient_appendStop 0.5 #00ff00
   gradient_appendStop 1 blue
   gradient_setLinear 0 0 200 0
   setPen brush
-  
+
   setFont "sansserif" 10 normal
   drawText 0 0 "gradient sansserif 10pt, normal"
-  
+
   setFont "sansserif" 12 normal
   drawText 0 20 "gradient sansserif 12pt, normal"
-  
+
   setFont "sansserif" 10 bold
   drawText 0 40 "gradient sansserif 12pt, bold"
-  
+
   setFont "sansserif" 10 bold italic
   drawText 0 60 "gradient sansserif 10pt, bold italic"
 restore
@@ -123,7 +123,7 @@ restore
 
 translate 150 0
 drawText 25 640 "clipped to path"
-save 
+save
   path_moveTo clip 20 0
   path_cubicTo clip 0 200  40 400  20 400
   path_lineTo clip 30 620
diff --git a/tests/auto/other/lancelot/scripts/tiled_pixmap.qps b/tests/auto/other/lancelot/scripts/tiled_pixmap.qps
index 9cb5e0dd1f..0ce3a7834c 100644
--- a/tests/auto/other/lancelot/scripts/tiled_pixmap.qps
+++ b/tests/auto/other/lancelot/scripts/tiled_pixmap.qps
@@ -5,7 +5,7 @@
 translate 0 10
 setRenderHint Antialiasing
 
-pixmap_load dome_argb32 the_pixmap 
+pixmap_load dome_argb32 the_pixmap
 
 begin_block draw_stuff
 save
@@ -25,7 +25,7 @@ save
     setRenderHint SmoothPixmapTransform false
     drawTiledPixmap the_pixmap 0 0 150 100 25 25
   restore
-  
+
   # xformed with smooth xform
   translate 160 0
   save
@@ -38,17 +38,17 @@ restore
 end_block
 
 translate 0 120
-pixmap_load dome_rgb32 the_pixmap 
+pixmap_load dome_rgb32 the_pixmap
 repeat_block draw_stuff
 
 
 translate 0 120
-pixmap_load dome_indexed the_pixmap 
+pixmap_load dome_indexed the_pixmap
 repeat_block draw_stuff
 
 
 translate 0 120
-pixmap_load dome_indexed_mask the_pixmap 
+pixmap_load dome_indexed_mask the_pixmap
 repeat_block draw_stuff
 
 
diff --git a/tests/auto/other/macgui/guitest.cpp b/tests/auto/other/macgui/guitest.cpp
index d4af5c1386..93e9db9a61 100644
--- a/tests/auto/other/macgui/guitest.cpp
+++ b/tests/auto/other/macgui/guitest.cpp
@@ -118,10 +118,10 @@ QAccessibleInterface *WidgetNavigator::recursiveSearch(TestBase *test, QAccessib
 
     while (todoInterfaces.isEmpty() == false) {
         QAccessibleInterface *testInterface = todoInterfaces.pop();
-        
+
         if ((*test)(testInterface))
             return testInterface;
-            
+
         const int numChildren = testInterface->childCount();
         for (int i = 0; i < numChildren; ++i) {
             QAccessibleInterface *childInterface = testInterface->child(i);
@@ -160,17 +160,17 @@ namespace NativeEvents {
         CGPoint position;
         position.x = globalPos.x();
         position.y = globalPos.y();
-       
+
         const bool updateMousePosition = (updateMouse == UpdatePosition);
-        
+
         // Mouse down.
-        CGPostMouseEvent(position, updateMousePosition, 3, 
-                        (buttons & Qt::LeftButton) ? true : false, 
-                        (buttons & Qt::MidButton/* Middlebutton! */) ? true : false, 
+        CGPostMouseEvent(position, updateMousePosition, 3,
+                        (buttons & Qt::LeftButton) ? true : false,
+                        (buttons & Qt::MidButton/* Middlebutton! */) ? true : false,
                         (buttons & Qt::RightButton) ? true : false);
 
         // Mouse up.
-        CGPostMouseEvent(position, updateMousePosition, 3, false, false, false);	
+        CGPostMouseEvent(position, updateMousePosition, 3, false, false, false);
     }
 #else
 # error Oops, NativeEvents::mouseClick() is not implemented on this platform.
@@ -200,7 +200,7 @@ bool checkPixel(QColor pixel, QColor expected)
 }
 
 /*
-    Tests that the pixels inside rect in image all have the given color. 
+    Tests that the pixels inside rect in image all have the given color.
 */
 bool GuiTester::isFilled(const QImage image, const QRect &rect, const QColor &color)
 {
@@ -218,7 +218,7 @@ bool GuiTester::isFilled(const QImage image, const QRect &rect, const QColor &co
 
 /*
     Tests that stuff is painted to the pixels inside rect.
-    This test fails if any lines in the given direction have pixels 
+    This test fails if any lines in the given direction have pixels
     of only one color.
 */
 bool GuiTester::isContent(const QImage image, const QRect &rect, Directions directions)
@@ -239,7 +239,7 @@ bool GuiTester::isContent(const QImage image, const QRect &rect, Directions dire
             }
         }
         return true;
-    } 
+    }
 
     if (directions & Vertical) {
        for (int x = rect.left(); x <= rect.right(); ++x) {
diff --git a/tests/auto/other/macgui/guitest.h b/tests/auto/other/macgui/guitest.h
index 1b5f933769..2d02cce720 100644
--- a/tests/auto/other/macgui/guitest.h
+++ b/tests/auto/other/macgui/guitest.h
@@ -70,12 +70,12 @@ public:
 
     void printAll(QWidget *widget);
     void printAll(QAccessibleInterface *interface);
-    
+
     QAccessibleInterface *find(QAccessible::Text textType, const QString &text, QWidget *start);
     QAccessibleInterface *find(QAccessible::Text textType, const QString &text, QAccessibleInterface *start);
 
     QAccessibleInterface *recursiveSearch(TestBase *test, QAccessibleInterface *iface);
-    
+
     void deleteInDestructor(QAccessibleInterface * interface);
     static QWidget *getWidget(QAccessibleInterface *interface);
 private:
@@ -99,7 +99,7 @@ class ColorWidget : public QWidget
 public:
     ColorWidget(QWidget *parent = 0, QColor color = QColor(Qt::red))
        : QWidget(parent), color(color) {}
-    
+
     QColor color;
 
 protected:
@@ -139,7 +139,7 @@ private:
 };
 
 /*
-    
+
 */
 class GuiTester : public QObject
 {
diff --git a/tests/auto/other/macgui/tst_macgui.cpp b/tests/auto/other/macgui/tst_macgui.cpp
index cfe27095a8..e796b44843 100644
--- a/tests/auto/other/macgui/tst_macgui.cpp
+++ b/tests/auto/other/macgui/tst_macgui.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QApplication>
-#include <QMessageBox> 
+#include <QMessageBox>
 #include <QtTest/QtTest>
 #include <QSplashScreen>
 #include <QScrollBar>
@@ -55,7 +55,7 @@ class tst_MacGui : public GuiTester
 Q_OBJECT
 private slots:
     void scrollbarPainting();
-    
+
     void dummy();
     void splashScreenModality();
     void nonModalOrder();
@@ -216,7 +216,7 @@ void tst_MacGui::spinBoxArrowButtons()
     spinBox2.move(0, 100);
     colorWidget.show();
     QTest::qWait(100);
-    
+
     // Grab an unfocused spin box.
     const QImage noFocus = grabWindowContents(&colorWidget).toImage();
 
diff --git a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
index 3072d163c3..ae59672c72 100644
--- a/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
@@ -293,7 +293,7 @@ void tst_MacNativeEvents::testMouseEnter()
 
 void tst_MacNativeEvents::testChildDialogInFrontOfModalParent()
 {
-    // Test that a child dialog of a modal parent dialog is 
+    // Test that a child dialog of a modal parent dialog is
     // in front of the parent, and active:
     QDialog parent;
     parent.setWindowModality(Qt::ApplicationModal);
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index c6cc50d97f..756a899b1b 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -82,7 +82,7 @@ public slots:
         QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile"));
         if (zeroCopy)
             request.setAttribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute, 10*1024*1024);
-                
+
         QNetworkReply *reply = netmanager.get(
                 QNetworkRequest(
                 QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile")
diff --git a/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp
index 5bcaaf5543..68db218164 100644
--- a/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp
@@ -133,7 +133,7 @@ void compareScreenshots(const QString &image1, const QString &image2)
     QPainter p1(&screenShot);
     QPainter p2(&original);
 
-    //screenShot.save("scr1.png", "PNG");    
+    //screenShot.save("scr1.png", "PNG");
     p1.fillRect(0, 0, desktopFrameRect.width(), desktopClientRect.y(), Qt::black);
     p2.fillRect(0, 0, desktopFrameRect.width(), desktopClientRect.y(), Qt::black);
 
diff --git a/tests/auto/other/windowsmobile/testQMenuBar/main.cpp b/tests/auto/other/windowsmobile/testQMenuBar/main.cpp
index 64f87dc080..a96966a451 100644
--- a/tests/auto/other/windowsmobile/testQMenuBar/main.cpp
+++ b/tests/auto/other/windowsmobile/testQMenuBar/main.cpp
@@ -89,7 +89,7 @@ int main(int argc, char * argv[])
     optionsMenu->addMenu("Settings");
     optionsMenu->addMenu("Standard");
     optionsMenu->addMenu("Extended");
-    
+
     QMenu *subMenu = helpMenu->addMenu("Help");
     subMenu->addAction("Index");
     subMenu->addSeparator();
diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index bb00f52969..bc6b36931a 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -56,7 +56,7 @@
 
 class tst_QSql : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     tst_QSql();
@@ -105,7 +105,6 @@ void tst_QSql::cleanup()
 {
 }
 
-
 // this is a very basic test for drivers that cannot create/delete tables
 // it can be used while developing new drivers,
 // it's original purpose is to test ODBC Text datasources that are basically
@@ -120,35 +119,34 @@ void tst_QSql::basicDriverTest()
     tst_Databases dbs;
     dbs.open();
 
-    foreach( const QString& dbName, dbs.dbNames )
-    {
-        QSqlDatabase db = QSqlDatabase::database( dbName );
-        QVERIFY_SQL( db, isValid() );
+    foreach (const QString& dbName, dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName);
+        QVERIFY_SQL(db, isValid());
 
         QStringList tables = db.tables();
         QString tableName;
 
-        if ( tables.contains( "qtest_basictest.txt" ) )
+        if (tables.contains("qtest_basictest.txt"))
             tableName = "qtest_basictest.txt";
-        else if ( tables.contains( "qtest_basictest" ) )
+        else if (tables.contains("qtest_basictest"))
             tableName = "qtest_basictest";
-        else if ( tables.contains( "QTEST_BASICTEST" ) )
+        else if (tables.contains("QTEST_BASICTEST"))
             tableName = "QTEST_BASICTEST";
         else {
-            QVERIFY( 1 );
+            QVERIFY(1);
             continue;
         }
 
-        qDebug("Testing: %s", qPrintable(tst_Databases::dbToString( db )));
+        qDebug("Testing: %s", qPrintable(tst_Databases::dbToString(db)));
 
-        QSqlRecord rInf = db.record( tableName );
-        QCOMPARE( rInf.count(), 2 );
-        QCOMPARE( rInf.fieldName( 0 ).toLower(), QString( "id" ) );
-        QCOMPARE( rInf.fieldName( 1 ).toLower(), QString( "name" ) );
+        QSqlRecord rInf = db.record(tableName);
+        QCOMPARE(rInf.count(), 2);
+        QCOMPARE(rInf.fieldName(0).toLower(), QString("id"));
+        QCOMPARE(rInf.fieldName(1).toLower(), QString("name"));
     }
 
     dbs.close();
-    QVERIFY( 1 ); // make sure the test doesn't fail if no database drivers are there
+    QVERIFY(1); // make sure the test doesn't fail if no database drivers are there
 }
 
 // make sure that the static stuff will be deleted
@@ -159,18 +157,18 @@ void tst_QSql::open()
     int argc = 1;
     const char *argv[] = {"test"};
     int count = -1;
-    for ( i = 0; i < 10; ++i ) {
+    for (i = 0; i < 10; ++i) {
         QGuiApplication app(argc, const_cast<char **>(argv), false);
-	tst_Databases dbs;
-
-	dbs.open();
-	if ( count == -1 )
-	    // first iteration: see how many dbs are open
-	    count = (int) dbs.dbNames.count();
-	else
-	    // next iterations: make sure all are opened again
-	    QCOMPARE( count, (int)dbs.dbNames.count() );
-	dbs.close();
+        tst_Databases dbs;
+
+        dbs.open();
+        if (count == -1)
+            // first iteration: see how many dbs are open
+            count = (int) dbs.dbNames.count();
+        else
+            // next iterations: make sure all are opened again
+            QCOMPARE(count, (int)dbs.dbNames.count());
+        dbs.close();
     }
 }
 
@@ -191,21 +189,21 @@ void tst_QSql::concurrentAccess()
     tst_Databases dbs;
 
     dbs.open();
-    foreach ( const QString& dbName, dbs.dbNames ) {
-	QSqlDatabase db = QSqlDatabase::database( dbName );
-	QVERIFY( db.isValid() );
+    foreach (const QString& dbName, dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName);
+        QVERIFY(db.isValid());
         if (tst_Databases::isMSAccess(db))
             continue;
 
-	QSqlDatabase ndb = QSqlDatabase::addDatabase( db.driverName(), "tst_QSql::concurrentAccess" );
-	ndb.setDatabaseName( db.databaseName() );
-	ndb.setHostName( db.hostName() );
-	ndb.setPort( db.port() );
-	ndb.setUserName( db.userName() );
-	ndb.setPassword( db.password() );
-	QVERIFY_SQL( ndb, open() );
+        QSqlDatabase ndb = QSqlDatabase::addDatabase(db.driverName(), "tst_QSql::concurrentAccess");
+        ndb.setDatabaseName(db.databaseName());
+        ndb.setHostName(db.hostName());
+        ndb.setPort(db.port());
+        ndb.setUserName(db.userName());
+        ndb.setPassword(db.password());
+        QVERIFY_SQL(ndb, open());
 
-	QCOMPARE( db.tables(), ndb.tables() );
+        QCOMPARE(db.tables(), ndb.tables());
     }
     // no database servers installed - don't fail
     QVERIFY(1);
@@ -222,41 +220,41 @@ void tst_QSql::openErrorRecovery()
     dbs.addDbs();
     if (dbs.dbNames.isEmpty())
         QSKIP("No database drivers installed");
-    foreach ( const QString& dbName, dbs.dbNames ) {
-	QSqlDatabase db = QSqlDatabase::database( dbName, false );
-	CHECK_DATABASE( db );
+    foreach (const QString& dbName, dbs.dbNames) {
+        QSqlDatabase db = QSqlDatabase::database(dbName, false);
+        CHECK_DATABASE(db);
 
-	QString userName = db.userName();
-	QString password = db.password();
+        QString userName = db.userName();
+        QString password = db.password();
 
-	// force an open error
-	if ( db.open( "dummy130977", "doesnt_exist" ) ) {
+        // force an open error
+        if (db.open("dummy130977", "doesnt_exist")) {
             qDebug("Promiscuous database server without access control - test skipped for %s",
-                  qPrintable(tst_Databases::dbToString( db )) );
-	    QVERIFY(1);
-	    continue;
-	}
-
-	QFAIL_SQL( db, isOpen() );
-	QVERIFY_SQL( db, isOpenError() );
-
-	// now open it
-	if ( !db.open( userName, password ) ) {
-	    qDebug() << "Could not open Database " << tst_Databases::dbToString( db ) <<
-		    ". Assuming DB is down, skipping... (Error: " << 
-		    tst_Databases::printError( db.lastError() ) << ")";
-	    continue;
-	}
-	QVERIFY_SQL( db, open( userName, password ) );
-	QVERIFY_SQL( db, isOpen() );
-	QFAIL_SQL( db, isOpenError() );
-	db.close();
-	QFAIL_SQL( db, isOpen() );
-
-	// force another open error
-	QFAIL_SQL( db, open( "dummy130977", "doesnt_exist" ) );
-	QFAIL_SQL( db, isOpen() );
-	QVERIFY_SQL( db, isOpenError() );
+                   qPrintable(tst_Databases::dbToString(db)));
+            QVERIFY(1);
+            continue;
+        }
+
+        QFAIL_SQL(db, isOpen());
+        QVERIFY_SQL(db, isOpenError());
+
+        // now open it
+        if (!db.open(userName, password)) {
+            qDebug() << "Could not open Database " << tst_Databases::dbToString(db) <<
+                        ". Assuming DB is down, skipping... (Error: " <<
+                        tst_Databases::printError(db.lastError()) << ")";
+            continue;
+        }
+        QVERIFY_SQL(db, open(userName, password));
+        QVERIFY_SQL(db, isOpen());
+        QFAIL_SQL(db, isOpenError());
+        db.close();
+        QFAIL_SQL(db, isOpen());
+
+        // force another open error
+        QFAIL_SQL(db, open("dummy130977", "doesnt_exist"));
+        QFAIL_SQL(db, isOpen());
+        QVERIFY_SQL(db, isOpenError());
     }
 }
 
@@ -266,13 +264,13 @@ void tst_QSql::registerSqlDriver()
     const char *argv[] = {"test"};
     QGuiApplication app(argc, const_cast<char **>(argv), false);
 
-    QSqlDatabase::registerSqlDriver( "QSQLTESTDRIVER", new QSqlDriverCreator<QSqlNullDriver> );
-    QVERIFY( QSqlDatabase::drivers().contains( "QSQLTESTDRIVER" ) );
+    QSqlDatabase::registerSqlDriver("QSQLTESTDRIVER", new QSqlDriverCreator<QSqlNullDriver>);
+    QVERIFY(QSqlDatabase::drivers().contains("QSQLTESTDRIVER"));
 
-    QSqlDatabase db = QSqlDatabase::addDatabase( "QSQLTESTDRIVER" );
-    QVERIFY( db.isValid() );
+    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLTESTDRIVER");
+    QVERIFY(db.isValid());
 
-    QCOMPARE( db.tables(), QStringList() );
+    QCOMPARE(db.tables(), QStringList());
 }
 
 QTEST_APPLESS_MAIN(tst_QSql)
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index 9340299a8d..72b7e6aa17 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -68,7 +68,7 @@ if(!$SEARCH_PATH)
     exit(0);
 }
 
-# We have four options: 
+# We have four options:
 # 'U': Unix
 # 'W': Windows
 # 'M': Mac
diff --git a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
index 25e50df72a..39ba9f5908 100644
--- a/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
+++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
@@ -69,7 +69,7 @@ void tst_DateTime::qurl() const
 {
     QFETCH(QUrl, operandA);
     QFETCH(QUrl, operandB);
-    
+
     QCOMPARE(operandA, operandB);
 }
 
diff --git a/tests/auto/tools/moc/gadgetwithnoenums.h b/tests/auto/tools/moc/gadgetwithnoenums.h
index 5a9a789471..0da75e8eb1 100644
--- a/tests/auto/tools/moc/gadgetwithnoenums.h
+++ b/tests/auto/tools/moc/gadgetwithnoenums.h
@@ -43,20 +43,24 @@
 
 #include <QObject>
 
-class GadgetWithNoEnums { 
+class GadgetWithNoEnums
+{
     Q_GADGET
-    public: 
-        GadgetWithNoEnums() {} 
-        virtual ~GadgetWithNoEnums() {} 
-}; 
- 
-class DerivedGadgetWithEnums : public GadgetWithNoEnums { 
-    Q_GADGET 
-            Q_ENUMS( FooEnum ) 
-    public: 
-        enum FooEnum { FooValue }; 
-        DerivedGadgetWithEnums() {} 
-        ~DerivedGadgetWithEnums() {} 
+
+public:
+    GadgetWithNoEnums() {}
+    virtual ~GadgetWithNoEnums() {}
+};
+
+class DerivedGadgetWithEnums : public GadgetWithNoEnums
+{
+    Q_GADGET
+    Q_ENUMS( FooEnum )
+
+public:
+    enum FooEnum { FooValue };
+    DerivedGadgetWithEnums() {}
+    ~DerivedGadgetWithEnums() {}
 };
 
 #endif
diff --git a/tests/auto/tools/moc/task189996.h b/tests/auto/tools/moc/task189996.h
index 975d762fa8..01b210d6eb 100644
--- a/tests/auto/tools/moc/task189996.h
+++ b/tests/auto/tools/moc/task189996.h
@@ -43,10 +43,12 @@
 #ifndef TASK189996_H
 #define TASK189996_H
 
-#include <QObject> 
- 
-class InlineSlotsWithThrowDeclaration : public QObject { 
-    Q_OBJECT 
+#include <QObject>
+
+class InlineSlotsWithThrowDeclaration : public QObject
+{
+    Q_OBJECT
+
 public slots:
     void a() throw() { }
     void b() const throw() { }
diff --git a/tests/auto/tools/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h
index baa8553103..2c2f56c34d 100644
--- a/tests/auto/tools/moc/template-gtgt.h
+++ b/tests/auto/tools/moc/template-gtgt.h
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 template<class TYPE, size_t COUNT>
-class myTemplate : 
+class myTemplate :
       QString,
       QVector<TYPE, QList<COUNT>>
 {};
 
 template<class TYPE, size_t COUNT>
-class myTemplate2 : 
+class myTemplate2 :
       QString,
       QVector<TYPE, QList< (4 >> 2) >>
 {};
diff --git a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
index 9654f3ac5e..e091267889 100644
--- a/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
@@ -61,7 +61,7 @@ void tst_QErrorMessage::dontShowAgain()
 
     QErrorMessage errorMessageDialog(0);
 
-    // show an error with plain string 
+    // show an error with plain string
     errorMessageDialog.showMessage(plainString);
     QVERIFY(errorMessageDialog.isVisible());
     checkBox = qFindChild<QCheckBox*>(&errorMessageDialog);
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 3922cce5cc..ae5853f3c8 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -611,7 +611,7 @@ void tst_QWizard::addPage()
     arguments = spy.takeFirst();
     QCOMPARE(arguments.at(0).toInt(), N + 52);
 
-    QTest::ignoreMessage(QtWarningMsg,"QWizard::setPage: Cannot insert null page");    
+    QTest::ignoreMessage(QtWarningMsg,"QWizard::setPage: Cannot insert null page");
     wizard.addPage(0); // generates a warning
     QCOMPARE(spy.count(), 0);
     delete parent;
@@ -638,7 +638,7 @@ void tst_QWizard::setPage()
     QCOMPARE(wizard.nextId(), -1);
 
     page = new QWizardPage(parent);
-    QTest::ignoreMessage(QtWarningMsg,"QWizard::setPage: Cannot insert page with ID -1");    
+    QTest::ignoreMessage(QtWarningMsg,"QWizard::setPage: Cannot insert page with ID -1");
     wizard.setPage(-1, page);   // gives a warning and does nothing
     QCOMPARE(spy.count(), 0);
     QVERIFY(!wizard.page(-2));
@@ -2453,7 +2453,7 @@ private:
 
         QLayout *layout_ = new QVBoxLayout(this);
         layout_->addWidget(treeWidget = new QTreeWidget);
- 
+
         QSizePolicy policy = sizePolicy();
         policy.setVerticalPolicy(verticalPolicy);
         treeWidget->setSizePolicy(policy);
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index fb55cf3d8f..41e5ed466c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -1549,7 +1549,7 @@ void tst_QGraphicsGridLayout::setColumnSpacing()
 }
 
 void tst_QGraphicsGridLayout::setGeometry_data()
-{    
+{
     QTest::addColumn<QRectF>("rect");
     QTest::newRow("null") << QRectF();
     QTest::newRow("normal") << QRectF(0,0, 50, 50);
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index e64dce1a11..f72467de08 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -1444,7 +1444,7 @@ void tst_QTableWidget::task231094()
     tw.setCurrentCell(1, 1);
     QCOMPARE(tw.currentRow(), 1);
     QCOMPARE(tw.currentColumn(), 1);
-	
+
     //this would provoke a end-less loop
     QTest::keyClick(&tw, '1');
 
diff --git a/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp b/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp
index e24c21feab..e935cfd53a 100644
--- a/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp
+++ b/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp
@@ -40,14 +40,15 @@
 ****************************************************************************/
 #include <QApplication>
 #include <stdio.h>
-int main(int argc, char *argv[]) 
+
+int main(int argc, char *argv[])
 {
-	QApplication app(argc, argv);
+    QApplication app(argc, argv);
     if (argc > 1)
         fprintf(stderr, "%s", argv[1]);
     else
         fprintf(stderr, "Failed");
     fflush(stderr);
-	return 0;
+    return 0;
 }
 
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index d77dd003d7..b970de8e87 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -169,11 +169,11 @@ void tst_QFormLayout::rowCount()
     fl->addRow(tr("Label 2"), new QLineEdit);
     fl->addRow(tr("Label 3"), new QLineEdit);
     QCOMPARE(fl->rowCount(), 3);
-    
+
     fl->addRow(new QWidget);
     fl->addRow(new QHBoxLayout);
     QCOMPARE(fl->rowCount(), 5);
-    
+
     fl->insertRow(1, tr("Label 0.5"), new QLineEdit);
     QCOMPARE(fl->rowCount(), 6);
 
@@ -206,7 +206,7 @@ void tst_QFormLayout::buddies()
     fl->addRow(le3);
     QWidget *label3 = fl->labelForField(le3);
     QVERIFY(label3 == 0);
-    
+
     //TODO: empty label?
 
     delete w;
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index f830ead6c0..2b9b4fd761 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -155,7 +155,7 @@ void tst_QLayout::geometry()
 
 void tst_QLayout::smartMaxSize()
 {
-    QVector<int> expectedWidths; 
+    QVector<int> expectedWidths;
 
     QFile f(QFINDTESTDATA("baseline/smartmaxsize"));
 
@@ -170,9 +170,9 @@ void tst_QLayout::smartMaxSize()
     f.close();
 
     int sizeCombinations[] = { 0, 10, 20, QWIDGETSIZE_MAX};
-    QSizePolicy::Policy policies[] = {  QSizePolicy::Fixed, 
-                                        QSizePolicy::Minimum, 
-                                        QSizePolicy::Maximum, 
+    QSizePolicy::Policy policies[] = {  QSizePolicy::Fixed,
+                                        QSizePolicy::Minimum,
+                                        QSizePolicy::Maximum,
                                         QSizePolicy::Preferred,
                                         QSizePolicy::Expanding,
                                         QSizePolicy::MinimumExpanding,
@@ -250,7 +250,7 @@ void tst_QLayout::setContentsMargins()
     MyLayout layout;
     layout.invalidated = false;
     int left, top, right, bottom;
-    
+
     layout.setContentsMargins(52, 53, 54, 55);
     QVERIFY(layout.invalidated);
     layout.invalidated = false;
@@ -260,7 +260,7 @@ void tst_QLayout::setContentsMargins()
     QCOMPARE(top, 53);
     QCOMPARE(right, 54);
     QCOMPARE(bottom, 55);
- 
+
     layout.setContentsMargins(52, 53, 54, 55);
     QVERIFY(!layout.invalidated);
 }
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index f16fe49712..cb403bac20 100644
--- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
@@ -128,7 +128,7 @@ void tst_QToolTip::whatsThis()
 {
     qApp->setStyleSheet( "QWidget { font-size: 72px; }" );
     QWhatsThis::showText(QPoint(0,0), "THis is text");
-    QTest::qWait(400);	
+    QTest::qWait(400);
     QWidget *whatsthis = 0;
     foreach (QWidget *widget, QApplication::topLevelWidgets()) {
         if (widget->inherits("QWhatsThat")) {
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 12e9fe451c..7925820b70 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -117,7 +117,7 @@ void tst_QMacStyle::sizeHints_data()
 
 void tst_QMacStyle::sizeHints()
 {
-    QFETCH(Size, size);    
+    QFETCH(Size, size);
     QDialog w;
     setSize(&w, size);
 
@@ -234,7 +234,7 @@ void tst_QMacStyle::layoutMargins_data()
 
 void tst_QMacStyle::layoutMargins()
 {
-    QFETCH(Size, size);    
+    QFETCH(Size, size);
     QWidget w;
     setSize(&w, size);
 
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index a3670cccc2..c733fadbf5 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -741,7 +741,7 @@ public:
 
 void tst_QStyle::testDrawingShortcuts()
 {
-    {   
+    {
         QWidget w;
         setFrameless(&w);
         QToolButton *tb = new QToolButton(&w);
@@ -771,7 +771,7 @@ void tst_QStyle::testDrawingShortcuts()
         bool showMnemonic = dts->styleHint(QStyle::SH_UnderlineShortcut, &sotb, tb);
         QVERIFY(dts->alignment & (showMnemonic ? Qt::TextShowMnemonic : Qt::TextHideMnemonic));
         delete dts;
-     }   
+     }
 }
 
 #define SCROLLBAR_SPACING 33
diff --git a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
index 1203e12045..8a00198cf1 100644
--- a/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
+++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
@@ -44,7 +44,7 @@
 #include <QStyleOption>
 
 
-class tst_QStyleOption: public QObject 
+class tst_QStyleOption: public QObject
 {
     Q_OBJECT
 
@@ -54,7 +54,7 @@ private slots:
     void copyconstructors();
 };
 
-// Just a simple container for QStyleOption-pointer 
+// Just a simple container for QStyleOption-pointer
 struct StyleOptionPointerBase
 {
     QStyleOption *pointer;
@@ -80,7 +80,7 @@ void tst_QStyleOption::qstyleoptioncast_data()
 {
     QTest::addColumn<StyleOptionPointerBase *>("testOption");
     QTest::addColumn<bool>("canCastToComplex");
-    QTest::addColumn<int>("type");    
+    QTest::addColumn<int>("type");
 
     QTest::newRow("optionDefault") << stylePtr(new QStyleOption) << false << int(QStyleOption::SO_Default);
     QTest::newRow("optionButton") << stylePtr(new QStyleOptionButton) << false << int(QStyleOption::SO_Button);
diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index c8a12a9866..ddab98ebc6 100644
--- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
@@ -599,7 +599,7 @@ void tst_QUndoGroup::addStackAndDie()
 {
     // Test that QUndoStack doesn't keep a reference to QUndoGroup after the
     // group is deleted.
-    QUndoStack *stack = new QUndoStack; 
+    QUndoStack *stack = new QUndoStack;
     QUndoGroup *group = new QUndoGroup;
     group->addStack(stack);
     delete group;
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
index 9b48dc7798..4556816655 100644
--- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
+++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
@@ -290,52 +290,52 @@ static void checkState(QSignalSpy &redoTextChangedSpy,
                        const bool _undoChanged,
                        const bool _redoChanged)
 {
-    QCOMPARE(stack.count(), _count); 
-    QCOMPARE(stack.isClean(), _clean); 
-    QCOMPARE(stack.index(), _index); 
-    QCOMPARE(stack.canUndo(), _canUndo); 
-    QCOMPARE(stack.undoText(), QString(_undoText)); 
-    QCOMPARE(stack.canRedo(), _canRedo); 
-    QCOMPARE(stack.redoText(), QString(_redoText)); 
-    if (_indexChanged) { 
-        QCOMPARE(indexChangedSpy.count(), 1); 
-        QCOMPARE(indexChangedSpy.at(0).at(0).toInt(), _index); 
-        indexChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(indexChangedSpy.count(), 0); 
-    } 
-    if (_cleanChanged) { 
-        QCOMPARE(cleanChangedSpy.count(), 1); 
-        QCOMPARE(cleanChangedSpy.at(0).at(0).toBool(), _clean); 
-        cleanChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(cleanChangedSpy.count(), 0); 
-    } 
-    if (_undoChanged) { 
-        QCOMPARE(canUndoChangedSpy.count(), 1); 
-        QCOMPARE(canUndoChangedSpy.at(0).at(0).toBool(), _canUndo); 
-        QCOMPARE(undoAction->isEnabled(), _canUndo); 
-        QCOMPARE(undoTextChangedSpy.count(), 1); 
-        QCOMPARE(undoTextChangedSpy.at(0).at(0).toString(), QString(_undoText)); 
-        QCOMPARE(undoAction->text(), glue("foo", _undoText)); 
-        canUndoChangedSpy.clear(); 
-        undoTextChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(canUndoChangedSpy.count(), 0); 
-        QCOMPARE(undoTextChangedSpy.count(), 0); 
-    } 
-    if (_redoChanged) { 
-        QCOMPARE(canRedoChangedSpy.count(), 1); 
-        QCOMPARE(canRedoChangedSpy.at(0).at(0).toBool(), _canRedo); 
-        QCOMPARE(redoAction->isEnabled(), _canRedo); 
-        QCOMPARE(redoTextChangedSpy.count(), 1); 
-        QCOMPARE(redoTextChangedSpy.at(0).at(0).toString(), QString(_redoText)); 
-        QCOMPARE(redoAction->text(), glue("bar", _redoText)); 
-        canRedoChangedSpy.clear(); 
-        redoTextChangedSpy.clear(); 
-    } else { 
-        QCOMPARE(canRedoChangedSpy.count(), 0); 
-        QCOMPARE(redoTextChangedSpy.count(), 0); 
+    QCOMPARE(stack.count(), _count);
+    QCOMPARE(stack.isClean(), _clean);
+    QCOMPARE(stack.index(), _index);
+    QCOMPARE(stack.canUndo(), _canUndo);
+    QCOMPARE(stack.undoText(), QString(_undoText));
+    QCOMPARE(stack.canRedo(), _canRedo);
+    QCOMPARE(stack.redoText(), QString(_redoText));
+    if (_indexChanged) {
+        QCOMPARE(indexChangedSpy.count(), 1);
+        QCOMPARE(indexChangedSpy.at(0).at(0).toInt(), _index);
+        indexChangedSpy.clear();
+    } else {
+        QCOMPARE(indexChangedSpy.count(), 0);
+    }
+    if (_cleanChanged) {
+        QCOMPARE(cleanChangedSpy.count(), 1);
+        QCOMPARE(cleanChangedSpy.at(0).at(0).toBool(), _clean);
+        cleanChangedSpy.clear();
+    } else {
+        QCOMPARE(cleanChangedSpy.count(), 0);
+    }
+    if (_undoChanged) {
+        QCOMPARE(canUndoChangedSpy.count(), 1);
+        QCOMPARE(canUndoChangedSpy.at(0).at(0).toBool(), _canUndo);
+        QCOMPARE(undoAction->isEnabled(), _canUndo);
+        QCOMPARE(undoTextChangedSpy.count(), 1);
+        QCOMPARE(undoTextChangedSpy.at(0).at(0).toString(), QString(_undoText));
+        QCOMPARE(undoAction->text(), glue("foo", _undoText));
+        canUndoChangedSpy.clear();
+        undoTextChangedSpy.clear();
+    } else {
+        QCOMPARE(canUndoChangedSpy.count(), 0);
+        QCOMPARE(undoTextChangedSpy.count(), 0);
+    }
+    if (_redoChanged) {
+        QCOMPARE(canRedoChangedSpy.count(), 1);
+        QCOMPARE(canRedoChangedSpy.at(0).at(0).toBool(), _canRedo);
+        QCOMPARE(redoAction->isEnabled(), _canRedo);
+        QCOMPARE(redoTextChangedSpy.count(), 1);
+        QCOMPARE(redoTextChangedSpy.at(0).at(0).toString(), QString(_redoText));
+        QCOMPARE(redoAction->text(), glue("bar", _redoText));
+        canRedoChangedSpy.clear();
+        redoTextChangedSpy.clear();
+    } else {
+        QCOMPARE(canRedoChangedSpy.count(), 0);
+        QCOMPARE(redoTextChangedSpy.count(), 0);
     }
 }
 
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index e7d62f8c0c..53c3eb1ed0 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -3427,11 +3427,11 @@ void tst_QDateTimeEdit::deleteCalendarWidget()
         edit.setCalendarPopup(true);
         QVERIFY(edit.calendarWidget());
         edit.calendarWidget()->setObjectName("cw1");;
-        
+
         // delete
         cw = edit.calendarWidget();
         delete cw;
-        
+
         // it should create a new widget
         QVERIFY(edit.calendarWidget());
         QVERIFY(edit.calendarWidget()->objectName() != "cw1");
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 6e3432b575..896d4e8e6f 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -59,7 +59,7 @@
 
 #include "../../../qtest-config.h"
 
-static uchar restoreData41[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xc1, 0x0, 0x0, 0x1, 0x19}; 
+static uchar restoreData41[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xc1, 0x0, 0x0, 0x1, 0x19};
 static uchar restoreData42[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x24, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x98, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x3, 0x8a, 0x0, 0x0, 0x2, 0x2b, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x8};
 static uchar restoreData43[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x50, 0x0, 0x0, 0x0, 0xa0, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xa5, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x98, 0x0, 0x0, 0x0, 0xa0, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xa5, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0xa8, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xd6, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0xa8, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xd6, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xb8, 0x0, 0x0, 0x0, 0xa0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x8, 0xfc, 0x0, 0x0, 0x0, 0x0};
 // Local scope class to simulate toolbar move.
@@ -1273,7 +1273,7 @@ void tst_QMainWindow::restoreStateFromPreviousVersion()
         QMainWindow win;
         win.setCentralWidget(new QTextEdit);
         QVector<QDockWidget*> docks;
-    
+
         for(int i = 0; i < 16; ++i) {
             const QString name = QString::fromLatin1("dock %1").arg(i);
             QDockWidget *dock = new QDockWidget(name);
@@ -1288,7 +1288,7 @@ void tst_QMainWindow::restoreStateFromPreviousVersion()
 	    	QCOMPARE( win.dockWidgetArea(docks[i]), Qt::DockWidgetArea(1 << i%4));
     	}
     }
-    
+
 }
 
 
@@ -1631,7 +1631,7 @@ void tst_QMainWindow::isSeparator()
     QVERIFY( mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height())));
     QVERIFY( mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + margin)));
     QVERIFY(!mw.isSeparator(QPoint(4, dockw->pos().y() + dockw->size().height() + 15)));
- 
+
 }
 
 class MainWindow : public QMainWindow {
@@ -1668,7 +1668,7 @@ void tst_QMainWindow::addToolbarAfterShow()
     //this is for task 243119
     QMainWindow mainWindow;
     mainWindow.show();
-    
+
     QToolBar toolBar;
     mainWindow.addToolBar(&toolBar);
     QTest::qWait(100);
diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
index 26daf11b3a..a1a4e33a4b 100644
--- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
@@ -120,7 +120,7 @@ void tst_QScrollArea::ensureMicroFocusVisible_Task_167838()
     parent->setLayout(new QVBoxLayout);
     QWidget *child = new WidgetWithMicroFocus;
     parent->layout()->addWidget(child);
-    parent->resize(300, 300); 
+    parent->resize(300, 300);
     scrollArea.setWidget(parent);
     scrollArea.ensureWidgetVisible(child, 10, 10);
     QRect microFocus = child->inputMethodQuery(Qt::ImMicroFocus).toRect();
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index a2c7c04977..340eefbf17 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -242,17 +242,17 @@ void tst_QSplitter::saveAndRestoreState()
     QFETCH(IntList, initialSizes);
     splitter->setSizes(initialSizes);
     QApplication::instance()->sendPostedEvents();
-    
+
     QSplitter *splitter2 = new QSplitter(splitter->orientation() == Qt::Horizontal ?
                                          Qt::Vertical : Qt::Horizontal);
     for (int i = 0; i < splitter->count(); ++i) {
-        splitter2->addWidget(new QWidget());        
+        splitter2->addWidget(new QWidget());
     }
-    splitter2->resize(splitter->size());    
+    splitter2->resize(splitter->size());
     splitter2->setChildrenCollapsible(!splitter->childrenCollapsible());
     splitter2->setOpaqueResize(!splitter->opaqueResize());
     splitter2->setHandleWidth(splitter->handleWidth()+3);
-    
+
     QByteArray ba = splitter->saveState();
     QVERIFY(splitter2->restoreState(ba));
 
@@ -269,10 +269,10 @@ void tst_QSplitter::saveAndRestoreState()
     }
 
     // destroy version and magic number
-    for (int i = 0; i < ba.size(); ++i) 
+    for (int i = 0; i < ba.size(); ++i)
         ba[i] = ~ba.at(i);
     QVERIFY(!splitter2->restoreState(ba));
-    
+
     delete splitter2;
 }
 
@@ -688,7 +688,7 @@ void tst_QSplitter::task187373_addAbstractScrollAreas()
 }
 
 //! A simple QTextEdit which can switch between two different size states
-class MyTextEdit : public QTextEdit 
+class MyTextEdit : public QTextEdit
 {
     public:
         MyTextEdit(const QString & text, QWidget* parent = NULL)
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index 48cbc66ba9..5dd9ee9b0f 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -454,7 +454,7 @@ void tst_QTabWidget::removeTab()
     tw->addTab(new QLabel("5"), "5");
     QCOMPARE(ob.count, 1);
     QCOMPARE(tw->count(), 5);
-    
+
     tw->setCurrentIndex(4);
     QCOMPARE(ob.count,5);
     tw->removeTab(4);
@@ -533,7 +533,7 @@ void tst_QTabWidget::keyboardNavigation()
     tw->setTabEnabled(2, false);
     QTest::keyClick(tw, Qt::Key_Tab, Qt::ControlModifier);
     // TODO: Disabling the current tab will move current tab to the next,
-    // but what if next tab is also disabled. We should look into this. 
+    // but what if next tab is also disabled. We should look into this.
     QVERIFY(tw->currentIndex() < 3 && tw->currentIndex() >= 0);
 }
 
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index e654a41ddd..6b4bc3cd35 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1684,7 +1684,7 @@ static const QChar umlautName[] =
 
 /*!
   \internal
- 
+
   Write a german umlaut to a QByteArray, via a QTextStream.
  */
 void tst_QDom::germanUmlautToByteArray() const
@@ -1701,7 +1701,7 @@ void tst_QDom::germanUmlautToByteArray() const
     ts.setCodec("UTF-8");
     ts << d.toString();
     buffer.close();
-    
+
     QByteArray baseline("<a");
 
     /* http://www.fileformat.info/info/unicode/char/00FC/index.htm */
@@ -1714,7 +1714,7 @@ void tst_QDom::germanUmlautToByteArray() const
 
 /*!
   \internal
- 
+
   Write a german umlaut to a QFile, via a QTextStream.
  */
 void tst_QDom::germanUmlautToFile() const
@@ -1757,15 +1757,15 @@ void tst_QDom::germanUmlautToFile() const
 
 void tst_QDom::setInvalidDataPolicy() const
 {
-    QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); 
-    QDomDocument doc; 
-    QDomElement elem = doc.createElement("invalid name"); 
+    QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode);
+    QDomDocument doc;
+    QDomElement elem = doc.createElement("invalid name");
     QVERIFY(elem.isNull());
 }
 
 void tst_QDom::crashInSetContent() const
 {
-    QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); 
+    QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode);
     QDomDocument docImport;
 
     QCOMPARE(docImport.setContent(QLatin1String("<a:>text</a:>"), true), false);
@@ -1774,7 +1774,7 @@ void tst_QDom::crashInSetContent() const
 
 void tst_QDom::doubleNamespaceDeclarations() const
 {
-    QDomDocument doc; 
+    QDomDocument doc;
 
     QString testFile = QFINDTESTDATA("doubleNamespaces.xml");
     if (testFile.isEmpty())
@@ -1782,7 +1782,7 @@ void tst_QDom::doubleNamespaceDeclarations() const
     QFile file(testFile);
     QVERIFY(file.open(QIODevice::ReadOnly));
 
-    QXmlSimpleReader reader; 
+    QXmlSimpleReader reader;
 
     QXmlInputSource source(&file);
     QVERIFY(doc.setContent(&source, &reader));
diff --git a/tests/auto/xml/sax/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp
index 7f597f83d3..0ce8d363c9 100644
--- a/tests/auto/xml/sax/qxml/tst_qxml.cpp
+++ b/tests/auto/xml/sax/qxml/tst_qxml.cpp
@@ -62,7 +62,7 @@ class MyXmlEntityResolver : public QXmlEntityResolver
 {
 public:
     MyXmlEntityResolver() : QXmlEntityResolver() {}
-    QString errorString() const { return QString(); } 
+    QString errorString() const { return QString(); }
     bool resolveEntity(const QString &, const QString &, QXmlInputSource *&) { return false; }
 };
 
@@ -88,7 +88,7 @@ class MyXmlErrorHandler : public QXmlErrorHandler
 {
 public:
     MyXmlErrorHandler() : QXmlErrorHandler() {}
-    QString errorString() const { return QString(); } 
+    QString errorString() const { return QString(); }
     bool error(const QXmlParseException &) { return false; }
     bool fatalError(const QXmlParseException &) { return false; }
     bool warning(const QXmlParseException &) { return false; }
@@ -193,7 +193,7 @@ void tst_QXml::interpretedAs0D() const
     };
 
     const QString document(QLatin1String("<element ") +
-                           QChar(0x010D) + 
+                           QChar(0x010D) +
                            QLatin1String("reated-by=\"an attr value\"/>"));
 
     QString testFile = QFINDTESTDATA("0x010D.xml");
diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
index 2084c95cf4..b8837f8c14 100644
--- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
@@ -72,7 +72,7 @@ private slots:
 void tst_QXmlInputSource::reset() const
 {
     const QString input(QString::fromLatin1("<element attribute1='value1' attribute2='value2'/>"));
-   
+
     QXmlSimpleReader reader;
     QXmlDefaultHandler handler;
     reader.setContentHandler(&handler);
@@ -100,7 +100,7 @@ void tst_QXmlInputSource::reset() const
 void tst_QXmlInputSource::resetSimplified() const
 {
     const QString input(QString::fromLatin1("<element/>"));
-   
+
     QXmlSimpleReader reader;
 
     QXmlInputSource source;
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
index 7c6c675fbe..c00a5c7caa 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
@@ -103,7 +103,7 @@ class ContentHandler : public QXmlDefaultHandler
 
 	const QString &result() const { return m_result; }
         const QString &errorMsg() const { return m_error_msg; }
-        
+
     private:
         QString nestPrefix() const { return QString().fill(' ', 3*m_nest); }
 	QString formatAttributes(const QXmlAttributes & atts);
diff --git a/tests/baselineserver/shared/lookup3.cpp b/tests/baselineserver/shared/lookup3.cpp
index b2d9ffeb94..2959356ca8 100644
--- a/tests/baselineserver/shared/lookup3.cpp
+++ b/tests/baselineserver/shared/lookup3.cpp
@@ -47,8 +47,8 @@ These functions are based on:
 lookup3.c, by Bob Jenkins, May 2006, Public Domain.
 
 These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-are externally useful functions.  Routines to test the hash are included 
+hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+are externally useful functions.  Routines to test the hash are included
 if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 the public domain.  It has no warranty.
 
@@ -56,7 +56,7 @@ You probably want to use hashlittle().  hashlittle() and hashbig()
 hash byte arrays.  hashlittle() is is faster than hashbig() on
 little-endian machines.  Intel and AMD are little-endian machines.
 On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.  
+hashlittle() except it returns two 32-bit hashes for the price of one.
 You could implement hashbig2() if you wanted but I haven't bothered here.
 
 If you want to find a hash of, say, exactly 7 integers, do
@@ -69,9 +69,9 @@ If you want to find a hash of, say, exactly 7 integers, do
 then use c as the hash value.  If you have a variable length array of
 4-byte integers to hash, use hashword().  If you have a byte array (like
 a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().  
+a mix of things, see the comments above hashlittle().
 
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
+Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
 then mix those integers.  This is fast (you can do a lot more thorough
 mixing with 12*3 instructions on 3 integers than you can with 3 instructions
 on 1 byte), but shoehorning those bytes into integers efficiently is messy.
@@ -110,7 +110,7 @@ This was tested for:
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
@@ -120,7 +120,7 @@ satisfy this are
    14  9  3  7 17  3
 Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
 for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+used http://burtleburtle.net/bob/hash/avalanche.html to choose
 the operations, constants, and arrangements of the variables.
 
 This does not achieve avalanche.  There are input bits of (a,b,c)
@@ -159,7 +159,7 @@ produce values of c that look totally different.  This was tested for
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 These constants passed:
@@ -218,7 +218,7 @@ quint32        initval)         /* the previous hash, or an arbitrary value */
 
   /*------------------------------------------- handle the last 3 quint32's */
   switch(length)                     /* all the case statements fall through */
-  { 
+  {
   case 3 : c+=k[2];
   case 2 : b+=k[1];
   case 1 : a+=k[0];
@@ -235,7 +235,7 @@ quint32        initval)         /* the previous hash, or an arbitrary value */
 --------------------------------------------------------------------
 hashword2() -- same as hashword(), but take two seeds and return two
 32-bit values.  pc and pb must both be nonnull, and *pc and *pb must
-both be initialized with seeds.  If you pass in (*pb)==0, the output 
+both be initialized with seeds.  If you pass in (*pb)==0, the output
 (*pc) will be the same as the return value from hashword().
 --------------------------------------------------------------------
 */
@@ -264,7 +264,7 @@ quint32       *pb)               /* IN: more seed OUT: secondary hash value */
 
   /*------------------------------------------- handle the last 3 quint32's */
   switch(length)                     /* all the case statements fall through */
-  { 
+  {
   case 3 : c+=k[2];
   case 2 : b+=k[1];
   case 1 : a+=k[0];
@@ -328,7 +328,7 @@ quint32 hashlittle( const void *key, size_t length, quint32 initval)
     }
 
     /*----------------------------- handle the last (probably partial) block */
-    /* 
+    /*
      * "k[2]&0xffffff" actually reads beyond the end of the string, but
      * then masks off the part it's not allowed to read.  Because the
      * string is aligned, the masked-off tail is in the same word as the
@@ -483,7 +483,7 @@ quint32 hashlittle( const void *key, size_t length, quint32 initval)
  * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
  * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
  */
-void hashlittle2( 
+void hashlittle2(
   const void *key,       /* the key to hash */
   size_t      length,    /* length of the key */
   quint32   *pc,        /* IN: primary initval, OUT: primary hash */
@@ -512,7 +512,7 @@ void hashlittle2(
     }
 
     /*----------------------------- handle the last (probably partial) block */
-    /* 
+    /*
      * "k[2]&0xffffff" actually reads beyond the end of the string, but
      * then masks off the part it's not allowed to read.  Because the
      * string is aligned, the masked-off tail is in the same word as the
@@ -662,7 +662,7 @@ void hashlittle2(
  * hashbig():
  * This is the same as hashword() on big-endian machines.  It is different
  * from hashlittle() on all machines.  hashbig() takes advantage of
- * big-endian byte ordering. 
+ * big-endian byte ordering.
  */
 quint32 hashbig( const void *key, size_t length, quint32 initval)
 {
@@ -688,7 +688,7 @@ quint32 hashbig( const void *key, size_t length, quint32 initval)
     }
 
     /*----------------------------- handle the last (probably partial) block */
-    /* 
+    /*
      * "k[2]<<8" actually reads beyond the end of the string, but
      * then shifts out the part it's not allowed to read.  Because the
      * string is aligned, the illegal read is in the same word as the
diff --git a/tests/benchmarks/README b/tests/benchmarks/README
index d437299fee..8d017cd9a7 100644
--- a/tests/benchmarks/README
+++ b/tests/benchmarks/README
@@ -2,7 +2,7 @@ The most reliable way of running benchmarks is to do it in an otherwise idle
 system. On a busy system, the results will vary according to the other tasks
 demanding attention in the system.
 
-We have managed to obtain quite reliable results by doing the following on 
+We have managed to obtain quite reliable results by doing the following on
 Linux (and you need root):
 
  - switching the scheduler to a Real-Time mode
@@ -10,23 +10,23 @@ Linux (and you need root):
  - disabling the other thread of the same core
 
 This should work rather well for CPU-intensive tasks. A task that is in Real-
-Time mode will simply not be preempted by the OS. But if you make OS syscalls, 
-especially I/O ones, your task will be de-scheduled. Note that this includes 
-page faults, so if you can, make sure your benchmark's warmup code paths touch 
+Time mode will simply not be preempted by the OS. But if you make OS syscalls,
+especially I/O ones, your task will be de-scheduled. Note that this includes
+page faults, so if you can, make sure your benchmark's warmup code paths touch
 most of the data.
 
-To do this you need a tool called schedtool (package schedtool), from 
+To do this you need a tool called schedtool (package schedtool), from
 http://freequaos.host.sk/schedtool/
 
 From this point on, we are using CPU0 for all tasks:
 
-If you have a Hyperthreaded multi-core processor (Core-i5 and Core-i7), you 
-have to disable the other thread of the same core as CPU0. To discover which 
+If you have a Hyperthreaded multi-core processor (Core-i5 and Core-i7), you
+have to disable the other thread of the same core as CPU0. To discover which
 one it is:
 
 $ cat /sys/devices/system/cpu/cpu0/topology/thread_siblings_list
 
-This will print something like 0,4, meaning that CPUs 0 and 4 are sibling 
+This will print something like 0,4, meaning that CPUs 0 and 4 are sibling
 threads on the same core. So we'll turn CPU 4 off:
 
 (as root)
@@ -34,7 +34,7 @@ threads on the same core. So we'll turn CPU 4 off:
 
 To turn it back on, echo 1 into the same file.
 
-To run a task on CPU 0 exclusively, using FIFO RT priority 10, you run the 
+To run a task on CPU 0 exclusively, using FIFO RT priority 10, you run the
 following:
 
 (as root)
@@ -43,38 +43,38 @@ following:
 For example:
 # schedtool -F -p 10 -a 1 -e ./tst_bench_qstring -tickcounter
 
-Warning: if your task livelocks or takes far too long to complete, your system 
-may be unusable for a long time, especially if you don't have other cores to 
+Warning: if your task livelocks or takes far too long to complete, your system
+may be unusable for a long time, especially if you don't have other cores to
 run stuff on. To prevent that, run it before schedtool and time it.
 
-You can also limit the CPU time that the task is allowed to take. Run in the 
+You can also limit the CPU time that the task is allowed to take. Run in the
 same shell as you'll run schedtool:
 
 $ ulimit -s 300
 To limit to 300 seconds (5 minutes)
 
-If your task runs away, it will get a SIGXCPU after consuming 5 minutes of CPU 
+If your task runs away, it will get a SIGXCPU after consuming 5 minutes of CPU
 time (5 minutes running at 100%).
 
-If your app is multithreaded, you may want to give it more CPUs, like CPU0 and 
+If your app is multithreaded, you may want to give it more CPUs, like CPU0 and
 CPU1 with -a 3  (it's a bitmask).
 
-For best results, you should disable ALL other cores and threads of the same 
-processor. The new Core-i7 have one processor with 4 cores, 
-each core can run 2 threads; the older Mac Pros have two processors with 4 
-cores each. So on those Mac Pros, you'd disable cores 1, 2 and 3, while on the 
+For best results, you should disable ALL other cores and threads of the same
+processor. The new Core-i7 have one processor with 4 cores,
+each core can run 2 threads; the older Mac Pros have two processors with 4
+cores each. So on those Mac Pros, you'd disable cores 1, 2 and 3, while on the
 Core-i7, you'll need to disable all other CPUs.
 
-However, disabling just the sibling thread seems to produce very reliable 
-results for me already, with variance often below 0.5% (even though there are 
+However, disabling just the sibling thread seems to produce very reliable
+results for me already, with variance often below 0.5% (even though there are
 some measurable spikes).
 
 Other things to try:
 
-Running the benchmark with highest priority, i.e. "sudo nice -19" 
-usually produces stable results on some machines. If the benchmark also 
-involves displaying something on the screen (on X11), running it with 
-"-sync" is a must. Though, in that case the "real" cost is not correct, 
+Running the benchmark with highest priority, i.e. "sudo nice -19"
+usually produces stable results on some machines. If the benchmark also
+involves displaying something on the screen (on X11), running it with
+"-sync" is a must. Though, in that case the "real" cost is not correct,
 but it is useful to discover regressions.
 
 Also; not many people know about ionice (1)
diff --git a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
index 9a82711b84..37f52a3dce 100644
--- a/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
+++ b/tests/benchmarks/corelib/io/qdir/tree/bench_qdir_tree.cpp
@@ -123,14 +123,14 @@ private slots:
         for (int i=0;i<1000;i++) {
             if ((i % 10) == 0)
                 QVERIFY(fs.createDirectory(QString("%1/directory%2").arg(musicprefix).arg(i/10)));
-            qint64 size = fs.createFileWithContent(QString("%1/directory%2/file%3").arg(musicprefix).arg(i/10).arg(i)); 
+            qint64 size = fs.createFileWithContent(QString("%1/directory%2/file%3").arg(musicprefix).arg(i/10).arg(i));
             QVERIFY(size > 0);
             musicsize += size;
         }
         //Use case: photos - 1000 files in 1 directory
         QVERIFY(fs.createDirectory(photoprefix));
         for (int i=0;i<1000;i++) {
-            qint64 size = fs.createFileWithContent(QString("%1/file%2").arg(photoprefix).arg(i)); 
+            qint64 size = fs.createFileWithContent(QString("%1/file%2").arg(photoprefix).arg(i));
             QVERIFY(size > 0);
             photosize += size;
         }
@@ -141,7 +141,7 @@ private slots:
                 QVERIFY(fs.createDirectory(QString("%1/directory%2").arg(sourceprefix).arg(i/100)));
             if ((i % 10) == 0)
                 QVERIFY(fs.createDirectory(QString("%1/directory%2/subdirectory%3").arg(sourceprefix).arg(i/100).arg(i/10)));
-            qint64 size = fs.createFileWithContent(QString("%1/directory%2/subdirectory%3/file%4").arg(sourceprefix).arg(i/100).arg(i/10).arg(i)); 
+            qint64 size = fs.createFileWithContent(QString("%1/directory%2/subdirectory%3/file%4").arg(sourceprefix).arg(i/100).arg(i/10).arg(i));
             QVERIFY(size > 0);
             sourcesize += size;
         }
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index 598153e3ce..bb4a921fc7 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -368,7 +368,7 @@ bool QFileSystemIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo
     // If we're doing flat iteration, we're done.
     if (!(iteratorFlags & QFileSystemIterator::Subdirectories))
         return false;
-    
+
     // Never follow non-directory entries
     if (!fileInfo.isDir())
         return false;
@@ -378,7 +378,7 @@ bool QFileSystemIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo
     if (fileInfo.fileName() == QLatin1String(".") || fileInfo.fileName() == QLatin1String(".."))
         return false;
 
-      
+
     // Check symlinks
     if (fileInfo.isSymLink() && !(iteratorFlags & QFileSystemIterator::FollowSymlinks)) {
         // Follow symlinks only if FollowSymlinks was passed
@@ -388,10 +388,10 @@ bool QFileSystemIteratorPrivate::shouldFollowDirectory(const QFileInfo &fileInfo
     // Stop link loops
     if (visitedLinks.contains(fileInfo.canonicalFilePath()))
         return false;
-    
+
     return true;
 }
-    
+
 
 /*!
     \internal
@@ -454,7 +454,7 @@ bool QFileSystemIteratorPrivate::matchesFilters(const QAbstractFileEngineIterato
             return false;
     }
 #endif
-    
+
     bool dotOrDotDot = (fileName == QLatin1String(".") || fileName == QLatin1String(".."));
     if ((filters & QDir::NoDotAndDotDot) && dotOrDotDot)
         return false;
@@ -495,7 +495,7 @@ bool QFileSystemIteratorPrivate::matchesFilters(const QAbstractFileEngineIterato
                                            || (!fi.exists() && fi.isSymLink()))) {
         return false;
     }
-    
+
     return true;
 }
 #endif
@@ -608,7 +608,7 @@ bool QFileSystemIterator::atEnd() const
     This function is provided for the convenience when iterating single
     directories. For recursive iteration, you should call filePath() or
     fileInfo() instead.
-    
+
     \sa filePath(), fileInfo()
 */
 QString QFileSystemIterator::fileName() const
diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp
index 4eb123f00c..ef5fd36254 100644
--- a/tests/benchmarks/corelib/io/qfile/main.cpp
+++ b/tests/benchmarks/corelib/io/qfile/main.cpp
@@ -184,9 +184,9 @@ void tst_qfile::readBigFile_QFSFileEngine()
     QSKIP("This test requires -developer-build.");
 #endif
 }
-void tst_qfile::readBigFile_posix() 
-{ 
-    readBigFile(); 
+void tst_qfile::readBigFile_posix()
+{
+    readBigFile();
 }
 void tst_qfile::readBigFile_Win32() { readBigFile(); }
 
@@ -509,13 +509,13 @@ void tst_qfile::readSmallFiles_QFSFileEngine()
     QSKIP("This test requires -developer-build.");
 #endif
 }
-void tst_qfile::readSmallFiles_posix() 
+void tst_qfile::readSmallFiles_posix()
 {
-    readSmallFiles(); 
+    readSmallFiles();
 }
-void tst_qfile::readSmallFiles_Win32() 
-{ 
-    readSmallFiles(); 
+void tst_qfile::readSmallFiles_Win32()
+{
+    readSmallFiles();
 }
 
 void tst_qfile::readSmallFiles_QFile_data()
diff --git a/tests/benchmarks/corelib/tools/containers-associative/main.cpp b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
index e4511f4935..d2275ddb92 100644
--- a/tests/benchmarks/corelib/tools/containers-associative/main.cpp
+++ b/tests/benchmarks/corelib/tools/containers-associative/main.cpp
@@ -52,7 +52,7 @@ private slots:
     void lookup();
 };
 
-template <typename T> 
+template <typename T>
 void testInsert(int size)
 {
     T container;
@@ -69,7 +69,7 @@ void tst_associative_containers::insert_data()
     QTest::addColumn<int>("size");
 
     for (int size = 10; size < 20000; size += 100) {
-    
+
         const QByteArray sizeString = QByteArray::number(size);
 
         QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
@@ -86,9 +86,9 @@ void tst_associative_containers::insert()
     QMap<int, int> testMap;
 
     if (useHash) {
-        testInsert<QHash<int, int> >(size);        
+        testInsert<QHash<int, int> >(size);
     } else {
-        testInsert<QMap<int, int> >(size);        
+        testInsert<QMap<int, int> >(size);
     }
 }
 
@@ -101,7 +101,7 @@ void tst_associative_containers::lookup_data()
     QTest::addColumn<int>("size");
 
     for (int size = 10; size < 20000; size += 100) {
-    
+
         const QByteArray sizeString = QByteArray::number(size);
 
         QTest::newRow(QByteArray("hash--" + sizeString).constData()) << true << size;
@@ -109,11 +109,11 @@ void tst_associative_containers::lookup_data()
     }
 }
 
-template <typename T> 
+template <typename T>
 void testLookup(int size)
 {
     T container;
-    
+
     for (int i = 0; i < size; ++i)
         container.insert(i, i);
 
@@ -122,7 +122,7 @@ void testLookup(int size)
     QBENCHMARK {
         for (int i = 0; i < size; ++i)
             val = container.value(i);
-        
+
     }
 }
 
diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp
index a34888ab13..3f8ebbecc5 100644
--- a/tests/benchmarks/corelib/tools/qregexp/main.cpp
+++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp
@@ -139,13 +139,13 @@ void tst_qregexp::escape_data()
 
     QTest::newRow("escape 0") << "Hello world" << "Hello world";
     QTest::newRow("escape 1") << "(Hello world)" << "\\(Hello world\\)";
-    { 
+    {
         QString s;
         for (int i = 0; i < 10; ++i)
             s += "(escape)";
         QTest::newRow("escape 10") << s << QRegExp::escape(s);
     }
-    { 
+    {
         QString s;
         for (int i = 0; i < 100; ++i)
             s += "(escape)";
@@ -242,7 +242,7 @@ void tst_qregexp::escape_new2()
             *quotedData = c;
             ++quotedData;
         }
-        quoted.resize(pattern.size() + escaped); 
+        quoted.resize(pattern.size() + escaped);
 
         verify(quoted, expected);
     }
@@ -329,7 +329,7 @@ void tst_qregexp::escape_new4()
         const QLatin1Char backslash('\\');
         QString quoted(n * 2, backslash);
         QChar *quotedData = quoted.data();
-        for (int j = 0; j != i; ++j) 
+        for (int j = 0; j != i; ++j)
             *quotedData++ = *patternData++;
         int escaped = 0;
         for (; i != n; ++i) {
@@ -342,7 +342,7 @@ void tst_qregexp::escape_new4()
             ++quotedData;
             ++patternData;
         }
-        quoted.resize(n + escaped); 
+        quoted.resize(n + escaped);
         verify(quoted, expected);
         // "return quoted"
     }
diff --git a/tests/benchmarks/corelib/tools/qvector/main.cpp b/tests/benchmarks/corelib/tools/qvector/main.cpp
index 3c6defb572..f7325f7998 100644
--- a/tests/benchmarks/corelib/tools/qvector/main.cpp
+++ b/tests/benchmarks/corelib/tools/qvector/main.cpp
@@ -83,7 +83,7 @@ qvector_const_read_access:
         xorl    %eax, %eax
 .L183:
 !       fldl    s
-!       faddl   16(%edx,%eax,8) 
+!       faddl   16(%edx,%eax,8)
 !       addl    $1, %eax
 !       cmpl    $10000, %eax
 !       fstpl   s
diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
index 3f0d72a231..f358909eb1 100644
--- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h
+++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
@@ -100,7 +100,7 @@ public:
     static T *fromBase(void *d)
     { return (T*)((char*)d + offsetOfTypedData()); }
 
-    inline QRawVector() 
+    inline QRawVector()
     { m_begin = fromBase(0); m_alloc = m_size = 0; realloc(m_size, m_alloc, true); }
     explicit QRawVector(int size);
     QRawVector(int size, const T &t);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
index 5e4b1e3a2f..e9204e3282 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp
@@ -259,7 +259,7 @@ void AbstractItemContainer::updateItemBuffer()
         QModelIndex index;
         if (m_items.count() > 0)
             index = m_items.last()->modelIndex();
-        while (m_items.count() < maxCount) {            
+        while (m_items.count() < maxCount) {
             index = m_itemView->nextIndex(index);
 
             if (!index.isValid())
@@ -311,7 +311,7 @@ void AbstractItemContainer::insertItem(int pos, const QModelIndex &index)
         item = m_prototype->newItemInstance();
 
     if (item) {
-        item->setModel(m_itemView->model());        
+        item->setModel(m_itemView->model());
         item->setModelIndex(index);
         item->setTwoColumns(m_twoColumns);
         m_items.insert(pos, item);
@@ -335,7 +335,7 @@ void AbstractItemContainer::findFirstAndLastVisibleBufferIndex(int &firstVisible
     lastVisibleBufferIndex = -1;
 
     int count = m_items.count();
-    for (int i = 0; i < count; ++i) {        
+    for (int i = 0; i < count; ++i) {
         if (itemVisibleInView(m_items.at(i), viewRect, fullyVisible)) {
             if (firstVisibleBufferIndex == -1)
                 firstVisibleBufferIndex = i;
@@ -359,13 +359,13 @@ int AbstractItemContainer::maxItemCountInItemBuffer() const
 
 void AbstractItemContainer::themeChange()
 {
-    for (int i = 0; i <m_items.count(); ++i) 
+    for (int i = 0; i <m_items.count(); ++i)
         m_items.at(i)->themeChange();
 }
 
-void AbstractItemContainer::updateContent() 
+void AbstractItemContainer::updateContent()
 {
-    for (int i = 0; i <m_items.count(); ++i) 
+    for (int i = 0; i <m_items.count(); ++i)
         m_items.at(i)->updateItemContents();
 }
 
@@ -389,7 +389,7 @@ void AbstractItemContainer::setTwoColumns(const bool enabled)
 }
 
 bool AbstractItemContainer::twoColumns()
-{    
+{
     return m_twoColumns;
 }
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
index 06fd5d9754..779b99a0c5 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp
@@ -63,8 +63,8 @@ AbstractItemView::~AbstractItemView()
 
 /*virtual*/
 void AbstractItemView::setModel(QAbstractItemModel *model, AbstractViewItem *prototype)
-{    
-    if( m_model == model || !model)
+{
+    if (m_model == model || !model)
         return;
 
     if (m_model) {
@@ -236,7 +236,7 @@ void AbstractItemView::currentIndexChanged(const QModelIndex &current, const QMo
 
 /*virtual*/
 void AbstractItemView::currentSelectionChanged(const QItemSelection &selected,
-                                                 const QItemSelection &deselected)
+                                               const QItemSelection &deselected)
 {
    Q_UNUSED(selected)
    Q_UNUSED(deselected)
@@ -260,7 +260,6 @@ void AbstractItemView::rowsAboutToBeInserted(const QModelIndex &index, int start
     // TODO implement
 }
 
-
 /*virtual*/
 void AbstractItemView::rowsAboutToBeRemoved(const QModelIndex &index,int start, int end)
 {
@@ -346,7 +345,7 @@ bool AbstractItemView::event(QEvent *e)
         m_container->resize(this->size().width()-verticalScrollBar()->size().width(),
                             m_container->preferredHeight());
 
-        if(verticalScrollBar()->sliderPosition() > verticalScrollBar()->sliderSize())
+        if (verticalScrollBar()->sliderPosition() > verticalScrollBar()->sliderSize())
             verticalScrollBar()->setSliderPosition(verticalScrollBar()->sliderSize());
 
         result = true;
@@ -371,7 +370,7 @@ void AbstractItemView::refreshContainerGeometry()
     ScrollBar *sb = verticalScrollBar();
 
     if (sb) {
-        AbstractViewItem *item = m_container->itemAt(0);        
+        AbstractViewItem *item = m_container->itemAt(0);
         if (item) {
             qreal oneItemH = item->size().height();
             sb->setSliderSize(oneItemH*m_model->rowCount(m_rootIndex)-size().height());
@@ -394,10 +393,9 @@ void AbstractItemView::scrollContentsBy(qreal dx, qreal dy)
     qreal itemH = 1;
 
     AbstractViewItem *item = m_container->itemAt(0);
-    if(item && item->size().height() > 1) {
+    if (item && item->size().height() > 1) {
         itemH = item->size().height();
-    }
-    else if(item && item->preferredHeight() > 1) {
+    } else if (item && item->preferredHeight() > 1) {
         itemH = item->preferredHeight();
     }
 
@@ -407,8 +405,7 @@ void AbstractItemView::scrollContentsBy(qreal dx, qreal dy)
     if ((vpy+m_container->size().height()-dy > pos().y()+size().height()) &&
         (qAbs(dy) < itemH) && (vpy-dy <= 0)) {
         m_container->setPos(vpx, vpy-dy);
-    }
-    else {        
+    } else {
         qreal vPos = verticalScrollBar()->sliderPosition();
         int startRow =  m_model->index(vPos/itemH, 0).row();
         int itemsInContainer = m_container->itemCount();
@@ -428,13 +425,13 @@ void AbstractItemView::scrollContentsBy(qreal dx, qreal dy)
     }
 }
 
-void AbstractItemView::changeTheme() 
+void AbstractItemView::changeTheme()
 {
     if (m_container)
         m_container->themeChange();
 }
 
-void AbstractItemView::updateViewContent() 
+void AbstractItemView::updateViewContent()
 {
     if (m_container)
         m_container->updateContent();
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
index c904cb520b..bdd18e234f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.cpp
@@ -54,11 +54,11 @@ AbstractScrollArea::AbstractScrollArea(QGraphicsWidget *parent)
     , m_prevVerticalValue(0.0)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    setContentsMargins(0, 0, 0, 0);     
+    setContentsMargins(0, 0, 0, 0);
 
     m_horizontalScrollBar = new ScrollBar(Qt::Horizontal, this);
     m_horizontalScrollBar->hide();
-    m_horizontalScrollBar->setContentsMargins(0, 0, 0, 0); 
+    m_horizontalScrollBar->setContentsMargins(0, 0, 0, 0);
     m_horizontalScrollBarPolicy = Qt::ScrollBarAsNeeded;
     m_horizontalScrollBar->setZValue(zValue()+1); // Raise scroll bar to top
     m_horizontalScrollBar->setVisible(false);
@@ -70,7 +70,7 @@ AbstractScrollArea::AbstractScrollArea(QGraphicsWidget *parent)
 
     m_verticalScrollBar = new ScrollBar(Qt::Vertical, this);
     m_verticalScrollBar->hide();
-    m_verticalScrollBar->setContentsMargins(0, 0, 0, 0); 
+    m_verticalScrollBar->setContentsMargins(0, 0, 0, 0);
     m_verticalScrollBarPolicy = Qt::ScrollBarAsNeeded;
     m_verticalScrollBar->setZValue(zValue()+1); // Raise scroll bar to top
     m_verticalScrollBar->setVisible(false);
@@ -153,8 +153,8 @@ bool AbstractScrollArea::event(QEvent *e)
 {
     if (e->type() == QEvent::ApplicationLayoutDirectionChange
        || e->type() == QEvent::LayoutDirectionChange) {
-    } else if (e->type() == QEvent::GraphicsSceneResize) {        
-        QGraphicsSceneResizeEvent *event = 
+    } else if (e->type() == QEvent::GraphicsSceneResize) {
+        QGraphicsSceneResizeEvent *event =
             static_cast<QGraphicsSceneResizeEvent*>(e);
 
         QSizeF newSize = event->newSize();
@@ -186,7 +186,7 @@ void AbstractScrollArea::scrollContentsBy(qreal dx, qreal dy)
 
 void AbstractScrollArea::verticalScrollStart()
 {
-    m_prevVerticalValue = m_verticalScrollBar->sliderPosition(); 
+    m_prevVerticalValue = m_verticalScrollBar->sliderPosition();
 }
 
 void AbstractScrollArea::verticalScroll(qreal value)
@@ -200,7 +200,7 @@ void AbstractScrollArea::verticalScroll(qreal value)
 
 void AbstractScrollArea::horizontalScrollStart()
 {
-    m_prevHorizontalValue = m_horizontalScrollBar->sliderPosition(); 
+    m_prevHorizontalValue = m_horizontalScrollBar->sliderPosition();
 }
 
 void AbstractScrollArea::horizontalScroll(qreal value)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
index 8f90277994..b4c32bf668 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractscrollarea.h
@@ -90,8 +90,8 @@ private:
     void adjustScrollBars();
 
     QGraphicsWidget *m_viewport;
-    ScrollBar *m_horizontalScrollBar; 
-    ScrollBar *m_verticalScrollBar; 
+    ScrollBar *m_horizontalScrollBar;
+    ScrollBar *m_verticalScrollBar;
     Qt::ScrollBarPolicy m_verticalScrollBarPolicy;
     Qt::ScrollBarPolicy m_horizontalScrollBarPolicy;
     qreal m_prevHorizontalValue;
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
index 04626c4855..c4e10a36c6 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.cpp
@@ -59,7 +59,6 @@ BackgroundItem::BackgroundItem(const QString &filename, QGraphicsWidget *parent)
 
 BackgroundItem::~BackgroundItem()
 {
-    
 }
 
 void BackgroundItem::resizeEvent(QGraphicsSceneResizeEvent *event)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
index a637a50408..38a176e73d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/backgrounditem.h
@@ -51,19 +51,19 @@ class QGraphicsWidget;
 class BackgroundItem : public GvbWidget
 {
     Q_OBJECT
-    
+
 public:
     BackgroundItem(const QString &filename, QGraphicsWidget *parent=0);
     ~BackgroundItem();
-    
+
     void paint(QPainter *painter,
                 const QStyleOptionGraphicsItem *option,
                 QWidget *widget = 0);
     void resizeEvent(QGraphicsSceneResizeEvent *event);
-    
+
 public slots:
     void themeChange();
-    
+
 private:
     QPixmap m_background;
     QString m_fileName;
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
index 37d2318746..8ca4307c8b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp
@@ -50,7 +50,7 @@ class ButtonPrivate {
 
 public:
 
-    ButtonPrivate(Button *button) 
+    ButtonPrivate(Button *button)
        : down(false)
        , q_ptr(button)
     {
@@ -65,7 +65,7 @@ public:
 Button::Button(const QString &text, QGraphicsItem *parent, QSizeF minimumSize)
     : QGraphicsWidget(parent)
     , d_ptr(new ButtonPrivate(this)), m_background(), m_selected(false)
-{ 
+{
     Q_D(Button);
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     //setCacheMode(QGraphicsItem::ItemCoordinateCache);
@@ -105,13 +105,13 @@ QString Button::text()
     return d->textItem->text();
 }
 
-void Button::paint(QPainter *painter, 
-        const QStyleOptionGraphicsItem *option, 
+void Button::paint(QPainter *painter,
+        const QStyleOptionGraphicsItem *option,
         QWidget *widget)
 {
     Q_UNUSED(widget);
     Q_UNUSED(option);
-    
+
     if(!m_background.isNull())
         painter->drawPixmap(QPoint(), m_background);
     if(m_selected) {
@@ -121,8 +121,8 @@ void Button::paint(QPainter *painter,
     }
 }
 
-QSizeF Button::sizeHint(Qt::SizeHint which, 
-        const QSizeF &constraint) const 
+QSizeF Button::sizeHint(Qt::SizeHint which,
+        const QSizeF &constraint) const
 {
     Q_D(const Button);
 
@@ -146,7 +146,7 @@ QSizeF Button::sizeHint(Qt::SizeHint which,
 void Button::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(Button);
-    
+
     if (event->button() != Qt::LeftButton ||
                   !sceneBoundingRect().contains(event->scenePos()))
         return;
@@ -162,7 +162,7 @@ void Button::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(Button);
 
-    if (!d->down || event->button() != Qt::LeftButton) 
+    if (!d->down || event->button() != Qt::LeftButton)
         return;
 
     d->down = false;
@@ -184,11 +184,11 @@ void Button::resizeEvent(QGraphicsSceneResizeEvent *event)
 {
     Q_D(Button);
     QGraphicsWidget::resizeEvent(event);
-    
+
     QRectF rect = d->textItem->boundingRect();
     QRectF buttonrect = this->boundingRect();
     d->textItem->setPos((buttonrect.width() - rect.width())/2, (buttonrect.height() - rect.height())/2 );
-    
+
     QSize currentSize = buttonrect.size().toSize();
     if( m_background.size() != currentSize && (currentSize.width() > 0 && currentSize.height() > 0)  ) {
         m_background = Theme::p()->pixmap("status_field_middle.svg", buttonrect.size().toSize());
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
index 14ffb15626..8641d8a9b6 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.h
@@ -47,7 +47,7 @@
 class ButtonPrivate;
 class QTextDocument;
 
-class QPixmap; 
+class QPixmap;
 class QFont;
 
 class Button : public QGraphicsWidget
@@ -73,7 +73,7 @@ public slots:
     QString text();
 
 public:
-    
+
     void setBackground(QPixmap& background);
     bool isDown();
     void select(bool select){m_selected = select;}
@@ -81,9 +81,9 @@ public:
 
 private:
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, 
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
             QWidget *widget = 0);
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
         const QSizeF &constraint = QSizeF()) const;
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
index d98beefea6..06dea1b864 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.cpp
@@ -127,7 +127,7 @@ bool readSettingsFromCommandLine(int argc, char *argv[],
                 argv[i] = 0;
                 i++;
                 argv[i] = 0;
-            }        
+            }
         }
 
         if (!argv[i])
@@ -160,7 +160,7 @@ bool readSettingsFromCommandLine(int argc, char *argv[],
                 argv[i] = 0;
                 i++;
                 argv[i] = 0;
-            }        
+            }
         } else if (strcmp(argv[i], "-subtree-cache") == 0) {
             options |= Settings::UseListItemCache;
             argv[i] = 0;
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
index 20d3706e9c..16525487da 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/commandline.h
@@ -44,7 +44,7 @@
 
 #include "settings.h"
 
-bool readSettingsFromCommandLine(int argc, 
+bool readSettingsFromCommandLine(int argc,
                                  char *argv[],
                                  Settings& settings);
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
index 86fc78d3f7..259e94aa2f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.cpp
@@ -51,19 +51,19 @@ DummyDataGenerator::DummyDataGenerator() : m_isMale(false)
     while (!countryCodeFile.atEnd()) {
         m_countryCodes << QString(countryCodeFile.readLine()).remove("\n");
     }
-    
+
     QFile firstNameFFile(":/contact/firstnamesF.txt");
     firstNameFFile.open(QIODevice::ReadOnly);
     while (!firstNameFFile.atEnd()) {
         m_firstNamesF << QString(firstNameFFile.readLine()).remove("\n");
     }
-  
+
     QFile firstNameMFile(":/contact/firstnamesM.txt");
     firstNameMFile.open(QIODevice::ReadOnly);
     while (!firstNameMFile.atEnd()) {
         m_firstNamesM << QString(firstNameMFile.readLine()).remove("\n");
     }
-    
+
     QFile lastNameFile(":/contact/lastnames.txt");
     lastNameFile.open(QIODevice::ReadOnly);
     while (!lastNameFile.atEnd()) {
@@ -74,7 +74,6 @@ DummyDataGenerator::DummyDataGenerator() : m_isMale(false)
 
 DummyDataGenerator::~DummyDataGenerator()
 {
-    
 }
 
 void DummyDataGenerator::Reset()
@@ -89,7 +88,7 @@ QString DummyDataGenerator::randomPhoneNumber(QString indexNumber)
     QString areaCode = QString::number(index) + QString("0").repeated(2-QString::number(index).length());
     QString beginNumber = QString::number(555-index*2);
     QString endNumber = QString("0").repeated(4-indexNumber.length()) + indexNumber;
-    
+
     return countryCode +" " + areaCode +" " + beginNumber +" " + endNumber;
 }
 
@@ -116,14 +115,14 @@ QString DummyDataGenerator::randomIconItem()
     QString avatar = Theme::p()->pixmapPath() + "contact_default_icon.svg";
     if (qrand()%4) {
       int randVal = 1+qrand()%25;
-      
-      if(m_isMale && randVal > 15) {
-          randVal -= 15;    
+
+      if (m_isMale && randVal > 15) {
+          randVal -= 15;
       }
-      if(!m_isMale && randVal <= 10) {
+      if (!m_isMale && randVal <= 10) {
           randVal += 10;
       }
-      
+
       avatar = QString(":/avatars/avatar_%1.png").arg(randVal, 3, 10, QChar('0'));
     }
     return avatar;
@@ -131,8 +130,7 @@ QString DummyDataGenerator::randomIconItem()
 
 QString DummyDataGenerator::randomStatusItem()
 {
-    switch ( qrand()%3 )
-    {
+    switch (qrand()%3) {
         case 0: return Theme::p()->pixmapPath() + "contact_status_online.svg";
         case 1: return Theme::p()->pixmapPath() + "contact_status_offline.svg";
         case 2: return Theme::p()->pixmapPath() + "contact_status_idle.svg";
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
index 5e64357919..9f418390f0 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/dummydatagen.h
@@ -51,7 +51,7 @@ class DummyDataGenerator : public QObject
 public:
     DummyDataGenerator();
     ~DummyDataGenerator();
-    
+
 public:
     void Reset();
     QString randomPhoneNumber(QString indexNumber);
@@ -60,7 +60,7 @@ public:
     QString randomName();
     QString randomIconItem();
     QString randomStatusItem();
-    
+
 private:
     QStringList m_countryCodes;
     QStringList m_firstNamesF;
@@ -69,4 +69,4 @@ private:
     bool m_isMale;
 };
 
-#endif // __DUMMYDATAGEN_H__ 
+#endif // __DUMMYDATAGEN_H__
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
index 8348d429b5..5d23c55102 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/gvbwidget.h
@@ -44,7 +44,7 @@
 
 #include <QGraphicsWidget>
 
-class GvbWidget : public QGraphicsWidget 
+class GvbWidget : public QGraphicsWidget
 {
     Q_OBJECT
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
index 13713940c8..d68d7f799f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp
@@ -45,7 +45,7 @@
 
 #include "iconitem.h"
 
-IconItem::IconItem(const QString &filename, QGraphicsItem *parent) 
+IconItem::IconItem(const QString &filename, QGraphicsItem *parent)
   : GvbWidget(parent)
   , m_filename(filename)
   , m_rotation(0.0)
@@ -79,7 +79,7 @@ void IconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     painter->drawPixmap(0,0, m_pixmap);
 }
 
-QSizeF IconItem::sizeHint(Qt::SizeHint which, 
+QSizeF IconItem::sizeHint(Qt::SizeHint which,
     const QSizeF &constraint) const
 {
     switch (which)
@@ -144,7 +144,7 @@ void IconItem::setOpacityEffectEnabled(const bool enable)
         gradient.setColorAt(0.0, QColor(0,0,0, 255));
         gradient.setColorAt(0.46, QColor(0,0,0, 255));
         gradient.setColorAt(0.62, QColor(0,0,0, 0));
-    
+
         m_opacityEffect = new QGraphicsOpacityEffect;
         m_opacityEffect->setOpacityMask(gradient);
         m_opacityEffect->setOpacity(1.0);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
index 7d4510479b..9d1fb168de 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
@@ -74,7 +74,7 @@ public:
 private:
 
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*widget = 0*/);
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
         const QSizeF &constraint = QSizeF()) const;
 
 private:
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
index 1856d74500..fc6d5683ee 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp
@@ -52,7 +52,7 @@
 ItemRecyclingList::ItemRecyclingList(const int itemBuffer, QGraphicsWidget * parent)
     : ItemRecyclingListView(parent),
       m_listModel(new ListModel(this))
-{    
+{
     ListItemContainer *container = new ListItemContainer(itemBuffer, this, this);
     container->setParentItem(this);
     ItemRecyclingListView::setContainer(container);
@@ -153,7 +153,7 @@ void ItemRecyclingList::themeChange()
                 item->setBackgroundBrush(Theme::p()->listItemBackgroundBrushEven());
                 item->setBackgroundOpacity(Theme::p()->listItemBackgroundOpacityEven());
             }
-    
+
             // Update borders
             item->setBorderPen(Theme::p()->listItemBorderPen());
             item->setRounding(Theme::p()->listItemRounding());
@@ -177,7 +177,7 @@ void ItemRecyclingList::keyPressEvent(QKeyEvent *event)
     static qreal step = 0.0;
     static bool repeat = false;
     int interval = keyPressInterval.elapsed();
-    
+
     ScrollBar* sb = verticalScrollBar();
     qreal currentValue = sb->sliderPosition();
 
@@ -193,11 +193,11 @@ void ItemRecyclingList::keyPressEvent(QKeyEvent *event)
             step = m_listModel->item(0)->size().height();
         repeat = false;
     }
-    
+
     if(event->key() == Qt::Key_Up ) { //Up Arrow
         sb->setSliderPosition(currentValue - step);
     }
-    
+
     if(event->key() == Qt::Key_Down ) { //Down Arrow
         sb->setSliderPosition(currentValue + step);
     }
@@ -255,7 +255,7 @@ void ItemRecyclingList::setTwoColumns(const bool enabled)
 }
 
 bool ItemRecyclingList::twoColumns()
-{    
+{
     return m_container->twoColumns();
 }
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
index f865740632..b86fe345f4 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.h
@@ -59,7 +59,7 @@ public:
     virtual ~ItemRecyclingList();
 
     virtual void insertItem(int index, RecycledListItem *item);
-    virtual void addItem(RecycledListItem *item);    
+    virtual void addItem(RecycledListItem *item);
     virtual void clear();
     virtual AbstractViewItem *takeItem(const int row);
     virtual void setItemPrototype(AbstractViewItem* prototype);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
index bc45f11df0..847b55237d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp
@@ -43,7 +43,7 @@
 
 #include "label.h"
 
-Label::Label(const QString& text, QGraphicsItem *parent) 
+Label::Label(const QString &text, QGraphicsItem *parent)
     : GvbWidget(parent)
 {
     m_textItem = new QGraphicsSimpleTextItem(this);
@@ -58,8 +58,8 @@ Label::~Label()
 {
 }
 
-void Label::setText(const QString& text) 
-{ 
+void Label::setText(const QString &text)
+{
     m_textItem->setText(text);
     prepareGeometryChange();
 }
@@ -74,22 +74,20 @@ void Label::setFont(const QFont font)
     m_textItem->setFont(font);
 }
 
-void Label::resizeEvent(QGraphicsSceneResizeEvent *event) 
+void Label::resizeEvent(QGraphicsSceneResizeEvent *event)
 {
     GvbWidget::resizeEvent(event);
 }
 
 QSizeF Label::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
-    switch (which)
-    {
+    switch (which) {
     case Qt::MinimumSize:
         // fall thru
-    case Qt::PreferredSize:
-        {
+    case Qt::PreferredSize: {
         QFontMetricsF fm(m_textItem->font());
         return QSizeF(fm.width(m_textItem->text()), fm.height());
-        }
+    }
     default:
         return GvbWidget::sizeHint(which, constraint);
     }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
index e5c83ab3b0..74ffc39d37 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.h
@@ -65,7 +65,7 @@ public:
 
 private:
     void resizeEvent(QGraphicsSceneResizeEvent *event);
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
     const QSizeF &constraint = QSizeF()) const;
 
 private:
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
index 27ce0a2919..222e4eea50 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp
@@ -64,25 +64,25 @@ struct ItemData
 Q_DECLARE_METATYPE(ItemData);
 
 ListItem::ListItem(QGraphicsWidget *parent)
-  : GvbWidget(parent),
-    m_txtlayout(new QGraphicsGridLayout()),
-    m_layout(new QGraphicsLinearLayout(Qt::Horizontal)),
-    m_liconlayout(new QGraphicsLinearLayout(Qt::Horizontal)),
-    m_riconlayout(new QGraphicsLinearLayout(Qt::Horizontal))
-    ,m_fonts()
-    ,m_borderPen(Qt::NoPen)
-    ,m_backgroundBrush(QBrush())
-    ,m_backgroundOpacity(1.0)
-    ,m_rounding(0.0, 0.0)
-{ 
+  : GvbWidget(parent)
+  , m_txtlayout(new QGraphicsGridLayout())
+  , m_layout(new QGraphicsLinearLayout(Qt::Horizontal))
+  , m_liconlayout(new QGraphicsLinearLayout(Qt::Horizontal))
+  , m_riconlayout(new QGraphicsLinearLayout(Qt::Horizontal))
+  , m_fonts()
+  , m_borderPen(Qt::NoPen)
+  , m_backgroundBrush(QBrush())
+  , m_backgroundOpacity(1.0)
+  , m_rounding(0.0, 0.0)
+{
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     setContentsMargins(0,4,4,0);
-    m_layout->setContentsMargins(0,0,0,0); 
+    m_layout->setContentsMargins(0,0,0,0);
 
     m_txtlayout->setContentsMargins(0,8,0,8);
     m_liconlayout->setContentsMargins(8,8,8,8);
     m_riconlayout->setContentsMargins(0,8,4,8);
-    
+
     m_layout->insertItem(0, m_liconlayout);
     m_layout->insertItem(1, m_txtlayout);
     m_layout->insertItem(2, m_riconlayout);
@@ -95,47 +95,44 @@ ListItem::ListItem(QGraphicsWidget *parent)
     setLayout(m_layout);
 }
 
-ListItem::~ListItem() 
+ListItem::~ListItem()
 {
-    if ( !m_liconlayout->parentLayoutItem() )
+    if (!m_liconlayout->parentLayoutItem())
         delete m_liconlayout;
 
-    if ( !m_riconlayout->parentLayoutItem() )
+    if (!m_riconlayout->parentLayoutItem())
         delete m_riconlayout;
 }
 
-void ListItem::setIcon( IconItem *iconItem, const IconItemPos iconPos )
+void ListItem::setIcon(IconItem *iconItem, const IconItemPos iconPos)
 {
     if (iconPos == LeftIcon) {
         if (m_liconlayout->count() > 0 && m_liconlayout->itemAt(0)) {
             delete m_liconlayout->itemAt(0);
-            m_liconlayout->addItem( iconItem );
+            m_liconlayout->addItem(iconItem);
+        } else {
+            m_liconlayout->addItem(iconItem);
         }
-        else {
-            m_liconlayout->addItem( iconItem );
-        }
-        m_liconlayout->itemAt(0)->setMaximumSize(58,58);
-    }
-    else if (iconPos == RightIcon) {
+        m_liconlayout->itemAt(0)->setMaximumSize(58, 58);
+    } else if (iconPos == RightIcon) {
         if (m_riconlayout->count() > 0 && m_riconlayout->itemAt(0)) {
             delete m_riconlayout->itemAt(0);
-            m_riconlayout->addItem( iconItem );
+            m_riconlayout->addItem(iconItem);
+        } else {
+            m_riconlayout->addItem(iconItem);
         }
-        else {
-            m_riconlayout->addItem( iconItem );
-        }
-        m_riconlayout->itemAt(0)->setMaximumSize(22,22);
+        m_riconlayout->itemAt(0)->setMaximumSize(22, 22);
     }
     m_layout->invalidate();
 }
 
-IconItem* ListItem::icon( const IconItemPos iconPos )  const
+IconItem* ListItem::icon(const IconItemPos iconPos) const
 {
     QGraphicsLayoutItem* item = 0;
 
     if (iconPos == LeftIcon && m_liconlayout->count() > 0) {
         item = m_liconlayout->itemAt(0);
-    } 
+    }
     else if (iconPos == RightIcon && m_riconlayout->count() > 0) {
         item = m_riconlayout->itemAt(0);
     }
@@ -203,13 +200,13 @@ void ListItem::setData(const QVariant &value, int role)
     ItemData data = value.value<ItemData>();
     QList<ListItem::TextPos> textkeys = data.texts.keys();
 
-    for( int i = 0; i<textkeys.count(); ++i) {
-        setText(data.texts[textkeys.at(i)],textkeys.at(i));
+    for (int i = 0; i<textkeys.count(); ++i) {
+        setText(data.texts[textkeys.at(i)], textkeys.at(i));
         setFont(data.fonts[textkeys.at(i)], textkeys.at(i));
     }
 
     QList<ListItem::IconItemPos> iconkeys = data.icons.keys();
-    for( int i = 0; i<iconkeys.count(); ++i) {
+    for (int i = 0; i<iconkeys.count(); ++i) {
         IconItem *iconItem = icon(iconkeys.at(i));
         if (iconItem)
             iconItem->setFileName(data.icons[iconkeys.at(i)]);
@@ -249,8 +246,7 @@ void ListItem::setText(const QString str, const TextPos position)
         m_txtlayout->addItem(label, position, 0);
         if (m_fonts.contains(position))
             label->setFont(m_fonts[position]);
-    }
-    else {
+    } else {
         Label *titem = static_cast<Label *>(item);
         titem->setText(str);
     }
@@ -290,14 +286,12 @@ void ListItem::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option
     QRectF r = rect();
     r.adjust(penWidth, penWidth, -penWidth, -penWidth);
 
-    if (m_borderPen != Qt::NoPen)
-    {
+    if (m_borderPen != Qt::NoPen) {
         painter->setPen(m_borderPen);
         painter->drawRoundedRect(r, m_rounding.width(), m_rounding.height());
     }
 
-    if (m_backgroundBrush != Qt::NoBrush)
-    {
+    if (m_backgroundBrush != Qt::NoBrush) {
         painter->setPen(Qt::NoPen);
         painter->setBrush(m_backgroundBrush);
         painter->setOpacity(m_backgroundOpacity);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
index 451f1f8031..a1fa8df047 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.cpp
@@ -53,7 +53,7 @@ ListItemCache::~ListItemCache()
     QPixmapCache::remove(m_cacheKey);
 }
 
-void ListItemCache::draw(QPainter * painter) 
+void ListItemCache::draw(QPainter * painter)
 {
     QRectF irect = sourceBoundingRect(Qt::LogicalCoordinates);
     QRectF vrect = painter->clipPath().boundingRect();
@@ -80,7 +80,7 @@ void ListItemCache::draw(QPainter * painter)
 
         //qDebug() << "ListItemCache: blitting" << m_visibleRect;
         painter->drawPixmap(0, 0, pixmap);
-    } 
+    }
 }
 
 void ListItemCache::sourceChanged(ChangeFlags)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
index a7b36c95c6..3e9153ce53 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcache.h
@@ -45,7 +45,7 @@
 #include <QGraphicsEffect>
 #include <QPixmapCache>
 
-class ListItemCache : public QGraphicsEffect 
+class ListItemCache : public QGraphicsEffect
 {
     Q_OBJECT
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
index 0b787f077d..91dba0bc7d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp
@@ -56,7 +56,7 @@ ListItemContainer::ListItemContainer(int bufferSize, ItemRecyclingList *view, QG
     , m_layout(new QGraphicsLinearLayout(Qt::Vertical))
     , m_listItemCaching(false)
 {
-    setContentsMargins(0,0,0,0);    
+    setContentsMargins(0,0,0,0);
     m_layout->setContentsMargins(0,0,0,0);
     m_layout->setSpacing(0);
     setLayout(m_layout);
@@ -80,13 +80,13 @@ bool ListItemContainer::listItemCaching() const
 }
 
 void ListItemContainer::setListItemCaching(const bool enabled)
-{    
+{
     if (m_listItemCaching == enabled)
         return;
 
     m_listItemCaching = enabled;
 
-    const int itemCount = m_layout->count(); 
+    const int itemCount = m_layout->count();
 
     for (int i = 0; i < itemCount; ++i)
         setListItemCaching(enabled, i);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
index 95eadeece1..f219402aca 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listmodel.cpp
@@ -106,7 +106,7 @@ void ListModel::insert(int row, RecycledListItem *item)
 {
     if (item)
         item->setModel(this);
-    if (!item || m_items.contains(item) ) {     
+    if (!item || m_items.contains(item) ) {
         return;
     }
     if (row < 0)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
index 1cce930d09..1626e1c5d3 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp
@@ -47,14 +47,14 @@
 
 ListWidget::ListWidget(QGraphicsWidget * parent)
   : GvbWidget(parent),
-    m_layout(new QGraphicsLinearLayout(Qt::Vertical)), 
+    m_layout(new QGraphicsLinearLayout(Qt::Vertical)),
     m_listView(new SimpleListView(this))
-{ 
+{
     //listView->setViewport(listView->content());
     //listView->content()->setParentItem(listView);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setContentsMargins(0,0,0,0);
-    m_layout->setContentsMargins(0,0,0,0); 
+    m_layout->setContentsMargins(0,0,0,0);
     m_listView->setContentsMargins(0,0,0,0);
     m_layout->addItem(m_listView);
     setLayout(m_layout);
@@ -64,7 +64,7 @@ ListWidget::ListWidget(QGraphicsWidget * parent)
     m_listView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
-ListWidget::~ListWidget() 
+ListWidget::~ListWidget()
 {
 
 }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
index 57cff5f902..afd8581932 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.cpp
@@ -82,7 +82,7 @@ MainView::~MainView()
 }
 
 void MainView::setTestWidget(QGraphicsWidget *testWidget)
-{ 
+{
     if (!testWidget)
         return;
 
@@ -99,7 +99,7 @@ void MainView::setTestWidget(QGraphicsWidget *testWidget)
 QGraphicsWidget *MainView::takeTestWidget()
 {
     if (m_testWidget) {
-        m_mainLayout->removeItem(m_testWidget);       
+        m_mainLayout->removeItem(m_testWidget);
         QGraphicsWidget *tmp = m_testWidget;
         m_testWidget = 0;
         return tmp;
@@ -229,30 +229,30 @@ void MainView::keyPressEvent(QKeyEvent *event)
         else
             showFullScreen();
     }
- 
+
     //S60 3.x specific
     if(m_menu->menuVisible()) {
         m_menu->keyPressEvent(event);
         return;
     }
-    
+
     if(event->key() == 16777235 ) { //Up Arrow
         GvbWidget* widget = qobject_cast<GvbWidget*>(m_testWidget);
         if(widget)
             widget->keyPressEvent(event);
     }
-    
+
     if(event->key() == 16777237 ) { //Down Arrow
         GvbWidget* widget = qobject_cast<GvbWidget*>(m_testWidget);
         if(widget)
             widget->keyPressEvent(event);
     }
-    
+
     if(event->key() == 17825792 ) { //LSK
         if(!m_menu->menuVisible())
             m_menu->menuShowHide();
     }
-    
+
     if(event->key() == 17825793 ) { //RSK
         QApplication::quit();
     }
@@ -265,7 +265,7 @@ void MainView::construct()
 #ifndef QT_NO_OPENGL
     if (m_enableOpenGL) {
         qDebug() << "OpenGL enabled";
-        m_scene->setSortCacheEnabled(false);        
+        m_scene->setSortCacheEnabled(false);
         setViewport(new QGLWidget);
 
         // Qt doc says: This is the preferred update mode for
@@ -311,7 +311,7 @@ void MainView::construct()
     m_mainLayout->addItem(m_topBar);
     m_topBar->setZValue(1);
     connect(m_topBar, SIGNAL(clicked(bool)), m_menu, SLOT(menuShowHide()));
-    
+
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setContentsMargins(0,0,0,0);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
index 3a484bd7d1..ee8625edce 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/mainview.h
@@ -57,9 +57,9 @@ class BackgroundItem;
 class TopBar;
 
 class MainView : public QGraphicsView {
-	
+
 Q_OBJECT
-	
+
 public:
     MainView(const bool enableOpenGL, const bool outputFps, const bool imageBasedRendering = false, QWidget *parent = 0);
     ~MainView();
@@ -94,7 +94,7 @@ private slots:
 private:
     void construct();
     void resizeContent(const QSize &s);
-		
+
 private:
     Q_DISABLE_COPY(MainView)
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
index f8655bf725..540d7cf31b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp
@@ -73,14 +73,14 @@ Menu::~Menu()
 void Menu::init()
 {
     m_ButtonContainer = new QList<Button*>;
-    
+
     m_Layout->setContentsMargins(0,0,0,0);
     m_Layout->setSpacing(0);
-    
-    setMinimumWidth(150); 
-    
+
+    setMinimumWidth(150);
+
     setLayout(m_Layout);
-    
+
     connect(Theme::p(), SIGNAL(themeChanged()), this, SLOT(themeChange()));
 }
 
@@ -124,9 +124,9 @@ void Menu::menuHide()
 
 void Menu::themeChange()
 {
-    QPixmap pixmap = Theme::p()->pixmap("status_field_middle.svg", 
+    QPixmap pixmap = Theme::p()->pixmap("status_field_middle.svg",
             QSize(MinMenuItemWidth, MinMenuItemHeight));
-    
+
     for(int i = 0; i < m_ButtonContainer->count(); i++) {
         Button* button = m_ButtonContainer->at(i);
         button->setBackground(pixmap);
@@ -142,7 +142,7 @@ void Menu::keyPressEvent(QKeyEvent *event)
             Button* button = m_ButtonContainer->at(m_currentSelectedIndex);
             button->select(false);
             button->update();
-            
+
             m_currentSelectedIndex--;
             button = m_ButtonContainer->at(m_currentSelectedIndex);
             button->select(true);
@@ -162,7 +162,7 @@ void Menu::keyPressEvent(QKeyEvent *event)
             }
         }
     }
-    
+
     if(event->key() == 16777237 ) { //Down Arrow
         if (m_currentSelectedIndex < m_ButtonContainer->count()-1) { //One step down
             if(m_currentSelectedIndex >= 0) {
@@ -187,15 +187,15 @@ void Menu::keyPressEvent(QKeyEvent *event)
             }
         }
     }
-    
+
     if(event->key() == 17825792 || event->key() == 16842752 || //LSK, center key or enter
-            event->key() == 16777221 ) { 
+            event->key() == 16777221 ) {
         if(m_currentSelectedIndex >= 0) {
             Button* button = m_ButtonContainer->at(m_currentSelectedIndex);
             button->click();
         }
     }
-    
+
     if(event->key() == 17825793 ) { //RSK
         menuShowHide();
     }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
index 84a2e87100..564f6cee53 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.h
@@ -66,12 +66,12 @@ public slots:
 
 public slots:
     void menuShowHide();
-	
+
 private:
     void init();
     void menuShow();
     void menuHide();
-	
+
 private:
     Q_DISABLE_COPY(Menu)
     QGraphicsView* m_Parent;
@@ -81,4 +81,4 @@ private:
     int m_currentSelectedIndex;
 };
 
-#endif // __MENU_H__ 
+#endif // __MENU_H__
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
index 9e487846a0..d73ec2f4ba 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/recycledlistitem.cpp
@@ -57,7 +57,7 @@ RecycledListItem::RecycledListItem(QGraphicsWidget *parent)
 {
     m_item->setMinimumWidth(MinItemWidth);
     setContentsMargins(0,0,0,0);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);    
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     m_layout->addItem(m_item, 0, 0);
     setLayout(m_layout);
     m_layout->setContentsMargins(0,0,0,0);
@@ -118,7 +118,7 @@ void RecycledListItem::resizeEvent(QGraphicsSceneResizeEvent *event)
 
 void RecycledListItem::updateItemContents()
 {
-    AbstractViewItem::updateItemContents();    
+    AbstractViewItem::updateItemContents();
     if (m_model && m_index.isValid())
         setData(m_model->data(m_index,Qt::DisplayRole), Qt::DisplayRole);
 }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
index cf301e434c..e8dd6292b1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/resourcemoninterface.h
@@ -52,7 +52,7 @@ public:
     int availableMemoryInAppThreadHeap;
     qint64 availableMemoryInSystem;
     qint64 totalMemoryInSystem;
-    MemoryAllocation() : 
+    MemoryAllocation() :
         allocatedInAppThread(0),
         numberOfAllocatedCellsInAppThread(0),
         availableMemoryInAppThreadHeap(0),
@@ -60,17 +60,17 @@ public:
         totalMemoryInSystem(0)
         {}
     };
-    
+
     struct CpuUsage
     {
     qreal systemUsage;
     qreal appTreadUsage;
-    CpuUsage() : 
+    CpuUsage() :
         systemUsage(0.0),
         appTreadUsage(0.0)
         {}
     };
-    
+
 public:
     virtual ~ResourceMonitorInterface() {}
 
@@ -78,17 +78,17 @@ public:
     //for symbian, prepares the resource monitor for data capture, opens handle to ekern null
     //thread and sets initial values
     virtual bool Prepare(QString applicationThreadName) = 0;
-    
+
     //functions for CPU load and memory - Call Prepare before calling these
     virtual CpuUsage CPULoad()=0;
     virtual MemoryAllocation MemoryLoad()=0;
-    
+
     virtual void BeginMeasureMemoryLoad()=0;
     virtual MemoryAllocation EndMeasureMemoryLoad()=0;
-    
+
     virtual void BeginMeasureCPULoad()=0;
     virtual CpuUsage EndMeasureCPULoad()=0;
-    
+
 };
 
 Q_DECLARE_INTERFACE(ResourceMonitorInterface,
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
index e3c751dbca..2499c7094a 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp
@@ -52,7 +52,7 @@ class ScrollBarPrivate {
 
 public:
 
-    ScrollBarPrivate(Qt::Orientation orientation, ScrollBar *scrollBar) 
+    ScrollBarPrivate(Qt::Orientation orientation, ScrollBar *scrollBar)
         : orientation(orientation)
         , sliderPosition(0.0)
         , sliderSize(0.0)
@@ -96,15 +96,15 @@ public:
     void updateSlider()
     {
         QRectF oldSlider = slider;
-        slider = q_func()->boundingRect(); 
-        
+        slider = q_func()->boundingRect();
+
         qreal x = 0;
         qreal y = 0;
         qreal w = scrollerPixmap.width();
         qreal h = scrollerPixmap.height();
-        
+
         //Adjust the scrollBar in relation to the scroller
-        
+
         if (orientation == Qt::Horizontal) {
             qreal scrollBarHeight = scrollBarPixmap.height();
 
@@ -120,7 +120,7 @@ public:
             }
             slider.setWidth(scrollBarWidth);
         }
-        
+
         if(oldSlider != slider && (slider.size().width() > 0 &&slider.size().height() > 0 )) {
             scrollBarPixmap = Theme::p()->pixmap("scrollbar.svg", slider.size().toSize());
         }
@@ -153,7 +153,7 @@ public:
 ScrollBar::ScrollBar(Qt::Orientation orientation, QGraphicsWidget *parent)
     : QGraphicsWidget(parent)
     , d_ptr(new ScrollBarPrivate(orientation, this))
-{     
+{
     setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
     setContentsMargins(0, 0, 0, 0);
 
@@ -198,8 +198,8 @@ bool ScrollBar::sliderDown() const
     return d->sliderDown;
 }
 
-void ScrollBar::paint(QPainter *painter, 
-        const QStyleOptionGraphicsItem *option, 
+void ScrollBar::paint(QPainter *painter,
+        const QStyleOptionGraphicsItem *option,
         QWidget *widget)
 {
     Q_D(ScrollBar);
@@ -208,23 +208,23 @@ void ScrollBar::paint(QPainter *painter,
 
     d->updateSlider();
 
-    QRect sliderRect = d->slider.toRect(); 
+    QRect sliderRect = d->slider.toRect();
     painter->drawPixmap(sliderRect.topLeft(), d->scrollBarPixmap);
-    
+
     QRect cursorRect = d->cursor.toRect();
     painter->drawPixmap(cursorRect.topLeft(), d->scrollerPixmap);
 }
 
-QSizeF ScrollBar::sizeHint(Qt::SizeHint which, 
-        const QSizeF &constraint) const 
+QSizeF ScrollBar::sizeHint(Qt::SizeHint which,
+        const QSizeF &constraint) const
 {
     Q_D(const ScrollBar);
 
     QSizeF s;
 
-    if (d->orientation == Qt::Horizontal) 
+    if (d->orientation == Qt::Horizontal)
         s = QSizeF(-1, qMax(d->scrollBarPixmap.height(), d->scrollerPixmap.height()));
-    else 
+    else
         s = QSizeF(qMax(d->scrollBarPixmap.width(), d->scrollerPixmap.width()), -1);
 
     switch (which)
@@ -265,18 +265,18 @@ void ScrollBar::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(ScrollBar);
 
-    if (!d->sliderDown) 
+    if (!d->sliderDown)
         return;
 
     if (d->orientation == Qt::Horizontal) {
         qreal f = (event->pos().x() - d->pressPos.x())/(d->slider.width() - d->cursor.width());
         qreal dx = f * d->sliderSize;
-        
+
         d->setSliderPosition(d->sliderPosition + dx);
     } else {
         qreal f = (event->pos().y() - d->pressPos.y())/(d->slider.height() - d->cursor.height());
         qreal dy = f * d->sliderSize;
- 
+
         d->setSliderPosition(d->sliderPosition + dy);
     }
 
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
index 82e95046b7..9cb15b16c1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.h
@@ -77,11 +77,11 @@ public slots:
 
 private:
 
-    void paint(QPainter *painter, 
-        const QStyleOptionGraphicsItem *option, 
+    void paint(QPainter *painter,
+        const QStyleOptionGraphicsItem *option,
         QWidget *widget);
 
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
         const QSizeF &constraint = QSizeF()) const;
 
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
index 6fab34ca93..a30e03188f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scroller.cpp
@@ -78,7 +78,7 @@ void ScrollerPrivate::stopScrolling()
         m_scrollTimer.stop();
 }
 
-//Maps screen coordinates to scrollArea coordinates though current m_eventViewport widget 
+//Maps screen coordinates to scrollArea coordinates though current m_eventViewport widget
 QPointF ScrollerPrivate::mapToScrollArea(const QPoint &point)
 {
     if (!m_scrollArea || !m_eventViewport)
@@ -106,7 +106,7 @@ bool ScrollerPrivate::eventFilter(QObject *obj, QEvent *event)
             && event->type() != QEvent::GraphicsSceneKeyReleased*/))
         return false;
 
-    QGraphicsSceneMouseEvent* mouseEvent = 
+    QGraphicsSceneMouseEvent* mouseEvent =
         static_cast<QGraphicsSceneMouseEvent*>(event);
 
     m_eventViewport = mouseEvent->widget();
@@ -130,7 +130,7 @@ bool ScrollerPrivate::eventFilter(QObject *obj, QEvent *event)
             m_cursorPos = QCursor::pos();
             m_state = ManualScrolling;
 
-            if (!m_scrollTimer.isActive()) 
+            if (!m_scrollTimer.isActive())
                 m_scrollTimer.start(UpdateScrollingInterval);
             else {
                 m_scrollTimer.stop();
@@ -154,7 +154,7 @@ bool ScrollerPrivate::eventFilter(QObject *obj, QEvent *event)
             ScrollBar *hscroll = m_scrollArea->horizontalScrollBar();
             ScrollBar *vscroll = m_scrollArea->verticalScrollBar();
 
-            QPointF d = m_scrollFactor * (mapToScrollArea(QCursor::pos()) - mapToScrollArea(m_cursorPos)); 
+            QPointF d = m_scrollFactor * (mapToScrollArea(QCursor::pos()) - mapToScrollArea(m_cursorPos));
 
             hscroll->setSliderPosition(hscroll->sliderPosition() - d.x());
             vscroll->setSliderPosition(vscroll->sliderPosition() - d.y());
@@ -249,7 +249,7 @@ void ScrollerPrivate::updateScrolling()
 
             hscroll->setSliderPosition(hscroll->sliderPosition() - m_scrollFactor * d.x());
             vscroll->setSliderPosition(vscroll->sliderPosition() - m_scrollFactor * d.y());
-        } else { 
+        } else {
             m_state = Stopped;
             scrollOngoing = false;
         }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
index d84303fd8b..69e300517d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/settings.h
@@ -76,7 +76,7 @@ public:
 
     int resultFormat() const
         { return m_resultFormat; }
-    void setResultFormat(int resultFormat) 
+    void setResultFormat(int resultFormat)
         { m_resultFormat = resultFormat; }
 
     const QSize& size() const
@@ -86,7 +86,7 @@ public:
 
     int angle() const
         { return m_angle; }
-    void setAngle(int angle) 
+    void setAngle(int angle)
         { m_angle = angle; }
 
     const Options& options() const
@@ -106,9 +106,9 @@ private:
     QString m_outputFileName;
     int m_resultFormat;
     QSize m_size;
-    int m_angle;    
+    int m_angle;
     int m_listItemCount;
-    Options m_options;    
+    Options m_options;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Settings::Options)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
index 4d30286070..cc5df42a66 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp
@@ -60,8 +60,8 @@ SimpleList::SimpleList(QGraphicsWidget *parent)
 }
 
 /*virtual*/
-SimpleList::~SimpleList() 
-{  
+SimpleList::~SimpleList()
+{
 }
 
 void SimpleList::addItem(ListItem *item)
@@ -116,7 +116,7 @@ void SimpleList::keyPressEvent(QKeyEvent *event)
     static qreal step = 0.0;
     static bool repeat = false;
     int interval = keyPressInterval.elapsed();
-    
+
     ScrollBar* sb = verticalScrollBar();
     qreal currentValue = sb->sliderPosition();
 
@@ -132,11 +132,11 @@ void SimpleList::keyPressEvent(QKeyEvent *event)
             step = itemAt(0)->size().height();
         repeat = false;
     }
-    
+
     if(event->key() == Qt::Key_Up ) { //Up Arrow
         sb->setSliderPosition(currentValue - step);
     }
-    
+
     if(event->key() == Qt::Key_Down ) { //Down Arrow
         sb->setSliderPosition(currentValue + step);
     }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
index 7bfda5173f..c59bd378e1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp
@@ -55,7 +55,7 @@ class SimpleListViewPrivate
 
 public:
 
-    SimpleListViewPrivate(SimpleListView *button) 
+    SimpleListViewPrivate(SimpleListView *button)
         : m_content(0)
         , m_layout(0)
         , m_twoColumns(false)
@@ -100,7 +100,7 @@ public:
 
         m_content->resize(q->viewport()->size().width(),
                         m_layout->preferredHeight());
-        const bool clip = 
+        const bool clip =
             m_content->size().width() > q->viewport()->size().width()
                 || m_content->size().height() > q->viewport()->size().height();
 
@@ -161,7 +161,7 @@ public:
 
         const QString defaultIcon = Theme::p()->pixmapPath()+"contact_default_icon.svg";
         const int itemCount = m_layout->count();
-    
+
         for (int i=0; i<itemCount; ++i) {
             ListItem* item = static_cast<ListItem*>(m_layout->itemAt(i));
 
@@ -251,7 +251,7 @@ public:
                 QGraphicsLayoutItem *item = m_layout->itemAt(i);
                 m_layout->removeAt(i);
                 moveditems.append(item);
-            }            
+            }
             for ( int i = 0; i < moveditems.count(); ++i)
                 m_layout->addItem(moveditems.at(i), i, 1);
 
@@ -267,7 +267,7 @@ public:
                     moveditems.append(m_layout->itemAt(i));
                 else
                     moveditems.insert(moveditems.begin(), m_layout->itemAt(i));
-                m_layout->removeAt(i);                
+                m_layout->removeAt(i);
             }
             for (int i = 0; i<moveditems.count(); ++i) {
                 m_layout->addItem(moveditems.at(i), m_layout->count(), 0);
@@ -292,17 +292,17 @@ public:
     bool m_listItemCaching;
 };
 
-SimpleListView::SimpleListView(QGraphicsWidget *parent) 
+SimpleListView::SimpleListView(QGraphicsWidget *parent)
     : AbstractScrollArea(parent)
     , d_ptr(new SimpleListViewPrivate(this))
-{ 
+{
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setContentsMargins(0, 0, 0, 0);
     verticalScrollBar()->hide();
     horizontalScrollBar()->hide();
 }
 
-SimpleListView::~SimpleListView() 
+SimpleListView::~SimpleListView()
 {
     Q_D(SimpleListView);
 
@@ -403,7 +403,7 @@ bool SimpleListView::listItemCaching() const
 void SimpleListView::setListItemCaching(bool enabled)
 {
     Q_D(SimpleListView);
-    
+
     if (d->m_listItemCaching == enabled)
         return;
 
@@ -430,13 +430,13 @@ void SimpleListView::scrollContentsBy(qreal dx, qreal dy)
 
     if (newy < miny)
         newy = miny;
-    else if (newy > 0) 
+    else if (newy > 0)
         newy = 0.0;
 
     d->m_content->setPos(contentPos.x(), newy);
 }
 
-void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event) 
+void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event)
 {
     Q_D(SimpleListView);
 
@@ -446,7 +446,7 @@ void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event)
 }
 
 QSizeF SimpleListView::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
-{ 
+{
     Q_D(const SimpleListView);
 
     if (which == Qt::PreferredSize)
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
index 57ec90e717..fcc6805a2f 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h
@@ -79,7 +79,7 @@ protected:
 
     virtual void scrollContentsBy(qreal dx, qreal dy);
     void resizeEvent(QGraphicsSceneResizeEvent *event);
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
                     const QSizeF & constraint) const;
 
 private:
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
index 136c7ed5ff..4983c574e1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.cpp
@@ -44,10 +44,10 @@
 ThemeEvent::ThemeEvent( const QString &newTheme, Type type) : QEvent(type),
     m_theme(newTheme)
 {
-    
+
 }
 
 ThemeEvent::~ThemeEvent()
 {
-    
+
 }
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
index eb94123b54..e48fb5f273 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/themeevent.h
@@ -55,7 +55,7 @@ public:
 
 public:
     inline QString getTheme() { return m_theme; }
-    
+
 private:
     QString m_theme;
 };
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
index a7a4ad3a3f..9ff6d6d2f1 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.cpp
@@ -55,7 +55,7 @@ TopBar::TopBar(QGraphicsView* mainView, QGraphicsWidget* parent) :
     m_orientation(TopBar::None), m_topBarPixmap(), m_sizesBlue(), m_sizesLime()
 {
     setDefaultSizes();
-    
+
     m_titleFont = Theme::p()->font(Theme::TitleBar);
     m_statusFont = Theme::p()->font(Theme::StatusBar);
 
@@ -71,7 +71,7 @@ void TopBar::resizeEvent(QGraphicsSceneResizeEvent* /*event*/)
     //Check orientation
     QString topbarName;
     QSize mainViewSize = m_mainView->size();
-    int rotationAngle = static_cast<MainView*>(m_mainView)->rotationAngle(); 
+    int rotationAngle = static_cast<MainView*>(m_mainView)->rotationAngle();
     if(rotationAngle == 90 || rotationAngle == 270 ) {
        int wd = mainViewSize.width();
        int ht = mainViewSize.height();
@@ -91,49 +91,49 @@ void TopBar::resizeEvent(QGraphicsSceneResizeEvent* /*event*/)
         m_orientation = TopBar::Landscape;
         topbarName = "topbar_horisontal.svg";
     }
-    
+
     //Calculate new size, resize by height, don't make it wider than the screen
-    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ? 
+    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ?
         m_sizesBlue : m_sizesLime;
-    
+
     //Get current size for topbarpixmap
-    QSize currentSize = !m_topBarPixmap.isNull() && !m_orientationChanged ? 
+    QSize currentSize = !m_topBarPixmap.isNull() && !m_orientationChanged ?
             m_topBarPixmap.size() : sizes[topbarName];
     QSize newSize = !m_orientationChanged ? QSize(currentSize) : sizes[topbarName];
-    
+
     //Scale according to aspect ratio
     newSize.scale(size().toSize(), Qt::KeepAspectRatio);
-    
+
     //fix width to window widht if previous scaling produced too narrow image
     if(newSize.width() < size().width()) {
         newSize.scale(size().toSize(), Qt::KeepAspectRatioByExpanding);
     }
-    
+
     //Calculate scaling factor for rest of the graphics scaling
     qreal scaleFactor = (newSize.width() *1.0) / (currentSize.width() * 1.0);
-    
+
     //Scale graphics, if the scalefactor applies
     //This is really heavy since the SVG graphics are read again from the resource
     if(scaleFactor != 1 || m_topBarPixmap.isNull() )  {
         m_topBarPixmap = Theme::p()->pixmap(topbarName, newSize );
-        m_topBarUserIcon = Theme::p()->pixmap("user_default_icon.svg", 
+        m_topBarUserIcon = Theme::p()->pixmap("user_default_icon.svg",
                 !m_topBarUserIcon.isNull() && !m_orientationChanged ? m_topBarUserIcon.size()* scaleFactor : sizes["user_default_icon.svg"] * scaleFactor);
-        
-        m_topBarUserStatus = Theme::p()->pixmap("user_status_online.svg", 
+
+        m_topBarUserStatus = Theme::p()->pixmap("user_status_online.svg",
                 !m_topBarUserStatus.isNull() && !m_orientationChanged ? m_topBarUserStatus.size() * scaleFactor : sizes["user_status_online.svg"] * scaleFactor);
-        
-        m_topBarStatusBarLeft = Theme::p()->pixmap("status_field_left.svg", 
+
+        m_topBarStatusBarLeft = Theme::p()->pixmap("status_field_left.svg",
                 !m_topBarStatusBarLeft.isNull() && !m_orientationChanged ? m_topBarStatusBarLeft.size()* scaleFactor : sizes["status_field_left.svg"] * scaleFactor);
-        
+
         m_topBarStatusBarRight = Theme::p()->pixmap("status_field_right.svg",
                 !m_topBarStatusBarRight.isNull() && !m_orientationChanged ? m_topBarStatusBarRight.size()* scaleFactor : sizes["status_field_right.svg"] * scaleFactor);
-        
+
         m_topBarStatusBarMiddle = Theme::p()->pixmap("status_field_middle.svg",
                 !m_topBarStatusBarMiddle.isNull() && !m_orientationChanged ? m_topBarStatusBarMiddle.size() * scaleFactor : QSize(185, sizes["status_field_middle.svg"].height()) * scaleFactor);
-    
+
         //Update the sizeHint to match the size of the scaled m_topBarPixmap
         updateGeometry();
-        
+
         //Point Update - Positions relative to the Top Bar "Backgroud" size.
         //TODO: consider some layout instead of calculating relative locations
         QSize topBarPixmapSize = m_topBarPixmap.size();
@@ -141,40 +141,40 @@ void TopBar::resizeEvent(QGraphicsSceneResizeEvent* /*event*/)
         QSize topBarUserStatusSize = m_topBarUserStatus.size();
         QSize topBarStatusBarLeftSize = m_topBarStatusBarLeft.size();
         QSize topBarStatusBarMiddleSize = m_topBarStatusBarMiddle.size();
-        
+
         //Location for Title text 5% width, 35% height of the background pixmap
-        m_topBarTitlePoint = QPoint(topBarPixmapSize.width()* 0.05, 
+        m_topBarTitlePoint = QPoint(topBarPixmapSize.width()* 0.05,
                 topBarPixmapSize.height() * 0.35);
-        
+
         //User Icon location
         //Placing 70% of the width and 10% of the height of the top bar background
         m_topBarUserIconPoint = QPoint((topBarPixmapSize.width() * 0.7), (topBarPixmapSize.height() * 0.1));
-        
+
         //If Blue theme is in use - position user status icon on the right side of the user icon
         if(!m_isLimeTheme) {
             //Place the status icon on top of the right edge of the user icon, lower it by 35% of the height of the user icon
-            m_topBarUserStatusPoint = QPoint( ( (m_topBarUserIconPoint.x()+topBarUserIconSize.width() ) - 
-                    ( topBarUserStatusSize.width()/2 )), 
+            m_topBarUserStatusPoint = QPoint( ( (m_topBarUserIconPoint.x()+topBarUserIconSize.width() ) -
+                    ( topBarUserStatusSize.width()/2 )),
                 (m_topBarUserIconPoint.y() + (topBarUserIconSize.height() * 0.35 )));
         }
         //If Lime theme is in use - position user status icon on the left side of the user icon
         else {
             //Place the status icon on top of the left side of the user icon, lower it by 50% of the height of the user icon
             //and move left by 5% of the icon
-            m_topBarUserStatusPoint = QPoint(  m_topBarUserIconPoint.x() + ( topBarUserIconSize.width() * 0.05), 
+            m_topBarUserStatusPoint = QPoint(  m_topBarUserIconPoint.x() + ( topBarUserIconSize.width() * 0.05),
                         (m_topBarUserIconPoint.y() + (topBarUserIconSize.height() * 0.5 )));
         }
-        
+
         //Status bar
         //Placing the left side of the status bar  5% of the width, 50% of the height of the top bar background
         //Set the text baseline 80% of the height of the status bar
-        m_topBarStatusBarLeftPoint = QPoint( (topBarPixmapSize.width()* 0.05), 
+        m_topBarStatusBarLeftPoint = QPoint( (topBarPixmapSize.width()* 0.05),
                                                         (topBarPixmapSize.height() * 0.5));
-        m_topBarStatusBarMiddlePoint = QPoint( (m_topBarStatusBarLeftPoint.x() + topBarStatusBarLeftSize.width()), 
+        m_topBarStatusBarMiddlePoint = QPoint( (m_topBarStatusBarLeftPoint.x() + topBarStatusBarLeftSize.width()),
                                                             (m_topBarStatusBarLeftPoint.y()));
-        m_topBarStatusBarRightPoint = QPoint( (m_topBarStatusBarMiddlePoint.x() + topBarStatusBarMiddleSize.width()), 
+        m_topBarStatusBarRightPoint = QPoint( (m_topBarStatusBarMiddlePoint.x() + topBarStatusBarMiddleSize.width()),
                                                         (m_topBarStatusBarMiddlePoint.y() ) );
-        m_topBarStatusBarTextPoint = QPoint(m_topBarStatusBarMiddlePoint.x(), 
+        m_topBarStatusBarTextPoint = QPoint(m_topBarStatusBarMiddlePoint.x(),
                                                         m_topBarStatusBarMiddlePoint.y() + (topBarStatusBarMiddleSize.height()*0.8) );
     } //if scalefactor
 }
@@ -183,18 +183,18 @@ void TopBar::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, Q
 {
     //Topbar background
     painter->drawPixmap(option->exposedRect, m_topBarPixmap, option->exposedRect);
-    
+
     //User Icon
     painter->drawPixmap(m_topBarUserIconPoint, m_topBarUserIcon);
-    
+
     //User Status
     painter->drawPixmap(m_topBarUserStatusPoint, m_topBarUserStatus);
-    
+
     //Status bar
     painter->drawPixmap(m_topBarStatusBarLeftPoint, m_topBarStatusBarLeft);
     painter->drawPixmap(m_topBarStatusBarMiddlePoint, m_topBarStatusBarMiddle);
     painter->drawPixmap(m_topBarStatusBarRightPoint, m_topBarStatusBarRight);
-    
+
     //Title text
     painter->save();
     painter->setFont(m_titleFont);
@@ -210,14 +210,14 @@ void TopBar::paint( QPainter *painter, const QStyleOptionGraphicsItem *option, Q
 
 QRectF TopBar::boundingRect() const
 {
-    //It's possible that m_topBarPixmap is not allocated yet, 
+    //It's possible that m_topBarPixmap is not allocated yet,
     //in this case default size is used for setting boundingRect
-    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ? 
-        m_sizesBlue : m_sizesLime; 
-    
-    if(!m_topBarPixmap.isNull()) 
+    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ?
+        m_sizesBlue : m_sizesLime;
+
+    if (!m_topBarPixmap.isNull())
         return QRectF(0, 0, m_topBarPixmap.size().width(), m_topBarPixmap.size().height());
-    else 
+    else
         return QRectF(0, 0, sizes["topbar.svg"].width(), sizes["topbar.svg"].height());
 }
 
@@ -227,95 +227,95 @@ void TopBar::themeChange()
     m_statusFont = Theme::p()->font(Theme::StatusBar);
 
     //Calculate the scaling factor
-    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ? 
+    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ?
         m_sizesBlue : m_sizesLime;
-    
-    QString topbarString= m_orientation == TopBar::Portrait ? 
+
+    QString topbarString= m_orientation == TopBar::Portrait ?
             "topbar.svg" : "topbar_horisontal.svg";
-    
+
     QSize topBarSize = sizes[topbarString];
     QSize newSize = QSize(topBarSize);
-    
+
     //Scale according to aspect ratio
     newSize.scale(size().toSize(), Qt::KeepAspectRatio);
-    
+
     //fix width to window widht if previous scaling produced too narrow image
     if(newSize.width() < size().width()) {
         newSize.scale(size().toSize(), Qt::KeepAspectRatioByExpanding);
     }
-    
+
     //Calculate scaling factor for rest of the graphics scaling
     qreal scaleFactor = (newSize.width() *1.0) / (topBarSize.width() * 1.0);
 
     //Background
     m_topBarPixmap = Theme::p()->pixmap(topbarString, sizes[topbarString] * scaleFactor);
-    
+
     //User Icon
     m_topBarUserIcon = Theme::p()->pixmap("user_default_icon.svg", sizes["user_default_icon.svg"] * scaleFactor);
-    
+
     //User Status
-    m_topBarUserStatus = Theme::p()->pixmap("user_status_online.svg", sizes["user_status_online.svg"] * scaleFactor); 
-    
-    //Status Bar 
+    m_topBarUserStatus = Theme::p()->pixmap("user_status_online.svg", sizes["user_status_online.svg"] * scaleFactor);
+
+    //Status Bar
     m_topBarStatusBarLeft = Theme::p()->pixmap("status_field_left.svg", sizes["status_field_left.svg"] * scaleFactor);
     m_topBarStatusBarRight = Theme::p()->pixmap("status_field_right.svg", sizes["status_field_right.svg"] * scaleFactor);
-    m_topBarStatusBarMiddle = Theme::p()->pixmap("status_field_middle.svg", 
+    m_topBarStatusBarMiddle = Theme::p()->pixmap("status_field_middle.svg",
             QSize(185, sizes["status_field_middle.svg"].height())* scaleFactor);
-     
+
     //Update Drawing points for Top Bar elements, points are relative to the top bar background size
     QSize topBarPixmapSize = m_topBarPixmap.size();
     QSize topBarUserIconSize = m_topBarUserIcon.size();
     QSize topBarUserStatusSize = m_topBarUserStatus.size();
     QSize topBarStatusBarLeftSize = m_topBarStatusBarLeft.size();
-    QSize topBarStatusBarMiddleSize = m_topBarStatusBarMiddle.size(); 
-    
+    QSize topBarStatusBarMiddleSize = m_topBarStatusBarMiddle.size();
+
     //Theme Check
     (Theme::p()->theme() == Theme::Lime) ? m_isLimeTheme = true : m_isLimeTheme = false;
-    
+
     //User Icon location
     //Placing 70% of the width and 10% of the height of the top bar background
     m_topBarUserIconPoint = QPoint((0.7*topBarPixmapSize.width()), (0.1*topBarPixmapSize.height()));
-    
+
     //If Blue theme is in use - position user status icon on the right side of the user icon
     if(!m_isLimeTheme) {
         //Place the status icon on top of the right edge of the user icon, lower it by 35% of the height of the user icon
-        m_topBarUserStatusPoint = QPoint( ( (m_topBarUserIconPoint.x()+topBarUserIconSize.width() ) - ( topBarUserStatusSize.width()/2 )), 
+        m_topBarUserStatusPoint = QPoint( ( (m_topBarUserIconPoint.x()+topBarUserIconSize.width() ) - ( topBarUserStatusSize.width()/2 )),
             (m_topBarUserIconPoint.y() + (topBarUserIconSize.height() * 0.35 )));
     }
     //If Lime theme is in use - position user status icon on the left side of the user icon
     else {
         //Place the status icon on top of the left side of the user icon, lower it by 50% of the height of the user icon
         //and move left by 5% of the icon
-        m_topBarUserStatusPoint = QPoint(  m_topBarUserIconPoint.x() + ( topBarUserIconSize.width() * 0.05), 
+        m_topBarUserStatusPoint = QPoint(  m_topBarUserIconPoint.x() + ( topBarUserIconSize.width() * 0.05),
                     (m_topBarUserIconPoint.y() + (topBarUserIconSize.height() * 0.5 )));
     }
-    
+
     //Status bar
     //Placing the left side of the status bar  5% of the width, 50% of the height of the top bar background
     //Set the text baseline 80% of the height of the status bar
-    m_topBarStatusBarLeftPoint = QPoint( (topBarPixmapSize.width()* 0.05), 
+    m_topBarStatusBarLeftPoint = QPoint( (topBarPixmapSize.width()* 0.05),
                                                     (topBarPixmapSize.height() * 0.5));
-    m_topBarStatusBarMiddlePoint = QPoint( (m_topBarStatusBarLeftPoint.x() + topBarStatusBarLeftSize.width()), 
+    m_topBarStatusBarMiddlePoint = QPoint( (m_topBarStatusBarLeftPoint.x() + topBarStatusBarLeftSize.width()),
                                                         (m_topBarStatusBarLeftPoint.y()));
-    m_topBarStatusBarRightPoint = QPoint( (m_topBarStatusBarMiddlePoint.x() + topBarStatusBarMiddleSize.width()), 
+    m_topBarStatusBarRightPoint = QPoint( (m_topBarStatusBarMiddlePoint.x() + topBarStatusBarMiddleSize.width()),
                                                     (m_topBarStatusBarMiddlePoint.y() ) );
-    m_topBarStatusBarTextPoint = QPoint(m_topBarStatusBarMiddlePoint.x(), 
+    m_topBarStatusBarTextPoint = QPoint(m_topBarStatusBarMiddlePoint.x(),
                                                     m_topBarStatusBarMiddlePoint.y() + (topBarStatusBarMiddleSize.height()*0.8) );
-    
+
     update();
 }
 
-QSizeF TopBar::sizeHint(Qt::SizeHint which, 
-        const QSizeF &constraint) const 
+QSizeF TopBar::sizeHint(Qt::SizeHint which,
+        const QSizeF &constraint) const
 {
-    //It's possible that m_topBarPixmap is not allocated yet, 
+    //It's possible that m_topBarPixmap is not allocated yet,
     //in this case default size is used for setting size hint
-    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ? 
-        m_sizesBlue : m_sizesLime; 
-   
-    int height = !m_topBarPixmap.isNull() ? 
-            m_topBarPixmap.height() : sizes["topbar.svg"].height(); 
-    
+    QHash<QString, QSize>sizes = (Theme::p()->theme() == Theme::Blue) ?
+        m_sizesBlue : m_sizesLime;
+
+    int height = !m_topBarPixmap.isNull() ?
+            m_topBarPixmap.height() : sizes["topbar.svg"].height();
+
     switch (which)
     {
     case Qt::MinimumSize:
@@ -330,7 +330,7 @@ QSizeF TopBar::sizeHint(Qt::SizeHint which,
 }
 
 void TopBar::setDefaultSizes()
-{    
+{
     m_sizesBlue["topbar.svg"] = QSize(356,96);
     m_sizesBlue["topbar_horisontal.svg"] = QSize(636,96);
     m_sizesBlue["user_default_icon.svg"] = QSize(68,68);
@@ -338,7 +338,7 @@ void TopBar::setDefaultSizes()
     m_sizesBlue["status_field_left.svg"] = QSize(14,24);
     m_sizesBlue["status_field_right.svg"] = QSize(10,24);
     m_sizesBlue["status_field_middle.svg"] = QSize(14,24);
-    
+
     m_sizesLime["topbar.svg"] = QSize(356,96);
     m_sizesLime["topbar_horisontal.svg"] = QSize(636,96);
     m_sizesLime["user_default_icon.svg"] = QSize(84,68);
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
index dabffa9d06..808064d04d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/topbar.h
@@ -55,7 +55,7 @@ class QFont;
 class TopBar : public GvbWidget
 {
     Q_OBJECT
-    
+
 public:
     enum Orientation
     {
@@ -63,33 +63,34 @@ public:
         Landscape,
         None
     };
-    
+
 public:
     TopBar(QGraphicsView* mainView, QGraphicsWidget* parent);
     ~TopBar();
-    
+
 public:
     void paint( QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0 );
     QRectF boundingRect() const;
     void resizeEvent(QGraphicsSceneResizeEvent *event);
-    inline QPoint getStatusBarLocation() { return m_topBarStatusBarMiddlePoint + 
-        m_topBarStatusBarMiddle.rect().bottomLeft(); }
-    
+    inline QPoint getStatusBarLocation()
+    {
+        return m_topBarStatusBarMiddlePoint + m_topBarStatusBarMiddle.rect().bottomLeft();
+    }
+
 public slots:
     void themeChange();
-    
+
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    
+
 signals:
     void clicked(bool checked = false);
-    
+
 private:
-    QSizeF sizeHint(Qt::SizeHint which, 
+    QSizeF sizeHint(Qt::SizeHint which,
         const QSizeF &constraint = QSizeF()) const;
     void setDefaultSizes();
-    
-    
+
 private:
     Q_DISABLE_COPY(TopBar)
 
@@ -100,7 +101,7 @@ private:
     //Fonts
     QFont m_titleFont;
     QFont m_statusFont;
-    
+
     //Pixmaps
     QPixmap m_topBarPixmap;
     QPixmap m_topBarUserIcon;
@@ -108,7 +109,7 @@ private:
     QPixmap m_topBarStatusBarLeft;
     QPixmap m_topBarStatusBarRight;
     QPixmap m_topBarStatusBarMiddle;
-    
+
     //Drawing points
     QPoint m_topBarUserIconPoint;
     QPoint m_topBarUserStatusPoint;
@@ -117,7 +118,7 @@ private:
     QPoint m_topBarStatusBarMiddlePoint;
     QPoint m_topBarStatusBarTextPoint;
     QPoint m_topBarTitlePoint;
-    
+
     //Sizes
     QHash<QString, QSize> m_sizesBlue;
     QHash<QString, QSize> m_sizesLime;
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
index 0883580d70..4fee19230d 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp
@@ -46,7 +46,7 @@
 static const int MotionEndWaitTime = 2000;
 static const int TileSideLength = 128;
 
-WebViewPrivate::WebViewPrivate(WebView *w) 
+WebViewPrivate::WebViewPrivate(WebView *w)
     : q(w)
     , cache(0)
 {
@@ -56,14 +56,14 @@ WebViewPrivate::WebViewPrivate(WebView *w)
 
     web->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     web->page()->mainFrame()->setScrollBarPolicy(
-        Qt::Horizontal, Qt::ScrollBarAlwaysOff); 	
+        Qt::Horizontal, Qt::ScrollBarAlwaysOff);
     web->page()->mainFrame()->setScrollBarPolicy(
         Qt::Vertical, Qt::ScrollBarAlwaysOff);
     web->setZValue(3);
 
 //    cache = new WebViewCache(web);
 //    web->setGraphicsEffect(cache);
- 
+
     adjustSize();
 }
 
@@ -85,9 +85,8 @@ void WebViewPrivate::adjustSize()
             q->horizontalScrollBar()->setSliderSize(w);
         else
             q->horizontalScrollBar()->setSliderSize(0.0);
-        
 
-        if (h > q->viewport()->boundingRect().height()) 
+        if (h > q->viewport()->boundingRect().height())
             q->verticalScrollBar()->setSliderSize(h);
         else
             q->verticalScrollBar()->setSliderSize(0.0);
@@ -116,7 +115,7 @@ void WebViewPrivate::_q_loadFinished(bool ok)
 void WebViewPrivate::_q_viewportChanged(QGraphicsWidget* viewport)
 {
     web->setParentItem(viewport);
-    viewport->setFlag(QGraphicsItem::ItemClipsChildrenToShape, 
+    viewport->setFlag(QGraphicsItem::ItemClipsChildrenToShape,
                       true);
     adjustSize();
 }
@@ -131,7 +130,6 @@ void WebViewPrivate::_q_motionEnded()
 WebViewCache::WebViewCache(QGraphicsWebView *webView)
     : m_webView(webView)
 {
-   
 }
 
 WebViewCache::~WebViewCache()
@@ -178,8 +176,8 @@ void WebViewCache::draw(QPainter * painter, QGraphicsEffectSource * source)
             for (int j = 0; j < tilesY; j++) {
                 int x = i * TileSideLength;
                 int y = j * TileSideLength;
-                
-                m_tileRects[i + j * tilesX] 
+
+                m_tileRects[i + j * tilesX]
                     = QRectF(x, y, TileSideLength, TileSideLength);
             }
         }
@@ -205,13 +203,13 @@ void WebViewCache::draw(QPainter * painter, QGraphicsEffectSource * source)
 
             QWebFrame *webFrame = m_webView->page()->mainFrame();
 
-            QPainter tilePainter(&tilePixmap); 
+            QPainter tilePainter(&tilePixmap);
             tilePainter.translate(-m_tileRects[i].left(), -m_tileRects[i].top());
             webFrame->render(&tilePainter, m_tileRects[i].toRect());
             tilePainter.end();
 
             m_tilePixmaps[i] = QPixmapCache::insert(tilePixmap);
-        } 
+        }
 
         tileRect = tileRect.translated(-itemPos);
 
@@ -233,7 +231,7 @@ WebView::WebView(QGraphicsWidget *parent)
             this, SLOT(_q_loadFinished(bool)));
     connect(this, SIGNAL(viewportChanged(QGraphicsWidget*)),
             this, SLOT(_q_viewportChanged(QGraphicsWidget*)));
-    connect(&d->motionTimer, SIGNAL(timeout()), 
+    connect(&d->motionTimer, SIGNAL(timeout()),
             this, SLOT(_q_motionEnded()));
 }
 
@@ -272,21 +270,21 @@ void WebView::scrollContentsBy(qreal dx, qreal dy)
 
     if (x < minx)
         x = minx;
-    else if (x > 0) 
+    else if (x > 0)
         x = 0.0;
 
    qreal y = d->web->pos().y() - dy;
 
     if (y < miny)
         y = miny;
-    else if (y > 0) 
+    else if (y > 0)
         y = 0.0;
 
     d->web->setPos(x, y);
 }
 
 QSizeF WebView::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
-{ 
+{
     if (which == Qt::PreferredSize) {
         QSizeF contentSize = d->web->page()->mainFrame()->contentsSize();
         return contentSize;
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
index ded7df7f60..a1391cc125 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview_p.h
@@ -71,7 +71,7 @@ public:
     QTimer motionTimer;
 };
 
-class WebViewCache : public QGraphicsEffect 
+class WebViewCache : public QGraphicsEffect
 {
     Q_OBJECT
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
index 7394a9410e..e8b6388941 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
     app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
 
     MainWindow window;
-    window.show();   
+    window.show();
 
     return app.exec();
 }
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
index ed3d74919d..74c1fedfac 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/mainwindow.h
@@ -55,7 +55,7 @@ class MainWindow : public QWidget
     Q_OBJECT
 public:
     MainWindow(QWidget *parent = 0);
-    
+
 private:
     void setupMatrix();
     void populateScene();
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
index 3fac23ede0..db2f219222 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.h
@@ -71,7 +71,7 @@ private slots:
     void rotateRight();
 
     void timerEvent(QTimerEvent *);
-    
+
 private:
     QGraphicsView *graphicsView;
     QLabel *label;
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
index 711eb833f6..4e5b436f8d 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -62,7 +62,7 @@ public:
 	Translate
     };
     ChipTester(QWidget *parent = 0);
-    
+
     void setAntialias(bool enabled);
     void setOpenGL(bool enabled);
     void runBenchmark();
@@ -75,7 +75,7 @@ protected:
 private:
     void populateScene();
 
-    QGraphicsView *view;    
+    QGraphicsView *view;
     QGraphicsScene *scene;
     int npaints;
     int timerId;
diff --git a/tests/benchmarks/gui/image/blendbench/main.cpp b/tests/benchmarks/gui/image/blendbench/main.cpp
index 1d8aa60394..3e912e83b3 100644
--- a/tests/benchmarks/gui/image/blendbench/main.cpp
+++ b/tests/benchmarks/gui/image/blendbench/main.cpp
@@ -100,7 +100,7 @@ QLatin1String brushTypes[] = {
 class BlendBench : public QObject
 {
     Q_OBJECT
-private slots:		
+private slots:
     void blendBench_data();
     void blendBench();
 
diff --git a/tests/benchmarks/gui/image/qimagereader/images/black.xpm b/tests/benchmarks/gui/image/qimagereader/images/black.xpm
index d7925bf211..4a1f4ec861 100644
--- a/tests/benchmarks/gui/image/qimagereader/images/black.xpm
+++ b/tests/benchmarks/gui/image/qimagereader/images/black.xpm
@@ -15,21 +15,21 @@ static char * ddd_xpm[] = {
 "+ c white     m white g white  g4 white  s Light      ",
 "*      c DarkGreen m black g grey25 g4 grey25 s Eye        ",
 /* Pixels */
-"                .            .                  ",    
-"                .           ..                  ",    
-"                 .          .                   ",    
-"                 ..        .                    ",    
-"   ..             ..      ..                    ",    
-"     ..            .     .               .      ",    
-"       .            . . .              ..       ",    
-"        .            .X.              .         ",    
-"         .          *.X.*           ..          ",    
-"         ..     ..  .XXX.  ..     ...           ",    
-"          .     .X...XXX...X.     .             ",    
-"          ..   ..XXX.XXX.XXX.   ..              ",    
-"            .....XXXX...XXXX.   .               ",    
-"             .. ..XXXXXXXXX.. ..                ",    
-"                ...XXXXXXX.....                 ",    
+"                .            .                  ",
+"                .           ..                  ",
+"                 .          .                   ",
+"                 ..        .                    ",
+"   ..             ..      ..                    ",
+"     ..            .     .               .      ",
+"       .            . . .              ..       ",
+"        .            .X.              .         ",
+"         .          *.X.*           ..          ",
+"         ..     ..  .XXX.  ..     ...           ",
+"          .     .X...XXX...X.     .             ",
+"          ..   ..XXX.XXX.XXX.   ..              ",
+"            .....XXXX...XXXX.   .               ",
+"             .. ..XXXXXXXXX.. ..                ",
+"                ...XXXXXXX.....                 ",
 "                  .........                     ",
 "                  .XXXXXXX.                     ",
 "                .....XXX.....                   ",
diff --git a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
index 07ee8b7804..c32ff0d099 100644
--- a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
@@ -174,7 +174,7 @@ void tst_QTableView::spanInit_helper(QTableView *view)
     for (int i=0; i < 40; i++) {
         view->setSpan(1+i%2, 1+4*i, 1+i%3, 2);
     }
-    
+
     for (int i=1; i < 40; i++) {
         view->setSpan(6 + i*7, 4, 4, 50);
     }
@@ -185,7 +185,7 @@ void tst_QTableView::spanInit()
     QtTestTableModel model(500, 500);
     QTableView v;
     v.setModel(&model);
-    
+
     QBENCHMARK {
         spanInit_helper(&v);
     }
@@ -196,7 +196,7 @@ void tst_QTableView::spanDraw()
     QtTestTableModel model(500, 500);
     QTableView v;
     v.setModel(&model);
-    
+
     spanInit_helper(&v);
     v.show();
     v.resize(500,500);
@@ -214,11 +214,11 @@ void tst_QTableView::spanSelectAll()
     QtTestTableModel model(500, 500);
     QTableView v;
     v.setModel(&model);
-    
+
     spanInit_helper(&v);
     v.show();
     QTest::qWait(30);
-    
+
     QBENCHMARK {
         v.selectAll();
     }
@@ -229,11 +229,11 @@ void tst_QTableView::spanSelectColumn()
     QtTestTableModel model(500, 500);
     QTableView v;
     v.setModel(&model);
-    
+
     spanInit_helper(&v);
     v.show();
     QTest::qWait(30);
-    
+
     QBENCHMARK {
         v.selectColumn(22);
     }
diff --git a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
index 9c0e149ec5..0413290b21 100644
--- a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
+++ b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
@@ -487,7 +487,7 @@ public:
         m_pixmaps.clear();
         m_currentPixmap = 0;
         QRect m_bounds = QRect(0,0,p->device()->width(), p->device()->height());
-        switch (m_mode) {          
+        switch (m_mode) {
         case PainterMode:
             m_size = (p->boundingRect(m_bounds, 0, m_text)).size();
 //            m_rect = m_rect.translated(-m_rect.topLeft());
diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index 3a7d406777..e7e22f0e65 100644
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -291,7 +291,7 @@ void tst_QText::fontResolution()
     font.setFamily("DejaVu");
     font2.setBold(true);
 
-    QBENCHMARK {    
+    QBENCHMARK {
         QFont res = font.resolve(font2);
     }
 }
diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp
index 4417253930..185dbe123e 100644
--- a/tests/manual/bearerex/bearerex.cpp
+++ b/tests/manual/bearerex/bearerex.cpp
@@ -49,9 +49,9 @@ BearerEx::BearerEx(QWidget* parent)
      : QMainWindow(parent)
 {
     setupUi(this);
-    
+
     createMenus();
-    
+
     connect(&m_NetworkConfigurationManager, SIGNAL(updateCompleted()), this, SLOT(configurationsUpdateCompleted()));
     connect(&m_NetworkConfigurationManager, SIGNAL(configurationAdded(QNetworkConfiguration)),
             this, SLOT(configurationAdded(QNetworkConfiguration)));
@@ -79,19 +79,19 @@ void BearerEx::showConfigurations()
 {
     listWidget->clear();
     QListWidgetItem* listItem;
-    
+
     QNetworkConfiguration defaultConfig = m_NetworkConfigurationManager.defaultConfiguration();
     if (defaultConfig.type() == QNetworkConfiguration::UserChoice) {
         listItem = new QListWidgetItem();
         QFont font = listItem->font();
         font.setBold(true);
         font.setUnderline(true);
-        listItem->setFont(font);        
+        listItem->setFont(font);
         listItem->setText("       UserChoice");
         listItem->setData(Qt::UserRole, QVariant::fromValue(defaultConfig));
         listWidget->addItem(listItem);
     }
-    
+
     QList<QNetworkConfiguration> configurations = m_NetworkConfigurationManager.allConfigurations();
     for (int i=0; i<configurations.count(); i++)
     {
@@ -102,7 +102,7 @@ void BearerEx::showConfigurations()
         } else if (configurations[i].type() == QNetworkConfiguration::ServiceNetwork) {
             text.append("(SNAP,");
         }
-        
+
         if ((configurations[i].state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
             text.append("Act) ");
         } else if ((configurations[i].state() & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) {
@@ -111,12 +111,12 @@ void BearerEx::showConfigurations()
             text.append("Def) ");
         }
         text.append(configurations[i].name());
-        
+
         if (defaultConfig.isValid() && defaultConfig == configurations[i]) {
             QFont font = listItem->font();
             font.setBold(true);
             font.setUnderline(true);
-            listItem->setFont(font);        
+            listItem->setFont(font);
         }
         listItem->setText(text);
         listItem->setData(Qt::UserRole, QVariant::fromValue(configurations[i]));
@@ -151,7 +151,7 @@ void BearerEx::on_createSessionButton_clicked()
     QListWidgetItem* item = listWidget->currentItem();
     if (!item) {
         return;
-    }    
+    }
     QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole));
     int newTabIndex = mainTabWidget->count();
     SessionTab* newTab = new SessionTab(&networkConfiguration,&m_NetworkConfigurationManager,eventListWidget,newTabIndex-1);
@@ -184,7 +184,7 @@ void BearerEx::onlineStateChanged(bool isOnline)
     QListWidgetItem* listItem = new QListWidgetItem();
     QFont font = listItem->font();
     font.setBold(true);
-    listItem->setFont(font);        
+    listItem->setFont(font);
     if (isOnline) {
         listItem->setText(QString("> Online"));
     } else {
@@ -231,7 +231,7 @@ DetailedInfoDialog::DetailedInfoDialog(QNetworkConfiguration* apNetworkConfigura
 
     tableWidget->setColumnCount(2);
     int rowCount = 2;
-    
+
     if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) {
         rowCount = rowCount + apNetworkConfiguration->children().count();
     }
@@ -274,7 +274,7 @@ SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration,
     connect(m_NetworkSession, SIGNAL(opened()), this, SLOT(opened()));
     connect(m_NetworkSession, SIGNAL(closed()), this, SLOT(closed()));
     connect(m_NetworkSession, SIGNAL(error(QNetworkSession::SessionError)), this, SLOT(error(QNetworkSession::SessionError)));
-    
+
     if (apNetworkConfiguration->type() == QNetworkConfiguration::InternetAccessPoint) {
         snapLabel->hide();
         snapLineEdit->hide();
@@ -342,7 +342,7 @@ void SessionTab::on_openSessionButton_clicked()
 {
     m_NetworkSession->open();
     if (m_NetworkSession->isOpen()) {
-        newState(m_NetworkSession->state()); 
+        newState(m_NetworkSession->state());
     }
 }
 
@@ -350,7 +350,7 @@ void SessionTab::on_closeSessionButton_clicked()
 {
     m_NetworkSession->close();
     if (!m_NetworkSession->isOpen()) {
-        newState(m_NetworkSession->state()); 
+        newState(m_NetworkSession->state());
     }
 }
 
@@ -414,10 +414,10 @@ void SessionTab::opened()
     QListWidgetItem* listItem = new QListWidgetItem();
     QFont font = listItem->font();
     font.setBold(true);
-    listItem->setFont(font);        
+    listItem->setFont(font);
     listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Opened"));
     m_eventListWidget->addItem(listItem);
-    
+
     QVariant identifier = m_NetworkSession->sessionProperty("ActiveConfiguration");
     if (!identifier.isNull()) {
         QString configId = identifier.toString();
@@ -445,7 +445,7 @@ void SessionTab::closed()
     QListWidgetItem* listItem = new QListWidgetItem();
     QFont font = listItem->font();
     font.setBold(true);
-    listItem->setFont(font);        
+    listItem->setFont(font);
     listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+QString("Closed"));
     m_eventListWidget->addItem(listItem);
 }
@@ -492,10 +492,10 @@ void SessionTab::on_dataObjectChanged(const QString &newObjectType)
 }
 
 
-void SessionTab::stateChanged(QNetworkSession::State state)    
+void SessionTab::stateChanged(QNetworkSession::State state)
 {
     newState(state);
-    
+
     QListWidgetItem* listItem = new QListWidgetItem();
     listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+stateString(state));
     m_eventListWidget->addItem(listItem);
@@ -527,7 +527,7 @@ void SessionTab::error(QNetworkSession::SessionError error)
     QListWidgetItem* listItem = new QListWidgetItem();
     QMessageBox msgBox;
     msgBox.setStandardButtons(QMessageBox::Close);
-    
+
     QString errorString;
     switch (error)
     {
@@ -549,7 +549,7 @@ void SessionTab::error(QNetworkSession::SessionError error)
     }
     listItem->setText(QString("S")+QString::number(m_index)+QString(" - ")+errorString);
     m_eventListWidget->addItem(listItem);
-    
+
     msgBox.setText(errorString);
     msgBox.exec();
 }
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h
index 5ec2e17060..8de2b1d41d 100644
--- a/tests/manual/bearerex/bearerex.h
+++ b/tests/manual/bearerex/bearerex.h
@@ -88,7 +88,7 @@ private Q_SLOTS:
     void configurationAdded(const QNetworkConfiguration& config);
     void configurationRemoved(const QNetworkConfiguration& config);
     void onlineStateChanged(bool isOnline);
-    void configurationChanged(const QNetworkConfiguration & config);     
+    void configurationChanged(const QNetworkConfiguration & config);
 
 private:
     QNetworkConfigurationManager m_NetworkConfigurationManager;
@@ -112,8 +112,8 @@ public:
     SessionTab(QNetworkConfiguration* apNetworkConfiguration = 0, QNetworkConfigurationManager* configManager = 0,
                QListWidget* eventListWidget = 0,  int index = 0, BearerEx* parent = 0);
     ~SessionTab();
-    
-    QString stateString(QNetworkSession::State state);    
+
+    QString stateString(QNetworkSession::State state);
 
 private Q_SLOTS:
     void on_createQNetworkAccessManagerButton_clicked();
@@ -125,7 +125,7 @@ private Q_SLOTS:
     void on_dataObjectChanged(const QString& newObjectType);
     void on_alrButton_clicked();
     void finished(quint32 errorCode, qint64 dataReceived, QString errorType);
-    
+
     void newConfigurationActivated();
     void preferredConfigurationChanged(const QNetworkConfiguration& config, bool isSeamless);
     void stateChanged(QNetworkSession::State state);
diff --git a/tests/manual/bearerex/xqlistwidget.cpp b/tests/manual/bearerex/xqlistwidget.cpp
index 556d9e400f..cb03f6e9bf 100644
--- a/tests/manual/bearerex/xqlistwidget.cpp
+++ b/tests/manual/bearerex/xqlistwidget.cpp
@@ -42,7 +42,7 @@
 #include "xqlistwidget.h"
 
 XQListWidget::XQListWidget(QWidget* parent) : QListWidget(parent)
-{    
+{
 }
 
 void XQListWidget::keyPressEvent(QKeyEvent* event)
@@ -59,7 +59,7 @@ void XQListWidget::keyPressEvent(QKeyEvent* event)
             focusNextChild();
             break;
         }
-        default: 
+        default:
         {
             QListWidget::keyPressEvent(event);
         }
diff --git a/tests/manual/bearerex/xqlistwidget.h b/tests/manual/bearerex/xqlistwidget.h
index b23dfb5735..80aecceb0b 100644
--- a/tests/manual/bearerex/xqlistwidget.h
+++ b/tests/manual/bearerex/xqlistwidget.h
@@ -48,8 +48,8 @@
 class XQListWidget: public QListWidget
 {
 public:
-    XQListWidget(QWidget* parent = 0);  
-    
+    XQListWidget(QWidget* parent = 0);
+
 protected:
     void keyPressEvent(QKeyEvent* event);
 };
diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h
index 09c6ca41f5..ce1724280f 100644
--- a/tests/manual/inputmethodhints/inputmethodhints.h
+++ b/tests/manual/inputmethodhints/inputmethodhints.h
@@ -52,7 +52,7 @@ class inputmethodhints : public QMainWindow
 public:
     inputmethodhints(QWidget *parent = 0);
     ~inputmethodhints();
-    
+
 public slots:
     void checkboxChanged(int);
 
diff --git a/tests/manual/qcursor/grab_override/mainwindow.h b/tests/manual/qcursor/grab_override/mainwindow.h
index c105e22850..eaf4b95615 100644
--- a/tests/manual/qcursor/grab_override/mainwindow.h
+++ b/tests/manual/qcursor/grab_override/mainwindow.h
@@ -64,11 +64,11 @@ private slots:
 
 private:
     void keyPressEvent(QKeyEvent* event);
-    
+
     Ui::MainWindow *ui;
     QTimer *timer;
     int override;
-    
+
     QCursor ccurs;
     QCursor bcurs;
 };
diff --git a/tests/manual/qtouchevent/touchwidget.cpp b/tests/manual/qtouchevent/touchwidget.cpp
index 68206aad22..e2834203f7 100644
--- a/tests/manual/qtouchevent/touchwidget.cpp
+++ b/tests/manual/qtouchevent/touchwidget.cpp
@@ -122,7 +122,7 @@ bool TouchWidget::event(QEvent *event)
     case QEvent::MouseButtonRelease:
         seenMouseRelease = true;
         if (closeWindowOnMouseRelease)
-            window()->close();        
+            window()->close();
         if (acceptMouseRelease) {
             event->accept();
             return true;
diff --git a/tests/manual/repaint/mainwindow/main.cpp b/tests/manual/repaint/mainwindow/main.cpp
index 173f81de06..eb3096a59c 100644
--- a/tests/manual/repaint/mainwindow/main.cpp
+++ b/tests/manual/repaint/mainwindow/main.cpp
@@ -47,16 +47,16 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
 
     QMainWindow mainWindow;
-    
+
     mainWindow.setCentralWidget(new StaticWidget());
     mainWindow.setStatusBar(new QStatusBar());
-    
+
     QDockWidget *dockWidget = new QDockWidget();
     dockWidget->setWidget(new StaticWidget());
     mainWindow.addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
-    
+
     QToolBar *toolBar = new QToolBar();
-    
+
     toolBar->addWidget(new StaticWidget())->setVisible(true);;
 
     toolBar->addWidget(new QSpinBox())->setVisible(true);;
@@ -64,6 +64,6 @@ int main(int argc, char **argv)
 
     mainWindow.resize(600, 400);
     mainWindow.show();
-    
+
     return app.exec();
 }
diff --git a/tests/manual/repaint/scrollarea/main.cpp b/tests/manual/repaint/scrollarea/main.cpp
index 44b43c30f7..6102ab8ee8 100644
--- a/tests/manual/repaint/scrollarea/main.cpp
+++ b/tests/manual/repaint/scrollarea/main.cpp
@@ -42,7 +42,6 @@
 #include <QtWidgets>
 #include "../shared/shared.h"
 
-
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
@@ -57,8 +56,7 @@ int main(int argc, char **argv)
 
     scrollView.resize(600, 400);
     scrollView.show();
-    
-    
+
     return app.exec();
 }
 
diff --git a/tests/manual/repaint/splitter/main.cpp b/tests/manual/repaint/splitter/main.cpp
index 5ee1e19402..2c01053ae1 100644
--- a/tests/manual/repaint/splitter/main.cpp
+++ b/tests/manual/repaint/splitter/main.cpp
@@ -53,6 +53,6 @@ int main(int argc, char **argv)
 
     splitter.resize(600, 400);
     splitter.show();
-    
+
     return app.exec();
 }
diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp
index 442b1668e0..71f8209d6d 100644
--- a/tests/manual/repaint/tableview/main.cpp
+++ b/tests/manual/repaint/tableview/main.cpp
@@ -45,7 +45,7 @@
 class CellWidget : public QWidget
 {
 public:
-    CellWidget (QWidget *parent = 0) : QWidget(parent) { }
+    CellWidget(QWidget *parent = 0) : QWidget(parent) {}
     void paintEvent(QPaintEvent * event)
     {
         static int value = 200;
@@ -69,8 +69,7 @@ int main(int argc, char **argv)
        tableWidget.setCellWidget(row, col, new CellWidget());
     tableWidget.resize(400, 600);
     tableWidget.show();
-    
-    
+
     return app.exec();
 }
 
diff --git a/tests/manual/repaint/task141091/main.cpp b/tests/manual/repaint/task141091/main.cpp
index d2b0f76606..b5b6ae92d7 100644
--- a/tests/manual/repaint/task141091/main.cpp
+++ b/tests/manual/repaint/task141091/main.cpp
@@ -45,11 +45,12 @@
 class MyWidget : public QWidget
 {
 public:
-    MyWidget() : QWidget() { 
-        
-        
+    MyWidget() : QWidget()
+    {
         setAttribute(Qt::WA_OpaquePaintEvent);
-        setAttribute(Qt::WA_StaticContents); }
+        setAttribute(Qt::WA_StaticContents);
+    }
+
 protected:
     void paintEvent(QPaintEvent *e) { qDebug() << e->rect(); }
 };
@@ -60,4 +61,4 @@ int main(int argc, char **argv)
     MyWidget w;
     w.show();
     return a.exec();
-}
\ No newline at end of file
+}
diff --git a/tests/manual/repaint/widget/main.cpp b/tests/manual/repaint/widget/main.cpp
index 520b3e22f5..22011a160c 100644
--- a/tests/manual/repaint/widget/main.cpp
+++ b/tests/manual/repaint/widget/main.cpp
@@ -108,24 +108,24 @@ protected:
     QPushButton * resizeButton;
     QPushButton * movebutton;
     QPushButton * moveResizebutton;
-    QPushButton * scrollbutton;    
+    QPushButton * scrollbutton;
 };
 
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    
+
     TopLevel bc;
     bc.resize(500, 500);
 
     c = new Child(&bc);
     c->move(100, 100);
     c->resize(100, 100);
-    
+
     QWidget *gc  = new StaticWidget(c);
     gc->move(20, 20);
     gc->resize(50,50);
-    
+
 
     bc.show();
     return app.exec();
diff --git a/util/lexgen/generator.cpp b/util/lexgen/generator.cpp
index a6fc93c0ca..06ba586c1f 100644
--- a/util/lexgen/generator.cpp
+++ b/util/lexgen/generator.cpp
@@ -48,7 +48,7 @@ void Function::printDeclaration(CodeBlock &block, const QString &funcNamePrefix)
     block << (iline ? "inline " : "") << signature(funcNamePrefix) << (iline ? QLatin1String(" {") : QLatin1String(";"));
     if (!iline)
         return;
-    
+
     block.indent();
     QString tmp = body;
     if (tmp.endsWith(QLatin1Char('\n')))
@@ -81,7 +81,7 @@ QString Function::definition() const
     QString result;
     result += signature();
     result += QLatin1String("\n{\n");
-    
+
     QString tmp = body;
 
     if (tmp.endsWith(QLatin1Char('\n')))
@@ -92,7 +92,7 @@ QString Function::definition() const
     tmp.replace(QLatin1Char('\n'), QLatin1String("\n    "));
 
     result += tmp;
-    
+
     result += QLatin1String("\n}\n");
 
     return result;
@@ -102,16 +102,16 @@ void Class::Section::printDeclaration(const Class *klass, CodeBlock &block) cons
 {
     foreach (Function ctor, constructors)
         ctor.printDeclaration(block, klass->name());
-    
+
     if (!constructors.isEmpty())
         block.addNewLine();
-    
+
     foreach (Function func, functions)
         func.printDeclaration(block);
-    
+
     if (!functions.isEmpty())
         block.addNewLine();
-    
+
     foreach (QString var, variables)
         block << var << ';';
 }
@@ -133,13 +133,13 @@ void Class::addConstructor(Access access, const QString &body, const QString &_a
 QString Class::Section::definition(const Class *klass) const
 {
     QString result;
-    
+
     foreach (Function ctor, constructors) {
         ctor.setName(klass->name() + "::" + klass->name() + ctor.name());
         result += ctor.definition();
         result += QLatin1Char('\n');
     }
-    
+
     foreach (Function func, functions) {
         if (!func.hasBody()) continue;
         func.setName(klass->name() + "::" + func.name());
@@ -153,10 +153,10 @@ QString Class::Section::definition(const Class *klass) const
 QString Class::declaration() const
 {
     CodeBlock block;
-    
+
     block << QLatin1String("class ") << cname;
     block << "{";
-    
+
     if (!sections[PublicMember].isEmpty()) {
         block << "public:";
         block.indent();
@@ -170,7 +170,7 @@ QString Class::declaration() const
         sections[ProtectedMember].printDeclaration(this, block);
         block.outdent();
     }
-    
+
     if (!sections[PrivateMember].isEmpty()) {
         block << "private:";
         block.indent();
@@ -180,7 +180,7 @@ QString Class::declaration() const
 
     block << "};";
     block.addNewLine();
-    
+
     return block.toString();
 }
 
@@ -406,12 +406,12 @@ void Generator::generateTransitions(CodeBlock &body, const TransitionMap &transi
 QString Generator::generate()
 {
     Class klass(cfg.className);
-    
+
     klass.addMember(Class::PublicMember, "QString input");
     klass.addMember(Class::PublicMember, "int pos");
     klass.addMember(Class::PublicMember, "int lexemStart");
     klass.addMember(Class::PublicMember, "int lexemLength");
-    
+
     {
         CodeBlock body;
         body << "input = inp;";
@@ -420,7 +420,7 @@ QString Generator::generate()
         body << "lexemLength = 0;";
         klass.addConstructor(Class::PublicMember, body, "const QString &inp");
     }
-    
+
     {
         Function next("QChar", "next()");
         next.setInline(true);
@@ -430,7 +430,7 @@ QString Generator::generate()
             next.addBody("return (pos < input.length()) ? input.at(pos++).toLower() : QChar();");
         klass.addMember(Class::PublicMember, next);
     }
-    
+
     /*
     {
         Function lexem("QString", "lexem()");
@@ -450,7 +450,7 @@ QString Generator::generate()
     Function lexFunc;
     lexFunc.setReturnType("int");
     lexFunc.setName("lex()");
-    
+
     CodeBlock body;
     body << "lexemStart = pos;";
     body << "lexemLength = 0;";
@@ -487,14 +487,14 @@ QString Generator::generate()
         body.outdent();
 
         body.indent();
-        
+
         if (!dfa.at(i).transitions.isEmpty()) {
             body << "ch = next();";
             generateTransitions(body, dfa.at(i).transitions);
         }
-        
+
         body << "goto out;";
-        
+
         body.outdent();
     }
 
@@ -512,9 +512,9 @@ QString Generator::generate()
     body.outdent();
     body << "}";
     body << "return token;";
-    
+
     lexFunc.addBody(body);
-    
+
     klass.addMember(Class::PublicMember, lexFunc);
 
     QString header;
@@ -526,7 +526,7 @@ QString Generator::generate()
     }
 
     header += QLatin1String("// auto generated. DO NOT EDIT.\n");
-    
+
     return header + klass.declaration() + klass.definition();
 }
 
diff --git a/util/lexgen/generator.h b/util/lexgen/generator.h
index 7037f13018..c56ee20756 100644
--- a/util/lexgen/generator.h
+++ b/util/lexgen/generator.h
@@ -82,11 +82,11 @@ public:
             delete shared;
         }
     }
-    
+
     template <typename T>
     LineStream &operator<<(const T &value)
     { (*shared->stream) << value; return *this; }
-    
+
     SharedStream *shared;
 };
 
@@ -101,11 +101,11 @@ public:
     template <typename T>
     LineStream operator<<(const T &value)
     { stream << indentStr; stream << value; return LineStream(&stream); }
-    
+
     inline void addNewLine() { stream << endl; }
-    
+
     inline QString toString() const { stream.flush(); return output; }
-    
+
 private:
     QString output;
     mutable QTextStream stream;
@@ -121,20 +121,20 @@ public:
 
     inline void setName(const QString &name) { fname = name; }
     inline QString name() const { return fname; }
-    
+
     inline void setInline(bool i) { iline = i; }
     inline bool isInline() const { return iline; }
-    
+
     inline void setReturnType(const QString &type) { rtype = type; }
     inline QString returnType() const { return rtype; }
-    
+
     inline void addBody(const QString &_body) { body += _body; }
     inline void addBody(const CodeBlock &block) { body += block.toString(); }
     inline bool hasBody() const { return !body.isEmpty(); }
-    
+
     inline void setConst(bool konst) { cnst = konst; }
     inline bool isConst() const { return cnst; }
-    
+
     void printDeclaration(CodeBlock &block, const QString &funcNamePrefix = QString()) const;
     QString definition() const;
 
@@ -157,19 +157,19 @@ public:
 
     inline void setName(const QString &name) { cname = name; }
     inline QString name() const { return cname; }
-    
+
     inline void addMember(Access access, const QString &name)
     { sections[access].variables.append(name); }
     inline void addMember(Access access, const Function &func)
     { sections[access].functions.append(func); }
-    
+
     void addConstructor(Access access, const QString &body, const QString &args = QString());
     inline void addConstructor(Access access, const CodeBlock &body, const QString &args = QString())
     { addConstructor(access, body.toString(), args); }
-    
+
     QString declaration() const;
     QString definition() const;
-    
+
 private:
     QString cname;
     struct Section
@@ -177,10 +177,10 @@ private:
         QVector<Function> functions;
         QStringList variables;
         QVector<Function> constructors;
-        
+
         inline bool isEmpty() const
         { return functions.isEmpty() && variables.isEmpty() && constructors.isEmpty(); }
-        
+
         void printDeclaration(const Class *klass, CodeBlock &block) const;
         QString definition(const Class *klass) const;
     };
@@ -192,9 +192,9 @@ class Generator
 {
 public:
     Generator(const DFA &dfa, const Config &config);
-    
+
     QString generate();
-    
+
 private:
     void generateTransitions(CodeBlock &body, const TransitionMap &transitions);
     bool isSingleReferencedFinalState(int i) const;
diff --git a/util/lexgen/main.cpp b/util/lexgen/main.cpp
index 7fdf587ae9..a6cd6ee94f 100644
--- a/util/lexgen/main.cpp
+++ b/util/lexgen/main.cpp
@@ -149,7 +149,7 @@ static QSet<InputType> determineMaxInputSet(const ConfigFile::Section &section)
     if (inputTypeName == "quint8") {
         for (int i = 1; i < 256; ++i)
             set.insert(i);
-    } /* else if ### */ 
+    } /* else if ### */
     else {
         qWarning("Error: Unknown input type '%s'", qPrintable(inputTypeName));
         return QSet<InputType>();
@@ -313,7 +313,7 @@ int main(int argc, char **argv)
             qDebug() << "Error while tokenizing!";
     } else {
         Generator gen(machine, cfg);
-        QTextStream(stdout) 
+        QTextStream(stdout)
             << gen.generate();
     }
 
diff --git a/util/lexgen/nfa.cpp b/util/lexgen/nfa.cpp
index 5ae3beade5..1414d1eedd 100644
--- a/util/lexgen/nfa.cpp
+++ b/util/lexgen/nfa.cpp
@@ -288,7 +288,6 @@ DFA NFA::toDFA() const
                     if (transition.key() == Epsilon && epsilonStates.contains(transition.value()))
                         epsilonStates.insert(i, epsilonStates.value(transition.value()));
             }
-
         } while (lastCount != epsilonStates.count());
 
         for (int i = 0; i < states.count(); ++i) {
@@ -313,7 +312,6 @@ DFA NFA::toDFA() const
             */
     }
 
-    
     QSet<InputType> validInput;
     foreach (const State &s, states)
         for (TransitionMap::ConstIterator it = s.transitions.constBegin(),
@@ -504,5 +502,3 @@ DFA DFA::minimize() const
 
     return *this;
 }
-
-
diff --git a/util/lexgen/nfa.h b/util/lexgen/nfa.h
index 3eae9bcef8..0d8394a926 100644
--- a/util/lexgen/nfa.h
+++ b/util/lexgen/nfa.h
@@ -92,7 +92,7 @@ public:
     static NFA applyQuantity(const NFA &a, int minOccurrences, int maxOccurrences);
 
     void setTerminationSymbol(const QString &symbol);
-    
+
     DFA toDFA() const;
 
     inline bool isEmpty() const { return states.isEmpty(); }
@@ -113,7 +113,7 @@ private:
 
     inline void assertValidState(int state)
     { Q_UNUSED(state); Q_ASSERT(state >= 0); Q_ASSERT(state < states.count()); }
-    
+
 #if defined(AUTOTEST)
 public:
 #endif
diff --git a/util/lexgen/tests/tst_lexgen.cpp b/util/lexgen/tests/tst_lexgen.cpp
index a3741d2373..f45d295633 100644
--- a/util/lexgen/tests/tst_lexgen.cpp
+++ b/util/lexgen/tests/tst_lexgen.cpp
@@ -227,7 +227,7 @@ void tst_LexGen::lexgen_data()
     d.cd("testdata");
     foreach (QString test, d.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
         QString dir = d.absoluteFilePath(test) + '/';
-        QTest::newRow(qPrintable(test)) 
+        QTest::newRow(qPrintable(test))
             << dir + "rules.lexgen"
             << dir + "input"
             << dir + "output"