whitespace fixes

remove trailing whitespace & expand tabs

Change-Id: I7dd5aca1f157d7798227302b315bfb0e9f2e9f77
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

32 files changed, 124 insertions, 124 deletions

diff --git a/examples/organizer/calendardemo/calendardemo.pro b/examples/organizer/calendardemo/calendardemo.pro
index d6cb3c989..758360bc5 100644
--- a/examples/organizer/calendardemo/calendardemo.pro
+++ b/examples/organizer/calendardemo/calendardemo.pro
@@ -13,7 +13,7 @@ SOURCES += src/main.cpp \
            src/eventoccurrenceeditpage.cpp \
            src/addcalendarpage.cpp \
            src/editcalendarspage.cpp
-           
+
 HEADERS += src/calendardemo.h \
            src/monthpage.h \
            src/daypage.h \
diff --git a/examples/organizer/calendardemo/src/calendardemo.cpp b/examples/organizer/calendardemo/src/calendardemo.cpp
index ea1dd1d72..ca0f4b086 100644
--- a/examples/organizer/calendardemo/src/calendardemo.cpp
+++ b/examples/organizer/calendardemo/src/calendardemo.cpp
@@ -112,7 +112,7 @@ CalendarDemo::CalendarDemo(QWidget *parent)
             this, SLOT(removeReqStateChanged(QOrganizerAbstractRequest::State)));
 
     m_monthPage->init();
-    
+
     m_stackedWidget->addWidget(m_monthPage);
     m_stackedWidget->addWidget(m_dayPage);
     m_stackedWidget->addWidget(m_eventEditPage);
@@ -310,7 +310,7 @@ void CalendarDemo::removeItem()
 void CalendarDemo::addEvents()
 {
     QList<QOrganizerItem> items;
-    
+
     // Create a large number of events asynchronously
     QOrganizerCollectionId defaultCollectionId = m_manager->defaultCollection().id();
     for(int index=0 ; index <  100 ; index++) {
@@ -318,7 +318,7 @@ void CalendarDemo::addEvents()
         item.setType(QOrganizerItemType::TypeEvent);
         item.setDescription(QString("Event %1").arg(index));
         item.setDisplayLabel(QString("Subject for event %1").arg(index + 1));
-        
+
         // Set the start date to index to add events to next 5000 days
         QOrganizerEventTime timeRange;
         timeRange.setStartDateTime(QDateTime::currentDateTime().addDays(index));
@@ -326,10 +326,10 @@ void CalendarDemo::addEvents()
         item.saveDetail(&timeRange);
 
         item.setCollectionId(defaultCollectionId);
-        
+
         items.append(item);
     }
-    
+
     // Now create a save request and execute it
     m_saveReq.setItems(items);
     m_saveReq.setManager(m_manager);
@@ -483,7 +483,7 @@ void CalendarDemo::deleteAllEntries()
 {
     // Fetch all the entries
     QList<QOrganizerItemId> ids = m_manager->itemIds();
-    
+
     if(ids.count()) {
         m_remReq.setItemIds(ids);
         m_remReq.setManager(m_manager);
diff --git a/examples/organizer/calendardemo/src/daypage.cpp b/examples/organizer/calendardemo/src/daypage.cpp
index c2d055601..fd670ca79 100644
--- a/examples/organizer/calendardemo/src/daypage.cpp
+++ b/examples/organizer/calendardemo/src/daypage.cpp
@@ -110,7 +110,7 @@ void DayPage::refresh()
             listItem->setData(ORGANIZER_ITEM_ROLE, data);
             m_itemList->addItem(listItem);
         }
-        
+
         QOrganizerTodoTime todoTime = item.detail(QOrganizerItemDetail::TypeTodoTime);
         if (!todoTime.isEmpty()) {
             QString time = todoTime.startDateTime().time().toString("hh:mm");
@@ -130,7 +130,7 @@ void DayPage::refresh()
             listItem->setData(ORGANIZER_ITEM_ROLE, data);
             m_itemList->addItem(listItem);
         }
-        
+
         // TODO: other item types
     }
 
diff --git a/examples/organizer/calendardemo/src/eventeditpage.cpp b/examples/organizer/calendardemo/src/eventeditpage.cpp
index af97076e2..e5b734b9b 100644
--- a/examples/organizer/calendardemo/src/eventeditpage.cpp
+++ b/examples/organizer/calendardemo/src/eventeditpage.cpp
@@ -74,10 +74,10 @@ EventEditPage::EventEditPage(QWidget *parent)
     m_typeComboBox->addItem("Weekly");
     m_typeComboBox->addItem("Monthly");
     m_typeComboBox->addItem("Yearly");
-    connect(m_typeComboBox, SIGNAL(currentIndexChanged(const QString&)), this, 
+    connect(m_typeComboBox, SIGNAL(currentIndexChanged(const QString&)), this,
             SLOT(frequencyChanged(const QString&)));
     QStringList alarmList;
-    alarmList	<< "None"
+    alarmList   << "None"
                 << "0 minutes before"
                 << "5 minutes before"
                 << "15 minutes before"
diff --git a/examples/organizer/calendardemo/src/monthpage.h b/examples/organizer/calendardemo/src/monthpage.h
index 11e3b6275..6a403a513 100644
--- a/examples/organizer/calendardemo/src/monthpage.h
+++ b/examples/organizer/calendardemo/src/monthpage.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void showEditPage(const QOrganizerItem &item);
     void addNewEvent();
     void addNewTodo();
-    
+
 protected: // from QWidget
     void showEvent(QShowEvent *event);
 
diff --git a/examples/organizer/calendardemo/src/todoeditpage.cpp b/examples/organizer/calendardemo/src/todoeditpage.cpp
index c3eaaca8a..4a8db2daf 100644
--- a/examples/organizer/calendardemo/src/todoeditpage.cpp
+++ b/examples/organizer/calendardemo/src/todoeditpage.cpp
@@ -214,7 +214,7 @@ void TodoEditPage::saveClicked()
     m_organizerTodo.setDueDateTime(due);
     int index = m_priorityEdit->currentIndex();
     m_organizerTodo.setPriority((QOrganizerItemPriority::Priority) m_priorityEdit->itemData(index).toInt());
-    
+
     index = m_statusEdit->currentIndex();
     QOrganizerTodoProgress::Status currentStatus = (QOrganizerTodoProgress::Status) m_statusEdit->itemData(index).toInt();
     QOrganizerTodoProgress oldStatus = m_organizerTodo.detail(QOrganizerItemDetail::TypeTodoProgress);
@@ -252,7 +252,7 @@ void TodoEditPage::handleAlarmIndexChanged(const QString time)
             reminder.reset(new QOrganizerItemVisualReminder());
             static_cast<QOrganizerItemVisualReminder *>(reminder.data())->setMessage(m_subjectEdit->text());
         }
-    
+
     if (time == "None") {
         QOrganizerItemVisualReminder fetchedReminder = m_organizerTodo.detail(QOrganizerItemDetail::TypeVisualReminder);
         m_organizerTodo.removeDetail(&fetchedReminder);
diff --git a/examples/organizer/todo/todoeditor.cpp b/examples/organizer/todo/todoeditor.cpp
index 6d2acf67b..9138adf2f 100644
--- a/examples/organizer/todo/todoeditor.cpp
+++ b/examples/organizer/todo/todoeditor.cpp
@@ -134,7 +134,7 @@ void TodoEditor::updateAlarm(int index)
 
     QOrganizerItemVisualReminder reminder;
     reminder.setSecondsBeforeStart(seconds);
-    
+
     todo.saveDetail(&reminder);
 }
 //! [6]
diff --git a/examples/organizer/todo/todoeditor.h b/examples/organizer/todo/todoeditor.h
index 3a6c48d3e..efd89d1f9 100644
--- a/examples/organizer/todo/todoeditor.h
+++ b/examples/organizer/todo/todoeditor.h
@@ -91,7 +91,7 @@ private:
     QComboBox *alarmCombo;
     QLineEdit *subjectLineEdit;
     QTextEdit *descriptionTextEdit;
-    QPushButton *doneButton; 
+    QPushButton *doneButton;
 };
 //! [0]
 
diff --git a/examples/organizer/todo/window.cpp b/examples/organizer/todo/window.cpp
index 198d51ae3..ef9987c39 100644
--- a/examples/organizer/todo/window.cpp
+++ b/examples/organizer/todo/window.cpp
@@ -119,7 +119,7 @@ void Window::deleteTodo()
         }
     }
 }
-//! [4] 
+//! [4]
 
 //! [5]
 void Window::refreshList()
@@ -143,7 +143,7 @@ void Window::refreshList()
                     QDateTime(calendarWidget->selectedDate(), QTime(23,59)) ||
                 todo.dueDateTime() <
                     QDateTime(calendarWidget->selectedDate(), QTime(0, 0)))
-                continue;            
+                continue;
 
             QString display = todo.startDateTime().toString("yy/MM/dd hh:mm") +
                 "-" + todo.dueDateTime().toString("yy/MM/dd hh:mm") +
@@ -161,7 +161,7 @@ void Window::setupGui()
 {
     todoEditor = new TodoEditor;
 
-    listWidget = new QListWidget;   
+    listWidget = new QListWidget;
     stackedWidget = new QStackedWidget;
     newTodoButton = new QPushButton(tr("New Todo"));
     deletTodoButton = new QPushButton(tr("Delete Todo"));
@@ -202,5 +202,5 @@ void Window::setupGui()
     QGridLayout *layout = new QGridLayout;
     layout->addWidget(scrollArea);
 
-    setLayout(layout); 
+    setLayout(layout);
 }
diff --git a/examples/organizer/todo/window.h b/examples/organizer/todo/window.h
index f46cbf933..3c5bacc5e 100644
--- a/examples/organizer/todo/window.h
+++ b/examples/organizer/todo/window.h
@@ -81,7 +81,7 @@ private:
     void setupGui();
 
     QOrganizerManager *manager;
-    
+
     TodoEditor *todoEditor;
 
     QListWidget *listWidget;
diff --git a/src/contacts/filters/qcontactactionfilter.cpp b/src/contacts/filters/qcontactactionfilter.cpp
index 6aaa6070e..aa6bd893b 100644
--- a/src/contacts/filters/qcontactactionfilter.cpp
+++ b/src/contacts/filters/qcontactactionfilter.cpp
@@ -48,12 +48,12 @@ QT_BEGIN_NAMESPACE_CONTACTS
   \class QContactActionFilter
   \brief The QContactActionFilter class provides a filter based around an
   action availability criterion.
- 
-  
+
+
   \inmodule QtContacts
-  
+
   \ingroup contacts-filters
-    
+
   It may be used to select contacts for which a particular action is
   available, or contacts which contain a detail of a particular value for
   which the action is available.
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index 9b00f6885..4d7c4ab2b 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -61,7 +61,7 @@ QContactAction::~QContactAction()
   \ingroup contacts-actions
 
   \inmodule QtContacts
-  
+
   An action is anything that can be performed on a contact, or a detail of a contact.  An example
   of an action might be "Send Email" or "Dial" or "Plot Navigation Route".  One action may be
   implemented by multiple vendors, and indeed one vendor may provide multiple implementations of
@@ -76,7 +76,7 @@ QContactAction::~QContactAction()
   \l QContactAction::action() is called; the caller takes ownership of the action instance.
   Each action is uniquely described by a \l QContactActionDescriptor, which is passed to the
   \l QContactAction::action() function to instantiate an action.
- 
+
   \sa QContactActionFactory, QContactActionFilter
  */
 
diff --git a/src/contacts/requests/qcontactfetchbyidrequest.cpp b/src/contacts/requests/qcontactfetchbyidrequest.cpp
index 026f2af3c..1d73d3617 100644
--- a/src/contacts/requests/qcontactfetchbyidrequest.cpp
+++ b/src/contacts/requests/qcontactfetchbyidrequest.cpp
@@ -63,9 +63,9 @@ QT_BEGIN_NAMESPACE_CONTACTS
   Please see the class documentation of QContactAbstractRequest for more information about
   the usage of request classes and ownership semantics.
 
-  
+
   \inmodule QtContacts
-  
+
   \ingroup contacts-requests
  */
 
diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp
index 7776b137a..5e9bec6f7 100644
--- a/src/imports/contacts/qdeclarativecontactmodel.cpp
+++ b/src/imports/contacts/qdeclarativecontactmodel.cpp
@@ -154,7 +154,7 @@ QDeclarativeContactModel::QDeclarativeContactModel(QObject *parent) :
     connect(this, SIGNAL(filterChanged()), SLOT(doUpdate()));
     connect(this, SIGNAL(fetchHintChanged()), SLOT(doUpdate()));
     connect(this, SIGNAL(sortOrdersChanged()), SLOT(doUpdate()));
-    
+
     //import vcard
     connect(&d->m_reader, SIGNAL(stateChanged(QVersitReader::State)), this, SLOT(startImport(QVersitReader::State)));
     connect(&d->m_writer, SIGNAL(stateChanged(QVersitWriter::State)), this, SLOT(contactsExported(QVersitWriter::State)));
@@ -168,7 +168,7 @@ QDeclarativeContactModel::QDeclarativeContactModel(QObject *parent) :
 QString QDeclarativeContactModel::manager() const
 {
     if (d->m_manager)
-    	return d->m_manager->managerName();
+        return d->m_manager->managerName();
     return QString();
 }
 void QDeclarativeContactModel::setManager(const QString& managerName)
diff --git a/src/imports/contacts/qdeclarativecontactmodel_p.h b/src/imports/contacts/qdeclarativecontactmodel_p.h
index ab48d7b81..cb2dfccdc 100644
--- a/src/imports/contacts/qdeclarativecontactmodel_p.h
+++ b/src/imports/contacts/qdeclarativecontactmodel_p.h
@@ -116,7 +116,7 @@ public:
     void setStorageLocations(int storageLocations);
 
     QStringList availableManagers() const;
-    
+
     QString error() const;
 
     QDeclarativeContactFilter* filter() const;
diff --git a/src/imports/contacts/qdeclarativeglobal_p.h b/src/imports/contacts/qdeclarativeglobal_p.h
index 95c3ddb31..1b809c864 100644
--- a/src/imports/contacts/qdeclarativeglobal_p.h
+++ b/src/imports/contacts/qdeclarativeglobal_p.h
@@ -72,14 +72,14 @@ struct QQmlGraphics_DerivedObject : public QObject
 };
 
 /*!
-    Returns true if the case of \a fileName is equivalent to the file case of 
+    Returns true if the case of \a fileName is equivalent to the file case of
     \a fileName on disk, and false otherwise.
 
-    This is used to ensure that the behavior of QML on a case-insensitive file 
-    system is the same as on a case-sensitive file system.  This function 
-    performs a "best effort" attempt to determine the real case of the file. 
+    This is used to ensure that the behavior of QML on a case-insensitive file
+    system is the same as on a case-sensitive file system.  This function
+    performs a "best effort" attempt to determine the real case of the file.
     It may have false positives (say the case is correct when it isn't), but it
-    should never have a false negative (say the case is incorrect when it is 
+    should never have a false negative (say the case is incorrect when it is
     correct).
 */
 bool QQml_isFileCaseCorrect(const QString &fileName);
diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index df24e5e38..2e712efec 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -174,9 +174,9 @@ public:
     Through the \c item role can access any data provided by the OrganizerItem element.
 
 
-    \note Both the \c startPeriod and \c endPeriod are set by default to the current time (when the OrganizerModel was created). 
-     In most cases, both (or at least one) of the startPeriod and endPeriod should be set; otherwise, the OrganizerModel will contain 
-     zero items because the \c startPeriod and \c endPeriod are the same value. For example, if only \c endPeriod is provided, 
+    \note Both the \c startPeriod and \c endPeriod are set by default to the current time (when the OrganizerModel was created).
+     In most cases, both (or at least one) of the startPeriod and endPeriod should be set; otherwise, the OrganizerModel will contain
+     zero items because the \c startPeriod and \c endPeriod are the same value. For example, if only \c endPeriod is provided,
      the OrganizerModel will contain all items from now (the time of the OrganizerModel's creation) to the \c endPeriod time.
 
     \sa OrganizerItem, {QOrganizerManager}
diff --git a/src/plugins/contacts/jsondb/qcontactjsondbengine.h b/src/plugins/contacts/jsondb/qcontactjsondbengine.h
index c70db93fe..e36ea7182 100644
--- a/src/plugins/contacts/jsondb/qcontactjsondbengine.h
+++ b/src/plugins/contacts/jsondb/qcontactjsondbengine.h
@@ -110,7 +110,7 @@ public:
     bool cancelRequest(QContactAbstractRequest *req);
     bool waitForRequestProgress(QContactAbstractRequest* req, int msecs);
     bool waitForRequestFinished(QContactAbstractRequest* req, int msecs);
-  signals:    
+  signals:
     void requestReceived(QContactAbstractRequest* req);
   private:
     bool doSyncRequest(QContactAbstractRequest* req, int msecs) const;
diff --git a/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro b/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
index f439e0568..6382e742e 100644
--- a/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
+++ b/src/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
@@ -6,7 +6,7 @@ PLUGIN_TYPE=contacts
 include(../../../common.pri)
 
 HEADERS += \
-        qcontactactionservicemanager_p.h 
+        qcontactactionservicemanager_p.h
 SOURCES += \
         qcontactactionservicemanager_p.cpp
 
diff --git a/src/versit/qversitreader_p.h b/src/versit/qversitreader_p.h
index 1a8d4b55a..cf8781bdf 100644
--- a/src/versit/qversitreader_p.h
+++ b/src/versit/qversitreader_p.h
@@ -80,7 +80,7 @@ static const int MAX_OLD_BYTES_TO_KEEP = 8192;
 
 /*
  * An LByteArray has a subset of QByteArray's interface, plus an efficient chopLeft function
- * 
+ *
  * It stores a QByteArray internally, plus a marker of where it starts and where it ends.
  */
 class LByteArray
@@ -98,7 +98,7 @@ public:
     QByteArray toByteArray() const {
         return mData.mid(mStart, mEnd-mStart);
     }
-    /* Removes \a n bytes from the start of the QByteArray. */ 
+    /* Removes \a n bytes from the start of the QByteArray. */
     void chopLeft(int n) {
         Q_ASSERT(size() >= n && n >= 0);
         mStart += n;
diff --git a/src/versitorganizer/qversitorganizerimporter_p.cpp b/src/versitorganizer/qversitorganizerimporter_p.cpp
index f4b8ac25c..713e13416 100644
--- a/src/versitorganizer/qversitorganizerimporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerimporter_p.cpp
@@ -720,7 +720,7 @@ bool QVersitOrganizerImporterPrivate::createRecurrenceRule(
         detail.setRecurrenceRules(detail.recurrenceRules() << rule);
     } else if (property.name() == QStringLiteral("EXRULE")) {
         detail.setExceptionRules(detail.exceptionRules() << rule);
-    } 
+    }
     updatedDetails->append(detail);
     return true;
 }
@@ -734,7 +734,7 @@ bool QVersitOrganizerImporterPrivate::parseRecurRule(const QString& str, QOrgani
     QStringList parts = str.split(QLatin1Char(';'));
     if (parts.size() == 0)
         return false;
-    
+
     QString freqPart = parts.takeFirst();
     QStringList freqParts = freqPart.split(QLatin1Char('='));
     if (freqParts.size() != 2)
@@ -920,7 +920,7 @@ bool QVersitOrganizerImporterPrivate::createRecurrenceDates(
         detail.setRecurrenceDates(detail.recurrenceDates() + dates);
     } else if (property.name() == QStringLiteral("EXDATE")) {
         detail.setExceptionDates(detail.exceptionDates() + dates);
-    } 
+    }
     updatedDetails->append(detail);
     return true;
 }
diff --git a/src/versitorganizer/qversittimezonehandler.h b/src/versitorganizer/qversittimezonehandler.h
index 9115fb6f5..999cc2ca0 100644
--- a/src/versitorganizer/qversittimezonehandler.h
+++ b/src/versitorganizer/qversittimezonehandler.h
@@ -62,7 +62,7 @@ public:
       \a datetime must be specified with Qt::UTC.  The returned QDateTime will be specified with
       Qt::LocalTime.  Note that unlike the usual semantic of Qt::LocalTime, it does not represent a time
       in the system's local time zone.
-      
+
       An invalid QDateTime is returned on failure (eg. if \a timeZoneName is unknown).
      */
     virtual QDateTime convertTimeZoneToUtc(const QDateTime& datetime, const QString& timeZoneName) = 0;
@@ -76,7 +76,7 @@ public:
       \a datetime must be specified with Qt::LocalTime.  Note that unlike the usual semantic of
       Qt::LocalTime, \a datetime does not represent a time in the system's local time zone.
       The returned QDateTime will be specified with Qt::UTC.
-      
+
       An invalid QDateTime is returned on failure (eg. if \a timeZoneName is unknown).
      */
     virtual QDateTime convertUtcToTimeZone(const QDateTime& datetime, const QString& timeZoneName) = 0;
diff --git a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
index 48611e62f..ce678f176 100644
--- a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
+++ b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
@@ -303,8 +303,8 @@ void tst_QContactAsync::cleanupTestCase()
 
 bool tst_QContactAsync::compareContactLists(QList<QContact> lista, QList<QContact> listb)
 {
-    // NOTE: This compare is contact order insensitive.  
-    
+    // NOTE: This compare is contact order insensitive.
+
     // Remove matching contacts
     foreach (QContact a, lista) {
         foreach (QContact b, listb) {
@@ -314,17 +314,17 @@ bool tst_QContactAsync::compareContactLists(QList<QContact> lista, QList<QContac
                 break;
             }
         }
-    }    
+    }
     return (lista.count() == 0 && listb.count() == 0);
 }
 
 bool tst_QContactAsync::compareContacts(QContact ca, QContact cb)
 {
     // NOTE: This compare is contact detail order insensitive.
-    
+
     if (ca.id() != cb.id())
         return false;
-    
+
     QList<QContactDetail> aDetails = ca.details();
     QList<QContactDetail> bDetails = cb.details();
 
@@ -336,7 +336,7 @@ bool tst_QContactAsync::compareContacts(QContact ca, QContact cb)
                 cb.removeDetail(&bd);
                 break;
             }
-            
+
             // Special handling for timestamp
             if (ad.type() == QContactTimestamp::Type &&
                 bd.type() == QContactTimestamp::Type) {
@@ -348,8 +348,8 @@ bool tst_QContactAsync::compareContacts(QContact ca, QContact cb)
                     cb.removeDetail(&bd);
                     break;
                 }
-                    
-            }            
+
+            }
         }
     }
     return (ca == cb);
@@ -1103,7 +1103,7 @@ void tst_QContactAsync::contactRemove()
     // remove all contacts
     // delete everything.
     crr.setContactIds(cm->contactIds());
-    
+
     QVERIFY(!crr.cancel()); // not started
     QVERIFY(crr.start());
 
@@ -1382,7 +1382,7 @@ void tst_QContactAsync::contactSave()
     //QVERIFY(containsIgnoringTimestamps(result, testContact));
     // XXX: really, we should use isSuperset() from tst_QContactManager, but this will do for now:
     QVERIFY(result.first().detail<QContactPhoneNumber>().number() == phn.number());
-    
+
     QCOMPARE(cm->contactIds().size(), originalCount + 1);
 
     // cancelling
@@ -1939,11 +1939,11 @@ void tst_QContactAsync::relationshipFetch()
     if (cm->managerName() == "jsondb") {
        QSKIP("This contact manager does not support relationships!");
     }
-    
+
     if (cm->managerName() == "symbian") {
         QSKIP("This contact manager does not support the required relationship types for this test to pass!");
     }
-    
+
     QContactRelationshipFetchRequest rfr;
     QVERIFY(rfr.type() == QContactAbstractRequest::RelationshipFetchRequest);
 
@@ -2032,7 +2032,7 @@ void tst_QContactAsync::relationshipFetch()
         }
     }
     rfr.setSecond(bContact);
-    
+
     QVERIFY(!rfr.cancel()); // not started
     QVERIFY(rfr.start());
 
@@ -2060,7 +2060,7 @@ void tst_QContactAsync::relationshipFetch()
         }
     }
     rfr.setSecond(cContact);
-    
+
     QVERIFY(!rfr.cancel()); // not started
     QVERIFY(rfr.start());
 
@@ -2145,15 +2145,15 @@ void tst_QContactAsync::relationshipRemove()
 {
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> cm(prepareModel(uri));
-    
+
     if (cm->managerName() == "jsondb") {
        QSKIP("This contact manager does not support relationships!");
     }
-    
+
     if (cm->managerName() == "symbian") {
         QSKIP("This contact manager does not support the required relationship types for this test to pass!");
     }
-    
+
     QContactRelationshipRemoveRequest rrr;
     QVERIFY(rrr.type() == QContactAbstractRequest::RelationshipRemoveRequest);
 
@@ -2199,7 +2199,7 @@ void tst_QContactAsync::relationshipRemove()
     QVERIFY(!rrr.isFinished());
     QVERIFY(!rrr.cancel());
     QVERIFY(!rrr.waitForFinished());
-    
+
     QVERIFY(!rrr.cancel()); // not started
     QVERIFY(rrr.start());
 
@@ -2305,15 +2305,15 @@ void tst_QContactAsync::relationshipSave()
 {
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> cm(prepareModel(uri));
-    
+
     if (cm->managerName() == "jsondb") {
        QSKIP("This contact manager does not support relationships!");
     }
-    
+
     if (cm->managerName() == "symbian") {
         QSKIP("This contact manager does not support the required relationship types for this test to pass!");
-    }    
-    
+    }
+
     QContactRelationshipSaveRequest rsr;
     QVERIFY(rsr.type() == QContactAbstractRequest::RelationshipSaveRequest);
 
@@ -2691,7 +2691,7 @@ QContactManager* tst_QContactAsync::prepareModel(const QString& managerUri)
     if (cm->managerName() == "jsondb") {
         return cm;
     }
-    
+
     QContactRelationship arb;
     arb.setFirst(a);
     arb.setSecond(b);
diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
index a45bbc838..b606bee97 100644
--- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
+++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
@@ -793,7 +793,7 @@ void tst_QContactManager::add()
 
     QContact added = cm->contact(alice.id());
     QVERIFY(added.id() == alice.id());
-    
+
     if (!isSuperset(added, alice)) {
         dumpContacts(cm.data());
         dumpContactDifferences(added, alice);
@@ -813,7 +813,7 @@ void tst_QContactManager::add()
 
     // check that all the numbers were added successfully
     QVERIFY(veryContactable.details(QContactPhoneNumber::Type).size() == nrOfdetails);
-    
+
     // check if it can be saved
     QVERIFY(cm->saveContact(&veryContactable));
 
@@ -1149,7 +1149,7 @@ void tst_QContactManager::batch()
 
     QVERIFY(!cm->removeContacts(QList<QContactId>(), NULL));
     QVERIFY(cm->error() == QContactManager::BadArgumentError);
-    
+
     // Get supported name field
     int nameField = QContactName::FieldFirstName;
 
@@ -1336,7 +1336,7 @@ void tst_QContactManager::batch()
     QVERIFY(cm->saveContacts(&contacts, &errorMap));
     QVERIFY(errorMap.count() == 0);
     QVERIFY(cm->error() == QContactManager::NoError);
-    
+
     // Save and remove a fourth contact. Store the id.
     a.setId(QContactId());
     QVERIFY(cm->saveContact(&a));
@@ -2076,14 +2076,14 @@ void tst_QContactManager::signalEmission()
     QTRY_COMPARE(spyCM.count(), 0);
 
     QScopedPointer<QContactManager> m2(QContactManager::fromUri(uri));
-    
-    // During construction SIM backend (m2) will try writing contacts with 
+
+    // During construction SIM backend (m2) will try writing contacts with
     // nickname, email and additional number to find out if the SIM card
     // will support these fields. The other backend (m1) will then receive
     // signals about that. These need to be caught so they don't interfere
     // with the tests. (This trial and error method is used because existing
     // API for checking the availability of these fields is not public.)
-	// NOTE: This applies only to pre 10.1 platforms (S60 3.1, 3.2, ect.)
+    // NOTE: This applies only to pre 10.1 platforms (S60 3.1, 3.2, ect.)
     if (uri.contains("symbiansim")) {
         QTest::qWait(0);
         spyCA.clear();
@@ -2349,7 +2349,7 @@ void tst_QContactManager::detailOrders()
     //phone numbers
 
     QContactPhoneNumber number1, number2, number3;
-    
+
     number1.setNumber("11111111");
     number1.setContexts(QContactPhoneNumber::ContextHome);
 
@@ -2365,13 +2365,13 @@ void tst_QContactManager::detailOrders()
 
     QVERIFY(cm->saveContact(&a));
     a = cm->contact(a.id());
-    
+
     QList<QContactDetail> details = a.details(QContactPhoneNumber::Type);
     QVERIFY(details.count() == 3);
     QVERIFY(details.at(0).value(QContactPhoneNumber::FieldContext) == QContactPhoneNumber::ContextHome);
     QVERIFY(details.at(1).value(QContactPhoneNumber::FieldContext) == QContactPhoneNumber::ContextWork);
     QVERIFY(details.at(2).value(QContactPhoneNumber::FieldContext) == QContactPhoneNumber::ContextOther);
-    
+
     number2 = details.at(1);
     QVERIFY(a.removeDetail(&number2));
     QVERIFY(cm->saveContact(&a));
@@ -2384,7 +2384,7 @@ void tst_QContactManager::detailOrders()
     a.saveDetail(&number2);
     QVERIFY(cm->saveContact(&a));
     a = cm->contact(a.id());
-    
+
     details = a.details(QContactPhoneNumber::Type);
     QVERIFY(details.count() == 3);
     QVERIFY(details.at(0).value(QContactPhoneNumber::FieldContext) == QContactPhoneNumber::ContextHome);
@@ -2393,7 +2393,7 @@ void tst_QContactManager::detailOrders()
 
     //addresses
     QContactAddress address1, address2, address3;
-    
+
     address1.setStreet("Brandl St");
     address1.setRegion("Brisbane");
     address3 = address2 = address1;
@@ -2445,7 +2445,7 @@ void tst_QContactManager::detailOrders()
 
     QVERIFY(cm->saveContact(&a));
     a = cm->contact(a.id());
-    
+
     details = a.details(QContactEmailAddress::Type);
     QVERIFY(details.count() == 1);
     // Detail keys for the moment are not persistent through an contact save / fetch
@@ -2579,11 +2579,11 @@ void tst_QContactManager::relationships()
     }
 
     // Verify that we have relationship types. If there are none then the manager
-    // is saying it supports relationships but does not actually implement any 
+    // is saying it supports relationships but does not actually implement any
     // relationship type.
     QVERIFY(!availableRelationshipTypes.isEmpty());
 
-    // Some backends (eg. symbian) require that when type is "HasMember" 
+    // Some backends (eg. symbian) require that when type is "HasMember"
     // then "first" contact must be a group.
     if (availableRelationshipTypes.at(0) == QContactRelationship::HasMember()) {
         cm->removeContact(source.id());
@@ -2692,9 +2692,9 @@ void tst_QContactManager::relationships()
     if (availableRelationshipTypes.count() > 1) {
         QVERIFY(source.relatedContacts(availableRelationshipTypes.at(1), QContactRelationship::Second).contains(dest3));
         QVERIFY(source.relatedContacts(availableRelationshipTypes.at(1), QContactRelationship::First).isEmpty());
-        
+
         QVERIFY(dest2.relationships(availableRelationshipTypes.at(1)).isEmpty());
-        
+
         QVERIFY(!dest3.relationships(availableRelationshipTypes.at(0)).contains(customRelationshipTwo));
         QVERIFY(dest3.relationships(availableRelationshipTypes.at(1)).contains(customRelationshipTwo));
         QVERIFY(!dest3.relationships(availableRelationshipTypes.at(1)).contains(customRelationshipOne));
@@ -2723,7 +2723,7 @@ void tst_QContactManager::relationships()
     QContactRelationship br1, br2, br3;
     br1.setFirst(source);
     br1.setSecond(dest2);
-    br1.setRelationshipType(availableRelationshipTypes.at(0));    
+    br1.setRelationshipType(availableRelationshipTypes.at(0));
     br2.setFirst(source);
     br2.setSecond(dest3);
     br2.setRelationshipType(availableRelationshipTypes.at(0));
@@ -2745,7 +2745,7 @@ void tst_QContactManager::relationships()
     QVERIFY(batchRetrieve.contains(br1));
     QVERIFY(batchRetrieve.contains(br2));
     QVERIFY(batchRetrieve.contains(br3));
-    
+
     // remove a single relationship
     QVERIFY(cm->removeRelationship(br3));
     batchRetrieve = cm->relationships(source, QContactRelationship::First);
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
index 05d53a335..419c3899d 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
+++ b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
@@ -192,8 +192,8 @@ void tst_QContactManagerFiltering::initTestCase()
     managerNames.removeAll("teststaticdummy");
     managerNames.removeAll("maliciousplugin");
     // Symbiansim backend does not support the required details for these
-	// tests to pass. Symbiansim backend specific unit test tst_simcm is
-	// testing filtering instead.
+    // tests to pass. Symbiansim backend specific unit test tst_simcm is
+    // testing filtering instead.
     managerNames.removeAll("symbiansim");
 
     // Some internal engines on Maemo6
@@ -397,7 +397,7 @@ void tst_QContactManagerFiltering::detailStringFiltering_data()
             newMRow("Email == Aaron@Aaronson.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronson.com") << 0 << "a";
             newMRow("Email == Aaron@Aaronsen.com", manager) << manager << emailaddr << emailfield << QVariant("Aaron@Aaronsen.com") << 0 << es;
         }
-        
+
         // phone number
         if (manager->detailDefinitions().contains(QContactPhoneNumber::DefinitionName)) {
             newMRow("Phone number detail exists", manager) << manager << phonenumber << es << QVariant("") << 0 << "ab";
@@ -408,7 +408,7 @@ void tst_QContactManagerFiltering::detailStringFiltering_data()
             newMRow("Phone number = 555-1212, match phone number", manager) << manager << phonenumber << number << QVariant("555-1212") << (int) QContactFilter::MatchPhoneNumber << "a"; // hyphens will be ignored by the match algorithm
             newMRow("Phone number = 555, keypad collation", manager) << manager << phonenumber << number << QVariant("555") << (int) (QContactFilter::MatchKeypadCollation | QContactFilter::MatchStartsWith) << "ab";
         }
-        
+
         /* Converting other types to strings */
         QPair<QString, QString> defAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Integer");
         if (!defAndFieldNames.first.isEmpty() && !defAndFieldNames.second.isEmpty()) {
@@ -893,13 +893,13 @@ void tst_QContactManagerFiltering::rangeFiltering_data()
         newMRow("no min, cs, no results", manager) << manager << namedef << firstname << QVariant() << QVariant("Aardvark") << false << 0 << true << csflag << es;
         newMRow("no max, cs, badcase, all results", manager) << manager << namedef << firstname << QVariant("A") << QVariant() << false << 0 << true << csflag << "abcdefghijk";
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"no max, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"no max, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("no max, cs, badcase, some results", manager) << manager << namedef << firstname << QVariant("BOB") << QVariant() << false << 0 << true << csflag << "cdefghijk";
         newMRow("no max, cs, badcase, no results", manager) << manager << namedef << firstname << QVariant("XAMBEZI") << QVariant() << false << 0 << true << csflag << "hijk";
         newMRow("no min, cs, badcase, all results", manager) << manager << namedef << firstname << QVariant() << QVariant("XAMBEZI") << false << 0 << true << csflag << "abcdefg";
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"no min, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"no min, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("no min, cs, badcase, some results", manager) << manager << namedef << firstname << QVariant() << QVariant("BOB") << false << 0 << true << csflag << "ab";
         newMRow("no min, cs, badcase, no results", manager) << manager << namedef << firstname << QVariant() << QVariant("AARDVARK") << false << 0 << true << csflag << es;
@@ -2093,16 +2093,16 @@ void tst_QContactManagerFiltering::sorting_data()
         QPair<QString, QString> stringDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("String");
 
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"first ascending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"first ascending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("first ascending", manager) << manager << namedef << firstname << asc << false << 0 << cs << "abcdefghjik" << "efg";  // efg have the same first name
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"first descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"first descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("first descending", manager) << manager << namedef << firstname << desc << false << 0 << cs << "kijhefgdcba" << "efg";// efg have the same first name
         newMRow("last ascending", manager) << manager << namedef << lastname << asc << false << 0 << cs << "bacdefghijk" << "hijk";       // all have a well defined, sortable last name except hijk
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"last descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"last descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("last descending", manager) << manager << namedef << lastname << desc << false << 0 << cs << "gfedcabhijk" << "hijk";     // all have a well defined, sortable last name except hijk
         if (!integerDefAndFieldNames.first.isEmpty() && !integerDefAndFieldNames.second.isEmpty()) {
@@ -2118,7 +2118,7 @@ void tst_QContactManagerFiltering::sorting_data()
 
         newMRow("display label insensitive", manager) << manager << dldef << dlfld << asc << false << 0 << ci << "abcdefghjik" << "efghji";
 #ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"display label sensitive\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware"; 
+        qWarning() << "Test case \"display label sensitive\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
 #endif
         newMRow("display label sensitive", manager) << manager << dldef << dlfld << asc << false << 0 << cs << "abcdefghjik" << "efg";
     }
@@ -2132,14 +2132,14 @@ void tst_QContactManagerFiltering::sorting()
     QFETCH(int, directioni);
     QFETCH(bool, setbp);
     QFETCH(int, blankpolicyi);
-    QFETCH(int, casesensitivityi);    
+    QFETCH(int, casesensitivityi);
     QFETCH(QString, expected);
     QFETCH(QString, unstable);
 
     Qt::SortOrder direction = (Qt::SortOrder)directioni;
     QContactSortOrder::BlankPolicy blankpolicy = (QContactSortOrder::BlankPolicy) blankpolicyi;
     Qt::CaseSensitivity casesensitivity = (Qt::CaseSensitivity) casesensitivityi;
-    
+
     QList<QContactLocalId> contacts = contactsAddedToManagers.values(cm);
     QList<QContactLocalId> ids;
 
diff --git a/tests/auto/contacts/qdeclarativecontact/qdeclarativecontact.pro b/tests/auto/contacts/qdeclarativecontact/qdeclarativecontact.pro
index 6b6eaedd4..b8c99cd43 100644
--- a/tests/auto/contacts/qdeclarativecontact/qdeclarativecontact.pro
+++ b/tests/auto/contacts/qdeclarativecontact/qdeclarativecontact.pro
@@ -2,7 +2,7 @@ include(../../auto.pri)
 
 QT += contacts qml versit
 
-DEFINES+=IGNORE_METAOBJECTBUILDER_EXPORT 
+DEFINES+=IGNORE_METAOBJECTBUILDER_EXPORT
 
 HEADERS += ../../../src/import/contacts/qdeclarativecontactdetail_p.h\
            ../../../src/import/contacts/qdeclarativecontactrelationship_p.h\
@@ -41,13 +41,13 @@ HEADERS += ../../../src/import/contacts/qdeclarativecontactdetail_p.h\
            ../../../src/import/contacts/details/qdeclarativecontacthobby_p.h \
            ../../../src/import/contacts/filters/qdeclarativecontactactionfilter_p.h\
            ../../../src/import/contacts/filters/qdeclarativecontactintersectionfilter_p.h \
-           ../../../src/import/contacts/filters/qdeclarativecontactchangelogfilter_p.h	\
+           ../../../src/import/contacts/filters/qdeclarativecontactchangelogfilter_p.h  \
            ../../../src/import/contacts/filters/qdeclarativecontactinvalidfilter_p.h \
-           ../../../src/import/contacts/filters/qdeclarativecontactdetailfilter_p.h	\
+           ../../../src/import/contacts/filters/qdeclarativecontactdetailfilter_p.h     \
            ../../../src/import/contacts/filters/qdeclarativecontactidfilter_p.h \
            ../../../src/import/contacts/filters/qdeclarativecontactdetailrangefilter_p.h \
            ../../../src/import/contacts/filters/qdeclarativecontactrelationshipfilter_p.h \
-           ../../../src/import/contacts/filters/qdeclarativecontactfilters_p.h	 \
+           ../../../src/import/contacts/filters/qdeclarativecontactfilters_p.h   \
            ../../../src/import/contacts/filters/qdeclarativecontactunionfilter_p.h
 
 SOURCES += tst_qdeclarativecontact.cpp \
diff --git a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
index 7ed31a535..36148d83a 100644
--- a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
+++ b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
@@ -51,12 +51,12 @@
 
 #include "qdeclarativecontactmodel_p.h"
 #include "qdeclarativecontactsortorder_p.h"
-#include "qdeclarativecontact_p.h" 
-#include "qdeclarativecontactfilters_p.h" 
-#include "qdeclarativecontactdetails_p.h" 
-#include "qdeclarativecontactfetchhint_p.h" 
-#include "qdeclarativecontactrelationship_p.h" 
-#include "qdeclarativecontactrelationshipmodel_p.h" 
+#include "qdeclarativecontact_p.h"
+#include "qdeclarativecontactfilters_p.h"
+#include "qdeclarativecontactdetails_p.h"
+#include "qdeclarativecontactfetchhint_p.h"
+#include "qdeclarativecontactrelationship_p.h"
+#include "qdeclarativecontactrelationshipmodel_p.h"
 
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
diff --git a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
index bd6011a32..074c419ee 100644
--- a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
+++ b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
@@ -756,7 +756,7 @@ void tst_QOrganizerManager::add()
 {
     QFETCH(QString, uri);
     QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
-    
+
     // Use note & todo item depending on backend support
     QOrganizerItemType::ItemType type;
     if (cm->supportedItemTypes().contains(QOrganizerItemType::TypeNote))
@@ -780,7 +780,7 @@ void tst_QOrganizerManager::add()
 
     QOrganizerItem added = cm->item(item.id());
     QVERIFY(added.id() == item.id());
-    
+
     if (!isSuperset(added, item)) {
         // XXX TODO: fix the isSuperset so that it ignores timestamps.
         //dumpOrganizerItems(cm.data());
@@ -947,7 +947,7 @@ void tst_QOrganizerManager::persistence()
     cm->removeItems(cm->itemIds());
     QScopedPointer<QOrganizerManager> cm2(QOrganizerManager::fromUri(uri));
     QCOMPARE(cm->items().size(), 0);
-    
+
     // Add an event
     QOrganizerEvent event;
     event.setDisplayLabel(QStringLiteral("meeting"));
@@ -1312,7 +1312,7 @@ void tst_QOrganizerManager::addExceptionsWithGuid()
     exception.setGuid(QStringLiteral("halloween"));
     QVERIFY(!cm->saveItem(&exception));
     QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
-    
+
     // with the guid set, it should work
     exception.setId(QOrganizerItemId());
     exception.setGuid(QStringLiteral("christmas"));
@@ -1384,7 +1384,7 @@ void tst_QOrganizerManager::update()
 {
     QFETCH(QString, uri);
     QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
-    
+
     // Use note & todo item depending on backend support
     QOrganizerItemType::ItemType type;
     if (cm->supportedItemTypes().contains(QOrganizerItemType::TypeNote))
diff --git a/tests/auto/versit/qversitreader/tst_qversitreader.cpp b/tests/auto/versit/qversitreader/tst_qversitreader.cpp
index d97aa849e..14de7df9b 100644
--- a/tests/auto/versit/qversitreader/tst_qversitreader.cpp
+++ b/tests/auto/versit/qversitreader/tst_qversitreader.cpp
@@ -67,7 +67,7 @@ void tst_QVersitReader::init()
     mInputDevice = new QBuffer;
     mInputDevice->open(QBuffer::ReadWrite);
     mReader = new QVersitReader;
-#ifdef QT_BUILD_INTERNAL    
+#ifdef QT_BUILD_INTERNAL
     mReaderPrivate = new QVersitReaderPrivate;
 #endif
     mSignalCatcher = new SignalCatcher;
diff --git a/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp b/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp
index 0d993da4d..bd637554a 100644
--- a/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp
+++ b/tests/auto/versit/qversitwriter/tst_qversitwriter.cpp
@@ -214,9 +214,9 @@ END:VCARD\r\n");
     mOutputDevice->seek(0);
     QByteArray result(mOutputDevice->readAll());
     QCOMPARE(result, vCard30);
-    
+
     qApp->processEvents(); // clean up before we start sniffing signals
-    
+
     // Asynchronous writing
     mOutputDevice->reset();
     mSignalCatcher->mReceived.clear();
@@ -331,7 +331,7 @@ void tst_QVersitWriter::testWritingDocument_data()
             "FN:Bob\r\n"
             "END:VCARD\r\n"
             );
-    
+
     {
         QVersitDocument document(QVersitDocument::ICalendar20Type);
         document.setComponentType(QStringLiteral("VCALENDAR"));
diff --git a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
index 88b76c927..a55c8a634 100644
--- a/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
+++ b/tests/auto/versitorganizer/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
@@ -2032,7 +2032,7 @@ void tst_QVersitOrganizerImporter::testTimeZones_data()
             << vtimezone << QString::fromLatin1("20100102T100405")
             << QDateTime(QDate(2010, 1, 1), QTime(23, 4, 5), Qt::UTC);
     }
-    
+
     {
         QVersitDocument vtimezone(QVersitDocument::ICalendar20Type);
         vtimezone.setComponentType(QStringLiteral("VTIMEZONE"));
diff --git a/tests/system/qmlorganizer/contents/images/default.svg b/tests/system/qmlorganizer/contents/images/default.svg
index 248199cc4..c11497d03 100644
--- a/tests/system/qmlorganizer/contents/images/default.svg
+++ b/tests/system/qmlorganizer/contents/images/default.svg
@@ -21,7 +21,7 @@
     <radialGradient xlink:href="#linearGradient4032" id="radialGradient4020" cx="-33.519073" cy="-22.113297" fx="-33.519073" fy="-22.113297" r="9.5" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.487739,1.292402,-1.10267,0.497242,-41.77393,32.41492)"/>
     <radialGradient xlink:href="#linearGradient4083" id="radialGradient4081" cx="23.99999" cy="23.381506" fx="23.99999" fy="23.381506" r="19.141981" gradientTransform="matrix(1.006701,2.235326e-16,-2.23715e-16,1.007522,-0.160816,0.426981)" gradientUnits="userSpaceOnUse"/>
   </defs>
-  
+
   <metadata id="metadata1311">
     <rdf:RDF>
       <cc:Work rdf:about="">