198 files changed, 1831 insertions, 1971 deletions

diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro
index 2c44e56..a24a634 100644
--- a/demos/chip/chip.pro
+++ b/demos/chip/chip.pro
@@ -18,4 +18,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/chip
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/demobase.pri b/demos/demobase.pri
index 724f64b..9ec8fe9 100644
--- a/demos/demobase.pri
+++ b/demos/demobase.pri
@@ -1,6 +1,6 @@
 symbian {

-    RSS_RULES ="group_name=\"QtDemos\";" 

-    

+    RSS_RULES ="group_name=\"QtDemos\";"

+

     vendorinfo = \

         "; Localised Vendor name" \

         "%{\"Nokia, Qt Software\"}" \

diff --git a/demos/embedded/anomaly/src/Main.cpp b/demos/embedded/anomaly/src/Main.cpp
index d861857..6ab7403 100644
--- a/demos/embedded/anomaly/src/Main.cpp
+++ b/demos/embedded/anomaly/src/Main.cpp
@@ -51,4 +51,3 @@ int main(int argc, char *argv[])
 
     return app.exec();
 }
-
diff --git a/demos/embedded/desktopservices/contenttab.cpp b/demos/embedded/desktopservices/contenttab.cpp
index bdc5e03..e2618b0 100644
--- a/demos/embedded/desktopservices/contenttab.cpp
+++ b/demos/embedded/desktopservices/contenttab.cpp
@@ -53,32 +53,32 @@
 #include "contenttab.h"
 
 
-// CONSTRUCTORS & DESTRUCTORS  
-ContentTab::ContentTab(QWidget *parent) : 
-    QListWidget(parent)
-{             
+// CONSTRUCTORS & DESTRUCTORS
+ContentTab::ContentTab(QWidget *parent) :
+        QListWidget(parent)
+{
     setDragEnabled(false);
     setIconSize(QSize(45, 45));
 }
-        
-ContentTab::~ContentTab() 
+
+ContentTab::~ContentTab()
 {
 }
 
 // NEW PUBLIC METHODS
-void ContentTab::init(const QDesktopServices::StandardLocation &location, 
-                      const QString &filter, 
+void ContentTab::init(const QDesktopServices::StandardLocation &location,
+                      const QString &filter,
                       const QString &icon)
 {
     setContentDir(location);
     QStringList filterList;
     filterList = filter.split(";");
-    m_ContentDir.setNameFilters(filterList); 
-    setIcon(icon);    
-    
+    m_ContentDir.setNameFilters(filterList);
+    setIcon(icon);
+
     connect(this, SIGNAL(itemClicked(QListWidgetItem *)),
-            this, SLOT(openItem(QListWidgetItem *)));            
-    
+            this, SLOT(openItem(QListWidgetItem *)));
+
     populateListWidget();
 }
 
@@ -98,7 +98,7 @@ void ContentTab::populateListWidget()
     QFileInfoList fileList = m_ContentDir.entryInfoList(QDir::Files, QDir::Time);
     foreach(QFileInfo item, fileList) {
         new QListWidgetItem(m_Icon, itemName(item), this);
-    }   
+    }
 }
 
 QString ContentTab::itemName(const QFileInfo &item)
@@ -111,21 +111,21 @@ QUrl ContentTab::itemUrl(QListWidgetItem *item)
     return QUrl("file:///" + m_ContentDir.absolutePath() + "/" + item->text());
 }
 
-void ContentTab::keyPressEvent(QKeyEvent *event)  
+void ContentTab::keyPressEvent(QKeyEvent *event)
 {
-    switch(event->key()) {
+    switch (event->key()) {
     case Qt::Key_Up:
-        if(currentRow() == 0) {
-            setCurrentRow(count()-1);
+        if (currentRow() == 0) {
+            setCurrentRow(count() - 1);
         } else {
-            setCurrentRow(currentRow()-1);      
+            setCurrentRow(currentRow() - 1);
         }
         break;
     case Qt::Key_Down:
-        if(currentRow() == (count()-1)) {
-            setCurrentRow(0);   
+        if (currentRow() == (count() - 1)) {
+            setCurrentRow(0);
         } else {
-            setCurrentRow(currentRow()+1);      
+            setCurrentRow(currentRow() + 1);
         }
         break;
     case Qt::Key_Select:
@@ -138,15 +138,15 @@ void ContentTab::keyPressEvent(QKeyEvent *event)
 
 void ContentTab::handleErrorInOpen(QListWidgetItem *item)
 {
-    Q_UNUSED(item);    
-    QMessageBox::warning( this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close);
+    Q_UNUSED(item);
+    QMessageBox::warning(this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close);
 }
 
 // NEW SLOTS
 void ContentTab::openItem(QListWidgetItem *item)
 {
     bool ret = QDesktopServices::openUrl(itemUrl(item));
-    if(!ret)
+    if (!ret)
         handleErrorInOpen(item);
 }
 
diff --git a/demos/embedded/desktopservices/contenttab.h b/demos/embedded/desktopservices/contenttab.h
index 8d37209..21da07f 100644
--- a/demos/embedded/desktopservices/contenttab.h
+++ b/demos/embedded/desktopservices/contenttab.h
@@ -61,41 +61,41 @@ QT_END_NAMESPACE
 
 /**
 * ContentTab class.
-* 
+*
 * This class implements general purpose tab for media files.
 */
 class ContentTab : public QListWidget
 {
     Q_OBJECT
 
-public:         // Constructors & Destructors          
+public:         // Constructors & Destructors
     ContentTab(QWidget *parent);
     virtual ~ContentTab();
-    
+
 public:         // New Methods
-    virtual void init(const QDesktopServices::StandardLocation &location, 
-                      const QString &filter, 
-                      const QString &icon);    
-    
+    virtual void init(const QDesktopServices::StandardLocation &location,
+                      const QString &filter,
+                      const QString &icon);
+
 protected:      // New Methods
     virtual void setContentDir(const QDesktopServices::StandardLocation &location);
-    virtual void setIcon(const QString &icon);    
+    virtual void setIcon(const QString &icon);
     virtual void populateListWidget();
     virtual QString itemName(const QFileInfo &item);
     virtual QUrl itemUrl(QListWidgetItem *item);
     virtual void handleErrorInOpen(QListWidgetItem *item);
 protected:
-    void keyPressEvent(QKeyEvent *event);   
-    
+    void keyPressEvent(QKeyEvent *event);
+
 public slots:   // New Slots
-    virtual void openItem(QListWidgetItem *item);  
+    virtual void openItem(QListWidgetItem *item);
 
-protected:     // Owned variables   
+protected:     // Owned variables
     QDir m_ContentDir;
     QIcon m_Icon;
 };
 
 
-#endif // CONTENTTAB_H_    
+#endif // CONTENTTAB_H_
 
 // End of File
diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro
index 32cb6d9..32dfa40 100644
--- a/demos/embedded/desktopservices/desktopservices.pro
+++ b/demos/embedded/desktopservices/desktopservices.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = 
+TARGET =
 INCLUDEPATH += .
 
 HEADERS += desktopwidget.h contenttab.h linktab.h
@@ -18,6 +18,6 @@ DEPLOYMENT += music image
 include($$QT_SOURCE_TREE/demos/demobase.pri)
 
 symbian {
-    TARGET.UID3 = 0xA000C611 
+    TARGET.UID3 = 0xA000C611
     ICON = ./resources/heart.svg
 }
diff --git a/demos/embedded/desktopservices/desktopservices.qrc b/demos/embedded/desktopservices/desktopservices.qrc
index d36205d..410175f 100644
--- a/demos/embedded/desktopservices/desktopservices.qrc
+++ b/demos/embedded/desktopservices/desktopservices.qrc
@@ -1,8 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">  
-    <file>resources/music.png</file>    
-    <file>resources/photo.png</file>    
-    <file>resources/browser.png</file>  
-    <file>resources/message.png</file>                          
+<qresource prefix="/">
+    <file>resources/music.png</file>
+    <file>resources/photo.png</file>
+    <file>resources/browser.png</file>
+    <file>resources/message.png</file>
 </qresource>
 </RCC>
diff --git a/demos/embedded/desktopservices/desktopwidget.cpp b/demos/embedded/desktopservices/desktopwidget.cpp
index 3abe591..f3c02dc 100644
--- a/demos/embedded/desktopservices/desktopwidget.cpp
+++ b/demos/embedded/desktopservices/desktopwidget.cpp
@@ -51,40 +51,40 @@
 // CLASS HEADER
 #include "desktopwidget.h"
 
-// CONSTRUCTORS & DESTRUCTORS  
+// CONSTRUCTORS & DESTRUCTORS
 DesktopWidget::DesktopWidget(QWidget *parent) : QWidget(parent)
-    
+
 {
     QTabWidget *tabWidget = new QTabWidget(this);
 
     // Images
     ContentTab* imageTab = new ContentTab(tabWidget);
-    imageTab->init(QDesktopServices::PicturesLocation, 
+    imageTab->init(QDesktopServices::PicturesLocation,
                    "*.png;*.jpg;*.jpeg;*.bmp;*.gif",
                    ":/resources/photo.png");
-    tabWidget->addTab(imageTab, tr("Images")); 
-    
+    tabWidget->addTab(imageTab, tr("Images"));
+
     // Music
-    ContentTab* musicTab = new ContentTab(tabWidget);     
-    musicTab->init(QDesktopServices::MusicLocation, 
-                   "*.wav;*.mp3;*.mp4",        
-                   ":/resources/music.png");        
-    tabWidget->addTab(musicTab, tr("Music"));       
-    
+    ContentTab* musicTab = new ContentTab(tabWidget);
+    musicTab->init(QDesktopServices::MusicLocation,
+                   "*.wav;*.mp3;*.mp4",
+                   ":/resources/music.png");
+    tabWidget->addTab(musicTab, tr("Music"));
+
     // Links
-    LinkTab* othersTab = new LinkTab(tabWidget);;   
+    LinkTab* othersTab = new LinkTab(tabWidget);;
     // Given icon file will be overriden by LinkTab
-    othersTab->init(QDesktopServices::PicturesLocation, "", "");    
-    tabWidget->addTab(othersTab, tr("Links"));       
-    
+    othersTab->init(QDesktopServices::PicturesLocation, "", "");
+    tabWidget->addTab(othersTab, tr("Links"));
+
     // Layout
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(tabWidget);
-    setLayout(layout);     
+    setLayout(layout);
 }
-      
+
 DesktopWidget::~DesktopWidget()
 {
 }
-    
+
 // End of file
diff --git a/demos/embedded/desktopservices/desktopwidget.h b/demos/embedded/desktopservices/desktopwidget.h
index 246ab18..6b0af79 100644
--- a/demos/embedded/desktopservices/desktopwidget.h
+++ b/demos/embedded/desktopservices/desktopwidget.h
@@ -55,19 +55,19 @@ QT_END_NAMESPACE
 // CLASS DECLARATION
 /**
 * DesktopWidget class.
-* 
+*
 * Implements the main top level widget for QDesktopServices demo app.
 */
 class DesktopWidget : public QWidget
 {
-    Q_OBJECT        
-        
-public:        // Constructors & Destructors  
+    Q_OBJECT
+
+public:        // Constructors & Destructors
     DesktopWidget(QWidget *parent);
     ~DesktopWidget();
-   
+
 };
-    
-#endif // DESKTOPWIDGET_H_    
-    
+
+#endif // DESKTOPWIDGET_H_
+
 // End of file
diff --git a/demos/embedded/desktopservices/linktab.cpp b/demos/embedded/desktopservices/linktab.cpp
index 32411fe..67dbccf 100644
--- a/demos/embedded/desktopservices/linktab.cpp
+++ b/demos/embedded/desktopservices/linktab.cpp
@@ -50,7 +50,7 @@
 #include "linktab.h"
 
 LinkTab::LinkTab(QWidget *parent) :
-    ContentTab(parent)
+        ContentTab(parent)
 {
 }
 
@@ -66,9 +66,9 @@ void LinkTab::populateListWidget()
 
 QUrl LinkTab::itemUrl(QListWidgetItem *item)
 {
-    if(m_WebItem == item) {
+    if (m_WebItem == item) {
         return QUrl(tr("http://www.qtsoftware.com"));
-    } else if(m_MailToItem == item) {
+    } else if (m_MailToItem == item) {
         return QUrl(tr("mailto:qts60-feedback@trolltech.com?subject=QtS60 feedback&body=Hello"));
     } else {
         // We should never endup here
@@ -78,8 +78,8 @@ QUrl LinkTab::itemUrl(QListWidgetItem *item)
 }
 void LinkTab::handleErrorInOpen(QListWidgetItem *item)
 {
-    if(m_MailToItem == item) {
-        QMessageBox::warning( this, tr("Operation Failed"), tr("Please check that you have\ne-mail account defined."), QMessageBox::Close);
+    if (m_MailToItem == item) {
+        QMessageBox::warning(this, tr("Operation Failed"), tr("Please check that you have\ne-mail account defined."), QMessageBox::Close);
     } else {
         ContentTab::handleErrorInOpen(item);
     }
diff --git a/demos/embedded/desktopservices/linktab.h b/demos/embedded/desktopservices/linktab.h
index a9c9868..e44b785 100644
--- a/demos/embedded/desktopservices/linktab.h
+++ b/demos/embedded/desktopservices/linktab.h
@@ -57,30 +57,30 @@ QT_END_NAMESPACE
 
 /**
 * LinkTab class.
-* 
+*
 * This class implements tab for opening http and mailto links.
 */
 class LinkTab : public ContentTab
 {
     Q_OBJECT
-    
-public:     // Constructors & Destructors   
+
+public:     // Constructors & Destructors
     LinkTab(QWidget *parent);
-    ~LinkTab();    
-    
-protected:  // Derived Methods  
+    ~LinkTab();
+
+protected:  // Derived Methods
     virtual void populateListWidget();
-    virtual QUrl itemUrl(QListWidgetItem *item);    
+    virtual QUrl itemUrl(QListWidgetItem *item);
     virtual void handleErrorInOpen(QListWidgetItem *item);
-    
-private:    // Used variables  
+
+private:    // Used variables
     QListWidgetItem *m_WebItem;
-    QListWidgetItem *m_MailToItem; 
-    
-private:    // Owned variables      
-    
+    QListWidgetItem *m_MailToItem;
+
+private:    // Owned variables
+
 };
 
-#endif // CONTENTTAB_H_    
-    
+#endif // CONTENTTAB_H_
+
 // End of File
diff --git a/demos/embedded/desktopservices/main.cpp b/demos/embedded/desktopservices/main.cpp
index ebbcf63..0abfc78 100644
--- a/demos/embedded/desktopservices/main.cpp
+++ b/demos/embedded/desktopservices/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
     DesktopWidget* myWidget = new DesktopWidget(0);
-    myWidget->showMaximized(); 
-    
+    myWidget->showMaximized();
+
     return app.exec();
 }
 
diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 25904ef..a5e3465 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/embedded
 INSTALLS += sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index 51a04e7..3ce2fbf 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -9,7 +9,7 @@ RESOURCES += embeddedsvgviewer.qrc
 target.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.svg files
 sources.path = $$[QT_INSTALL_DEMOS]/embedded/embeddedsvgviewer
-INSTALLS += target sources 
+INSTALLS += target sources
 
 wince* {
    DEPLOYMENT_PLUGIN += qsvg
@@ -18,4 +18,3 @@ wince* {
 include($$QT_SOURCE_TREE/demos/demobase.pri)
 
 symbian:TARGET.UID3 = 0xA000A640
-
diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml
index f6bac67..95e96bd 100644
--- a/demos/embedded/fluidlauncher/config_s60/config.xml
+++ b/demos/embedded/fluidlauncher/config_s60/config.xml
@@ -13,7 +13,7 @@
     <example filename="fridgemagnets" name="Fridge Magnets" image="screenshots/fridgemagnets_s60.png" args="-small-screen"/>
     <example filename="drilldown" name="Drilldown" image="screenshots/drilldown_s60.png"/>
     <example filename="softkeys" name="Softkeys" image="screenshots/softkeys_s60.png"/>
-    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>    
+    <example filename="anomaly" name="Anomaly Browser" image="screenshots/anomaly_s60.png"/>
   </demos>
   <slideshow timeout="60000" interval="10000">
     <imagedir dir="slides"/>
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.pro b/demos/embedded/fluidlauncher/fluidlauncher.pro
index 0d83945..3eff37b 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.pro
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-TARGET = 
+TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
@@ -55,9 +55,9 @@ wince*{
     DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg
 }
 
-symbian {                    
+symbian {
     load(data_caging_paths)
-    
+
     TARGET.UID3 = 0xA000A641
 
     executables.sources = \
@@ -73,7 +73,7 @@ symbian {
         fridgemagnets.exe \
         drilldown.exe \
         softkeys.exe
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         executables.sources += anomaly.exe
         }
 
@@ -92,9 +92,9 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/drilldown_reg.rsc \
          $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
-        }                
+        }
 
     reg_resource.path = $$REG_RESOURCE_IMPORT_DIR
 
@@ -111,9 +111,9 @@ symbian {
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/drilldown.rsc \
          $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc
-    contains(QT_CONFIG, webkit) {        
+    contains(QT_CONFIG, webkit) {
         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
-        }           
+        }
 
     resource.path = $$APP_RESOURCE_DIR
 
@@ -134,9 +134,9 @@ symbian {
         $$PWD/../desktopservices/data/*.mp3 \
         $$PWD/../desktopservices/data/*.wav
     desktopservices_music.path = /data/sounds
-    
+
     desktopservices_images.sources = $$PWD/../desktopservices/data/*.png
-    desktopservices_images.path = /data/images    
+    desktopservices_images.path = /data/images
 
     saxbookmarks.sources = $$PWD/../../../examples/xml/saxbookmarks/frank.xbel
     saxbookmarks.sources += $$PWD/../../../examples/xml/saxbookmarks/jennifer.xbel
diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro
index 19b2ca8..0faa21f 100644
--- a/demos/interview/interview.pro
+++ b/demos/interview/interview.pro
@@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/interview
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro
index 6e7d784..87b42be 100644
--- a/demos/mainwindow/mainwindow.pro
+++ b/demos/mainwindow/mainwindow.pro
@@ -15,4 +15,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/mainwindow
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro
index 5cf251a..102b75d 100644
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/demos/spreadsheet/spreadsheet.pro
@@ -32,4 +32,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/spreadsheet
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro
index 6f15e70..8b29a45 100644
--- a/demos/textedit/textedit.pro
+++ b/demos/textedit/textedit.pro
@@ -20,4 +20,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/textedit
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro
index bf7017b..a4257cd 100644
--- a/demos/undo/undo.pro
+++ b/demos/undo/undo.pro
@@ -16,4 +16,3 @@ sources.path = $$[QT_INSTALL_DEMOS]/undo
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/demos/demobase.pri)
-
diff --git a/examples/draganddrop/dropsite/dropsite.pro b/examples/draganddrop/dropsite/dropsite.pro
index 268e247..a42f717 100644
--- a/examples/draganddrop/dropsite/dropsite.pro
+++ b/examples/draganddrop/dropsite/dropsite.pro
@@ -11,4 +11,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/dropsite
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
-
diff --git a/examples/draganddrop/fridgemagnets/dragwidget.cpp b/examples/draganddrop/fridgemagnets/dragwidget.cpp
index 81dbc00..92a6960 100644
--- a/examples/draganddrop/fridgemagnets/dragwidget.cpp
+++ b/examples/draganddrop/fridgemagnets/dragwidget.cpp
@@ -76,7 +76,7 @@ DragWidget::DragWidget(QWidget *parent)
 
 //! [2]
     #ifndef Q_WS_S60
-    //Fridge magnets is used for demoing Qt on S60 and themed backgrounds look better than white 
+    //Fridge magnets is used for demoing Qt on S60 and themed backgrounds look better than white
     QPalette newPalette = palette();
     newPalette.setColor(QPalette::Window, Qt::white);
     setPalette(newPalette);
diff --git a/examples/examplebase.pri b/examples/examplebase.pri
index 70e1c37..caaf819 100644
--- a/examples/examplebase.pri
+++ b/examples/examplebase.pri
@@ -1,6 +1,6 @@
 symbian {
-    RSS_RULES ="group_name=\"QtExamples\";" 
-    
+    RSS_RULES ="group_name=\"QtExamples\";"
+
     vendorinfo = \
         "; Localised Vendor name" \
         "%{\"Nokia, Qt Software\"}" \
@@ -10,4 +10,3 @@ symbian {
         " "
     default_deployment.pkg_prerules += vendorinfo
 }
- 
\ No newline at end of file
diff --git a/examples/network/ftp/ftpwindow.cpp b/examples/network/ftp/ftpwindow.cpp
index ffab8b4..b60da66 100644
--- a/examples/network/ftp/ftpwindow.cpp
+++ b/examples/network/ftp/ftpwindow.cpp
@@ -56,10 +56,10 @@ FtpWindow::FtpWindow(QWidget *parent)
     ftpServerLabel->setBuddy(ftpServerLineEdit);
 
     statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
-#ifdef Q_OS_SYMBIAN    
-    // Use word wrapping to fit the text on screen    
+#ifdef Q_OS_SYMBIAN
+    // Use word wrapping to fit the text on screen
     statusLabel->setWordWrap( true );
-#endif    
+#endif
 
     fileList = new QTreeWidget;
     fileList->setEnabled(false);
@@ -69,7 +69,7 @@ FtpWindow::FtpWindow(QWidget *parent)
 
     connectButton = new QPushButton(tr("Connect"));
     connectButton->setDefault(true);
-    
+
     cdToParentButton = new QPushButton;
     cdToParentButton->setIcon(QPixmap(":/images/cdtoparent.png"));
     cdToParentButton->setEnabled(false);
@@ -105,15 +105,15 @@ FtpWindow::FtpWindow(QWidget *parent)
     // Make app better lookin on small screen
     QHBoxLayout *topLayout2 = new QHBoxLayout;
     topLayout2->addWidget(cdToParentButton);
-    topLayout2->addWidget(connectButton);    
+    topLayout2->addWidget(connectButton);
 #endif
-    
+
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(topLayout);
-#ifdef Q_OS_SYMBIAN    
+#ifdef Q_OS_SYMBIAN
     // Make app better lookin on small screen
     mainLayout->addLayout(topLayout2);
-#endif    
+#endif
     mainLayout->addWidget(fileList);
     mainLayout->addWidget(statusLabel);
     mainLayout->addWidget(buttonBox);
@@ -161,7 +161,7 @@ void FtpWindow::connectOrDisconnect()
     setCursor(Qt::WaitCursor);
 #endif
 
-//![1]    
+//![1]
     ftp = new QFtp(this);
     connect(ftp, SIGNAL(commandFinished(int, bool)),
             this, SLOT(ftpCommandFinished(int, bool)));
diff --git a/examples/network/ftp/main.cpp b/examples/network/ftp/main.cpp
index f928bcb..978db0b 100644
--- a/examples/network/ftp/main.cpp
+++ b/examples/network/ftp/main.cpp
@@ -55,12 +55,12 @@ int main(int argc, char *argv[])
     // in order that user can access the downloaded content
     QDir::setCurrent( "c:\\data" );
 #endif
-    QApplication app(argc, argv);  
+    QApplication app(argc, argv);
     FtpWindow ftpWin;
-#ifdef Q_OS_SYMBIAN    
+#ifdef Q_OS_SYMBIAN
     // Make application better looking and more usable on small screen
     ftpWin.showMaximized();
-#else    
+#else
     ftpWin.show();
 #endif
     return ftpWin.exec();
diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h
index 74fe93a..c399b35 100644
--- a/examples/network/ftp/sym_iap_util.h
+++ b/examples/network/ftp/sym_iap_util.h
@@ -293,7 +293,7 @@ static QString qt_RouteInfoL() {
     return output;
 }
 
-QString qt_TDesC2QStringL(const TDesC& aDescriptor) 
+QString qt_TDesC2QStringL(const TDesC& aDescriptor)
 {
 #ifdef QT_NO_UNICODE
     return QString::fromLocal8Bit(aDescriptor.Ptr(), aDescriptor.Length());
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index 523dcf6..ea77946 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -28,5 +28,5 @@ symbian: {
      TARGET.UID3 = 0xA000A64E
      addFiles.sources = files\*.svg
      addFiles.path = .
-     DEPLOYMENT += addFiles     
+     DEPLOYMENT += addFiles
 }
diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro
index 7907bd2..1d0714b 100644
--- a/examples/sql/drilldown/drilldown.pro
+++ b/examples/sql/drilldown/drilldown.pro
@@ -1,7 +1,7 @@
 HEADERS = ../connection.h \
           imageitem.h \
           informationwindow.h \
-          view.h 
+          view.h
 RESOURCES = drilldown.qrc
 SOURCES = imageitem.cpp \
           informationwindow.cpp \
@@ -15,6 +15,6 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg imag
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown
 INSTALLS += target sources
 
-symbian:TARGET.UID3 = 0xA000C612 
+symbian:TARGET.UID3 = 0xA000C612
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
diff --git a/examples/sql/drilldown/informationwindow.cpp b/examples/sql/drilldown/informationwindow.cpp
index b01b753..8b5fd0c 100644
--- a/examples/sql/drilldown/informationwindow.cpp
+++ b/examples/sql/drilldown/informationwindow.cpp
@@ -101,9 +101,9 @@ InformationWindow::InformationWindow(int id, QSqlRelationalTableModel *offices,
     setWindowFlags(Qt::Window);
     enableButtons(false);
     setWindowTitle(tr("Office: %1").arg(locationText->text()));
-#ifndef Q_OS_SYMBIAN    
+#ifndef Q_OS_SYMBIAN
     resize(320, sizeHint().height());
-#endif    
+#endif
 }
 //! [4]
 
diff --git a/examples/sql/drilldown/main.cpp b/examples/sql/drilldown/main.cpp
index 432849d..57a11ed 100644
--- a/examples/sql/drilldown/main.cpp
+++ b/examples/sql/drilldown/main.cpp
@@ -54,10 +54,10 @@ int main(int argc, char *argv[])
         return 1;
 
     View view("offices", "images");
-#ifndef Q_OS_SYMBIAN    
+#ifndef Q_OS_SYMBIAN
     view.show();
-#else    
-    view.showFullScreen();    
-#endif        
+#else
+    view.showFullScreen();
+#endif
     return app.exec();
 }
diff --git a/examples/sql/drilldown/view.cpp b/examples/sql/drilldown/view.cpp
index e288ac6..349547a 100644
--- a/examples/sql/drilldown/view.cpp
+++ b/examples/sql/drilldown/view.cpp
@@ -62,15 +62,15 @@ View::View(const QString &offices, const QString &images, QWidget *parent)
 
     QGraphicsPixmapItem *logo = scene->addPixmap(QPixmap(":/logo.png"));
     logo->setPos(30, 515);
-    
+
 #ifndef Q_OS_SYMBIAN
     setMinimumSize(470, 620);
-    setMaximumSize(470, 620);    
+    setMaximumSize(470, 620);
 #else
-    setDragMode(QGraphicsView::ScrollHandDrag);  
-#endif    
+    setDragMode(QGraphicsView::ScrollHandDrag);
+#endif
 
-   setWindowTitle(tr("Offices World Wide"));   
+   setWindowTitle(tr("Offices World Wide"));
 }
 //! [1]
 
@@ -135,7 +135,7 @@ void View::showInformation(ImageItem *image)
         window->show();
 #else
         window->showFullScreen();
-#endif        
+#endif
     } else {
         InformationWindow *window;
         window = new InformationWindow(id, officeTable, this);
@@ -148,7 +148,7 @@ void View::showInformation(ImageItem *image)
         window->show();
 #else
         window->showFullScreen();
-#endif    
+#endif
         informationWindows.append(window);
     }
 }
diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp
index 110f2e6..d8ab09a 100644
--- a/examples/widgets/softkeys/softkeys.cpp
+++ b/examples/widgets/softkeys/softkeys.cpp
@@ -65,7 +65,7 @@ MainWindow::MainWindow(QWidget *parent)
 
     toggleButton = new QPushButton(tr("Custom softkeys"), this);
     toggleButton->setContextMenuPolicy(Qt::NoContextMenu);
-    toggleButton->setCheckable(true); 
+    toggleButton->setCheckable(true);
 
     pushButton = new QPushButton(tr("Open File Dialog"), this);
     pushButton->setContextMenuPolicy(Qt::NoContextMenu);
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 54c2872..3f4f8d4 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -86,11 +86,11 @@ CFLAGS      = $(CFLAGS) -DQMAKE_OPENSOURCE_EDITION
 QTOBJS= \
 	qbitarray.obj \
 	qbuffer.obj \
-        qcryptographichash.obj \
+	qcryptographichash.obj \
 	qfsfileengine.obj \
 	qfsfileengine_iterator.obj \
 	qbytearray.obj \
-        qvsnprintf.obj \
+	qvsnprintf.obj \
 	qbytearraymatcher.obj \
 	qdatetime.obj \
 	qdir.obj \
@@ -107,7 +107,7 @@ QTOBJS= \
 	qlistdata.obj \
 	qlinkedlist.obj \
 	qlocale.obj \
-        qmalloc.obj \
+	qmalloc.obj \
 	qmap.obj \
 	qregexp.obj \
 	qstring.obj \
@@ -119,9 +119,9 @@ QTOBJS= \
 	qsettings.obj \
 	qlibraryinfo.obj \
 	qvariant.obj \
-        qurl.obj \
+	qurl.obj \
 	qsettings_win.obj \
-        qmetatype.obj \
+	qmetatype.obj \
 	qnumeric.obj \
 	qscriptasm.obj \
 	qscriptast.obj \
@@ -179,7 +179,7 @@ clean::
 	-del qfsfileengine.obj
 	-del qfsfileengine_iterator.obj
 	-del qbytearray.obj
-        -del qvsnprintf.obj
+	-del qvsnprintf.obj
 	-del qbytearraymatcher.obj
 	-del qdatetime.obj
 	-del qdir.obj
@@ -207,9 +207,9 @@ clean::
 	-del qsettings.obj
 	-del qlibraryinfo.obj
 	-del qvariant.obj
-        -del qurl.obj
+	-del qurl.obj
 	-del qsettings_win.obj
-        -del qmetatype.obj
+	-del qmetatype.obj
 	-del project.obj
 	-del main.obj
 	-del makefile.obj
@@ -424,6 +424,7 @@ qmap.obj: $(SOURCE_PATH)\src\corelib\tools\qmap.cpp
 
 qunicodetables.obj: $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qunicodetables.cpp
+
 makefile.obj: $(SOURCE_PATH)/qmake/generators\makefile.cpp
 	$(CXX) $(CXXFLAGS) generators\makefile.cpp
 
@@ -464,7 +465,7 @@ symmake_sbsv2.obj: $(SOURCE_PATH)/qmake/generators/symbian/symmake_sbsv2.cpp
 	$(CXX) $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp
 
 initprojectdeploy_symbian.obj: $(SOURCE_PATH)/qmake/generators/symbian/initprojectdeploy_symbian.cpp
-        $(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
+	$(CXX) $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp
 
 md5.obj: $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
 	$(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\3rdparty\md5\md5.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index dd65145..03ca6dd 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -19,13 +19,13 @@ CFLAGS	    =	-c -o$@ -O \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
-	        -I$(BUILD_PATH)/include/QtScript \
+		-I$(BUILD_PATH)/include/QtScript \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-	       	-DQT_BOOTSTRAPPED
+		-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
+		-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+		-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =
 LIBS	    = -lole32 -luuid
@@ -50,7 +50,7 @@ QTOBJS= \
 	qbitarray.o \
 	qbuffer.o \
 	qbytearray.o \
-        qcryptographichash.o \
+	qcryptographichash.o \
 	qvsnprintf.o \
 	qbytearraymatcher.o \
 	qconfig.o \
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index 646815b..bd1b8b5 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -19,13 +19,13 @@ CFLAGS	    =	-c -o$@ -O \
 		-I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
 		-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore \
 		-I$(BUILD_PATH)/src/corelib/global \
-	        -I$(BUILD_PATH)/include/QtScript \
+		-I$(BUILD_PATH)/include/QtScript \
 		-I$(BUILD_PATH)/src/corelib/xml \
 		-I$(SOURCE_PATH)/mkspecs/win32-g++  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-	       	-DQT_BOOTSTRAPPED
+		-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
+		-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+		-DQT_BOOTSTRAPPED
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =
 LIBS	    = -lole32 -luuid
diff --git a/qmake/Makefile.win32-mwc b/qmake/Makefile.win32-mwc
index 08b6c49..b3b1b71 100644
--- a/qmake/Makefile.win32-mwc
+++ b/qmake/Makefile.win32-mwc
@@ -14,7 +14,7 @@ endif
 CXX	    =	mwccsym2
 CFLAGS	    =	-gccinc \
 		-w on -w nonotused -w nonotinlined -w noimplicit -w nopadding -w noemptydecl \
-                -w nounusedexpr -w nopossible -c -o $@ -O \
+		-w nounusedexpr -w nopossible -c -o $@ -O \
 		-I. -Igenerators -Igenerators\unix \
 		-Igenerators\win32 -Igenerators\mac \
 		-Igenerators\symbian \
@@ -23,8 +23,8 @@ CFLAGS	    =	-gccinc \
 		-I$(BUILD_PATH)\src\corelib\global \
 		-I$(SOURCE_PATH)\mkspecs\win32-mwc  \
 		-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-	       	-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
-	       	-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
+		-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DHAVE_QCONFIG_CPP \
+		-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
 		-DQT_NO_LIBRARY -I$(BUILD_PATH)\include\QtScript \
 		-I$(SOURCE_PATH)\corelib\xml -DQT_BOOTSTRAPPED
 
@@ -52,7 +52,7 @@ QTOBJS= \
 	qbitarray.o \
 	qbuffer.o \
 	qbytearray.o \
-        qcryptographichash.o \
+	qcryptographichash.o \
 	qvsnprintf.o \
 	qbytearraymatcher.o \
 	qconfig.o \
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5eaa39f..345f999 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -275,7 +275,7 @@ MakefileGenerator::initOutPaths()
                 int slash = path.lastIndexOf(Option::dir_sep);
                 if(slash != -1) {
                     path = path.left(slash);
-                    // Make out path only if it does not contains makefile variables
+                    // Make out path only if it does not contain makefile variables
                     if(!path.contains("${"))
                         if(path != "." &&
                            !mkdir(fileFixify(path, qmake_getpwd(), Option::output_dir)))
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 63b0f17..0b8fa17 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -420,8 +420,8 @@ SubdirsMetaMakefileGenerator::~SubdirsMetaMakefileGenerator()
     subs.clear();
 }
 
-class SymbianSubdirsMetaMakefileGenerator : public SubdirsMetaMakefileGenerator {
-
+class SymbianSubdirsMetaMakefileGenerator : public SubdirsMetaMakefileGenerator
+{
 public:
     SymbianSubdirsMetaMakefileGenerator(QMakeProject *p, const QString &n, bool op) : SubdirsMetaMakefileGenerator(p, n, op) { }
     virtual ~SymbianSubdirsMetaMakefileGenerator();
@@ -441,29 +441,23 @@ protected:
 
 private:
     QString cleanFromSpecialCharacters(QString& str);
-
 };
 
 QMap<QString, QString> SymbianSubdirsMetaMakefileGenerator::mmpPaths;
 
 QMultiMap<QString, QString> SymbianSubdirsMetaMakefileGenerator::mmpDependency;
 
-QStringList SymbianSubdirsMetaMakefileGenerator::getDependencyList(QString mmpFilename, int recursionDepth) {
-
+QStringList SymbianSubdirsMetaMakefileGenerator::getDependencyList(QString mmpFilename, int recursionDepth)
+{
     QStringList list;
 
-    // printf("Entering recursion mmpFilename = %s and depth = %d \n", qPrintable(mmpFilename), recursionDepth);
-
     QList<QString> values = mmpDependency.values(mmpFilename);
     if(recursionDepth < 0) {
-        // special case
-        // just first dependency level
+        // special case; just first dependency level
         list = values;
         return list;
-
     }
     if(values.size() == 0) {
-
         //reached recursion END condition
         if(recursionDepth == 0) {
             --recursionDepth;
@@ -477,16 +471,13 @@ QStringList SymbianSubdirsMetaMakefileGenerator::getDependencyList(QString mmpFi
     } else {
         recursionDepth++;
         for (int i = 0; i < values.size(); ++i) {
-               QString current = values.at(i);
-               QStringList tailList = getDependencyList(current, recursionDepth);
-               for(int j = 0; j < tailList.size(); ++j) {
-                   //QString path = mmpFilename + tailList.at(j);
-                   QString path = tailList.at(j);
-                   list.append(path);
-                   //printf("MMPDEPENDENCY:  %s\n", path.toAscii().data());
-               }// for(int j = 0; j < values.size(); ++j)
-               //list.append(current);
-        } // for (int i = 0; i < values.size(); ++i)
+            QString current = values.at(i);
+            QStringList tailList = getDependencyList(current, recursionDepth);
+            for(int j = 0; j < tailList.size(); ++j) {
+               QString path = tailList.at(j);
+               list.append(path);
+            }
+        }
 
         if(recursionDepth > 0) {
             //for mmp somewhere in middle
@@ -495,15 +486,17 @@ QStringList SymbianSubdirsMetaMakefileGenerator::getDependencyList(QString mmpFi
         recursionDepth--;
         return list;
     }
-
 }
+
 SymbianSubdirsMetaMakefileGenerator::~SymbianSubdirsMetaMakefileGenerator() { }
 
-bool SymbianSubdirsMetaMakefileGenerator::write(const QString &oldpwd) {
+bool SymbianSubdirsMetaMakefileGenerator::write(const QString &oldpwd)
+{
     return SubdirsMetaMakefileGenerator::write(oldpwd);
 }
 
-QString SymbianSubdirsMetaMakefileGenerator::cleanFromSpecialCharacters(QString& str) {
+QString SymbianSubdirsMetaMakefileGenerator::cleanFromSpecialCharacters(QString& str)
+{
     QString tmp = str;
 
     tmp.replace(QString("/"), QString("_"));
@@ -515,26 +508,14 @@ QString SymbianSubdirsMetaMakefileGenerator::cleanFromSpecialCharacters(QString&
     return tmp;
 }
 
-bool SymbianSubdirsMetaMakefileGenerator::init() {
-
+bool SymbianSubdirsMetaMakefileGenerator::init()
+{
     if(init_flag)
         return false;
 
     init_flag = true;
 
-    /*
-        Not neccessary as it was
-        causing second pass through
-        subdir elements
-
-        SubdirsMetaMakefileGenerator::init();
-    */
-
-    /*
-        if we are here then we have template = subdirs
-
-        so...   go for it ...
-    */
+    // If we are here then we have template == subdirs
 
     Option::recursive = true;
 
@@ -577,7 +558,6 @@ bool SymbianSubdirsMetaMakefileGenerator::init() {
             if(subdir.isDir()) {
                 subdir = QFileInfo(subdir.filePath() + "/" + subdir.fileName() + Option::pro_ext);
                 childMmpFilename = subdir.fileName();
-                // TODO: create Option::mmp_ext
                 childMmpFilename = subdir.absoluteFilePath();
                 childMmpFilename.replace(Option::pro_ext, QString(""));
                 childMmpFilename.append(".mmp");
@@ -599,7 +579,7 @@ bool SymbianSubdirsMetaMakefileGenerator::init() {
             if(subdir.isRelative() && old_output_dir != oldpwd) {
                 sub->output_dir = old_output_dir + "/" + subdir.path();
                 printf("Reading %s [%s]\n", subdir.absoluteFilePath().toLatin1().constData(), sub->output_dir.toLatin1().constData());
-            } else { //what about shadow builds?
+            } else {
                 sub->output_dir = sub->input_dir;
                 printf("Reading %s\n", subdir.absoluteFilePath().toLatin1().constData());
             }
@@ -654,10 +634,8 @@ bool SymbianSubdirsMetaMakefileGenerator::init() {
     Subdir *self = new Subdir;
     self->input_dir = qmake_getpwd();
 
-    // to fully expand find all dependencies
-    // do as recursion, then
-    // insert result
-    // as subdirs data in project
+    // To fully expand find all dependencies:
+    // Do as recursion, then insert result as subdirs data in project
     QString newpwd = qmake_getpwd();
     if(!newpwd.endsWith('/'))
         newpwd += '/';
@@ -667,7 +645,7 @@ bool SymbianSubdirsMetaMakefileGenerator::init() {
     mmpFilename.prepend(newpwd);
     mmpFilename = mmpFilename.append(".mmp");
 
-    // map mmpfile to its absolut filepath
+    // map mmpfile to its absolute filepath
     mmpPaths.insert(mmpFilename, newpwd);
 
     QStringList directDependencyList = getDependencyList(mmpFilename, -1);
@@ -676,27 +654,14 @@ bool SymbianSubdirsMetaMakefileGenerator::init() {
     }
 
     QStringList dependencyList = getDependencyList(mmpFilename, 0);
-/*
-    printf("\n \n PRINTING DEPENDENCY FOR: %s \n", mmpFilename.toAscii().data());
-    // print it for debug
-    for(int i = 0; i < dependencyList.size(); ++i) {
-        printf("FINAL MMP DEPENDENCIES: %s\n", dependencyList.at(i).toAscii().data());
-    }
-    printf("\n \n");
 
-    printf("\n \n PRINTING DIRECT DEPENDENCY FOR: %s \n", mmpFilename.toAscii().data());
-    // print it for debug
-    for(int i = 0; i < directDependencyList.size(); ++i) {
-        printf("DIRECT MMP DEPENDENCIES: %s\n", directDependencyList.at(i).toAscii().data());
-    }
-    printf("\n \n");
-*/
     self->output_dir = Option::output_dir;
     if(!Option::recursive || (!Option::output.fileName().endsWith(Option::dir_sep) && !QFileInfo(Option::output).isDir()))
 	self->output_file = Option::output.fileName();
     self->makefile = new BuildsMetaMakefileGenerator(project, name, false);
     self->makefile->init();
     subs.append(self);
+
     return true;
 }
 
@@ -714,7 +679,6 @@ QStringList SymbianSubdirsMetaMakefileGenerator::calculateRelativePaths(QString
                 mmpRelativePaths.append(childDir);
             else
                 directory.relativeFilePath(relativePath);
-            //mmpRelativePaths.append(directory.relativeFilePath(childDir) + "/" + mmpChildren.at(i));
         }
     }
     return mmpRelativePaths;
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 22e4aad..8e3e20b 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -118,9 +118,7 @@ void initProjectDeploySymbian(QMakeProject* project,
     }
     QString deploymentDrive = targetPathHasDriveLetter ? targetPath.left(2) : QLatin1String("c:");
 
-    // foreach item in DEPLOYMENT
     foreach(QString item, project->values("DEPLOYMENT")) {
-        // get item.path
         QString devicePath = project->first(item + ".path");
         if (!deployBinaries
             && !devicePath.isEmpty()
@@ -172,7 +170,6 @@ void initProjectDeploySymbian(QMakeProject* project,
                 continue;
             }
 
-        // foreach d in item.sources
         foreach(QString source, project->values(item + ".sources")) {
             source = Option::fixPathToLocalOS(source);
             QString nameFilter;
@@ -216,7 +213,7 @@ void initProjectDeploySymbian(QMakeProject* project,
             QDirIterator iterator(searchPath, QStringList() << nameFilter
                                   , QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks
                                   , dirSearch ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags );
-            // foreach dirIterator-entry in d
+
             while(iterator.hasNext()) {
                 iterator.next();
                 QFileInfo iteratorInfo(iterator.filePath());
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index c842b0e..1f22c70 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -146,7 +146,8 @@ QString SymbianMakefileGenerator::canonizePath(const QString& origPath)
 SymbianMakefileGenerator::SymbianMakefileGenerator() : MakefileGenerator() { }
 SymbianMakefileGenerator::~SymbianMakefileGenerator() { }
 
-void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
+void SymbianMakefileGenerator::writeHeader(QTextStream &t)
+{
     t << "// ============================================================================" << endl;
     t << "// * Makefile for building: " << escapeFilePath(var("TARGET")) << endl;
     t << "// * Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
@@ -155,13 +156,10 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
     t << "// * user." << endl;
     t << "// * Project:  " << fileFixify(project->projectFile()) << endl;
     t << "// * Template: " << var("TEMPLATE") << endl;
-    //if(!project->isActiveConfig("build_pass"))
-    //    t << "// = Command: " << build_args().replace("$(QMAKE)",
-    //                  (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE"))) << endl;
     t << "// ============================================================================" << endl;
     t << endl;
 
-    // defining define for bld.inf
+    // Defining define for bld.inf
 
     QString shortProFilename = project->projectFile();
     shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
@@ -177,7 +175,8 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t) {
     t << "#define " << bldinfDefine.toUpper() << endl << endl;
 }
 
-bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) {
+bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
+{
     writeHeader(t);
 
     QString numberOfIcons;
@@ -268,7 +267,8 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile) {
+bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile)
+{
     QString build = ( config == "udeb" ) ? "debug" : "release";
     QString pkgFilename = QString("%1_%2-%3.%4")
                           .arg(fileInfo(project->projectFile()).completeBaseName())
@@ -281,15 +281,15 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
 
     generatedFiles << pkgFile.fileName();
 
-    //   header info
+    // Header info
     QTextStream t(&pkgFile);
     t << QString("; %1 generated by qmake at %2").arg(pkgFilename).arg(QDateTime::currentDateTime().toString(Qt::ISODate))  << endl;
     t << "; This file is generated by qmake and should not be modified by the user" << endl;
     t << ";" << endl << endl;
-    
+
     // Construct QStringList from pkg_prerules since we need search it before printed to file
     QStringList rawPkgPreRules;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {       
+    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
         foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_prerules")) {
             QStringList pkgrulesValue = project->values(pkgrulesItem);
             // If there is no stringlist defined for a rule, use rule name directly
@@ -300,20 +300,20 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
                 foreach(QString pkgrule, pkgrulesValue) {
                     rawPkgPreRules << pkgrule;
                 }
-            }         
+            }
         }
-    }       
+    }
 
     // Apply some defaults if specific data does not exist in PKG pre-rules
-    
-    if(!containsStartWithItem('&', rawPkgPreRules)) {   
+
+    if(!containsStartWithItem('&', rawPkgPreRules)) {
         // language, (*** hardcoded to english atm, should be parsed from TRANSLATIONS)
         t << "; Language" << endl;
         t << "&EN" << endl << endl;
     } else {
         // In case user defines langs, he must take care also about SIS header
         if(!containsStartWithItem('#', rawPkgPreRules))
-            fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");    
+            fprintf(stderr, "Warning: If language is defined with DEPLOYMENT pkg_prerules, also the SIS header must be defined\n");
     }
 
     // name of application, UID and version
@@ -321,39 +321,39 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
     int last = applicationName.lastIndexOf(QLatin1Char('/'));
     applicationName = applicationName.mid( last == -1 ? 0 : last+1 );
     QString applicationVersion = project->first("VERSION").isEmpty() ? "1,0,0" : project->first("VERSION").replace('.', ',');
-    
-    if(!containsStartWithItem('#', rawPkgPreRules)) {        
+
+    if(!containsStartWithItem('#', rawPkgPreRules)) {
         t << "; SIS header: name, uid, version" << endl;
         t << QString("#{\"%1\"},(%2),%3").arg(applicationName).arg(uid3).arg(applicationVersion) << endl << endl;
     }
 
     // Localized vendor name
     if(!containsStartWithItem('%', rawPkgPreRules)) {
-        t << "; Localised Vendor name" << endl;    
-        t << "%{\"Vendor\"}" << endl << endl;        
+        t << "; Localised Vendor name" << endl;
+        t << "%{\"Vendor\"}" << endl << endl;
     }
-    
+
     // Unique vendor name
-    if(!containsStartWithItem(':', rawPkgPreRules)) {      
+    if(!containsStartWithItem(':', rawPkgPreRules)) {
         t << "; Unique Vendor name" << endl;
         t << ":\"Vendor\"" << endl << endl;
     }
 
     // PKG pre-rules - these are added before actual file installations i.e. SISX package body
     if(rawPkgPreRules.size()) {
-        t << "; Manual PKG pre-rules from PRO files" << endl;     
+        t << "; Manual PKG pre-rules from PRO files" << endl;
         foreach(QString item, rawPkgPreRules) {
             t << item << endl;
         }
-        t << endl;          
-    }          
+        t << endl;
+    }
 
-    // install paths on the phone *** should be dynamic at some point
+    // Install paths on the phone *** should be dynamic at some point
     QString installPathBin = "!:\\sys\\bin";
     QString installPathResource = "!:\\resource\\apps";
     QString installPathRegResource = "!:\\private\\10003a3f\\import\\apps";
 
-    // find location of builds
+    // Find location of builds
     QString epocReleasePath = QString("%1epoc32/release/%2/%3")
                               .arg(epocRoot())
                               .arg(compiler)
@@ -409,15 +409,15 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
              .arg(QString(depList.at(i).from).replace('\\','/'))
              .arg(depList.at(i).to) << endl;
     }
-    t << endl;     
-    
-    // PKG post-rules - these are added after actual file installations i.e. SISX package body
+    t << endl;
+
+    // PKG post-rules - these are added after actual file installations i.e. SIS package body
     t << "; Manual PKG post-rules from PRO files" << endl;
-    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {       
+    foreach(QString deploymentItem, project->values("DEPLOYMENT")) {
         foreach(QString pkgrulesItem, project->values(deploymentItem + ".pkg_postrules")) {
             QStringList pkgrulesValue = project->values(pkgrulesItem);
             // If there is no stringlist defined for a rule, use rule name directly
-            // This is convenience for defining single line mmp statements
+            // This is convenience for defining single line statements
             if (pkgrulesValue.isEmpty()){
                 t << pkgrulesItem << endl;
             } else {
@@ -425,9 +425,9 @@ bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QS
                     t << pkgrule << endl;
                 }
             }
-            t << endl;            
+            t << endl;
         }
-    }      
+    }
 
     return true;
 }
@@ -444,7 +444,8 @@ bool SymbianMakefileGenerator::containsStartWithItem(const QChar &c, const QStri
      return result;
 }
 
-bool SymbianMakefileGenerator::writeCustomDefFile() {
+bool SymbianMakefileGenerator::writeCustomDefFile()
+{
     if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
         // Create custom def file for plugin
         QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
@@ -482,10 +483,7 @@ bool SymbianMakefileGenerator::writeCustomDefFile() {
 void SymbianMakefileGenerator::init()
 {
     MakefileGenerator::init();
-/*
-    DUMP_VAR("GENERATED_SOURCES");
-*/
-    // fixing again !!!
+
     if(0 != project->values("QMAKE_PLATFORM").size())
         platform = varGlue("QMAKE_PLATFORM", "", " ", "");
 
@@ -502,29 +500,25 @@ void SymbianMakefileGenerator::init()
     // .mmp
     initMmpVariables();
 
-    // UID1
-    uid1 = generateUID1();
-
-    // check TARGET.UID2 and TARGET.UID3 presence
+    // Check TARGET.UID2 and TARGET.UID3 presence
     if(0 != project->values("TARGET.UID3").size()) {
         uid3 = project->first("TARGET.UID3");
     } else {
         uid3 = generateUID3();
     }
 
-    // some fix
     if((project->values("TEMPLATE")).contains("app"))
         targetType = "exe";
     else if((project->values("TEMPLATE")).contains("lib")) {
-        // check CONFIG to see if we are to build staticlib or dll
+        // Check CONFIG to see if we are to build staticlib or dll
         if(project->values("CONFIG").contains("staticlib") || project->values("CONFIG").contains("static"))
             targetType = "staticlib";
         else if (project->values("CONFIG").contains("plugin"))
             targetType = "plugin";
-        else // for now it will be default
+        else
             targetType = "dll";
     }
-    else // fix
+    else
         targetType = "subdirs";
 
     if(0 != project->values("TARGET.UID2").size()) {
@@ -534,11 +528,10 @@ void SymbianMakefileGenerator::init()
     } else {
         if(getTargetExtension() == "exe") {
             if(project->values("QT").contains("gui", Qt::CaseInsensitive)) {
-                // exe and also gui
+                // exe and gui -> uid2 needed
                 uid2 = "0x100039CE";
             } else {
-                // exe but not gui.. uid2 is ignored anyway
-                // set it to 0
+                // exe but not gui: uid2 is ignored anyway -> set it to 0
                 uid2 = "0";
             }
         } else if(getTargetExtension() == "dll" || getTargetExtension() == "lib") {
@@ -563,7 +556,8 @@ void SymbianMakefileGenerator::init()
     }
 }
 
-QString SymbianMakefileGenerator::getTargetExtension() {
+QString SymbianMakefileGenerator::getTargetExtension()
+{
     QString ret;
     if(targetType.compare("exe", Qt::CaseInsensitive) == 0 || targetType.compare("app", Qt::CaseInsensitive) == 0) {
         ret.append("exe");
@@ -572,41 +566,30 @@ QString SymbianMakefileGenerator::getTargetExtension() {
     } else if (targetType.compare("dll", Qt::CaseInsensitive) == 0 || targetType.compare("plugin", Qt::CaseInsensitive) == 0) {
         ret.append("dll");
     } else if (targetType.compare("subdirs", Qt::CaseInsensitive) == 0) {
-        // just fix
         ret.append("subdirs");
     } else {
-        // if nothing said then assume "exe"
+        // If nothing else set, default to exe
         ret.append("exe");
     }
 
     return ret;
 }
 
-bool SymbianMakefileGenerator::isConfigSetToSymbian() {
+bool SymbianMakefileGenerator::isConfigSetToSymbian()
+{
     return project->values("CONFIG").contains("symbian", Qt::CaseInsensitive);
 }
 
-QString SymbianMakefileGenerator::generateUID1() {
-    // just for now
-    return QString("");
-}
-
-QString SymbianMakefileGenerator::generateUID2() {
-    // standard stuff; picked form symbian
-    // later meybe read from somewhere
-    return QString("");
-}
-
-QString SymbianMakefileGenerator::generateUID3() {
-
+QString SymbianMakefileGenerator::generateUID3()
+{
     QString target = project->first("TARGET");
     QString currPath = qmake_getpwd();
     target.prepend("/").prepend(currPath);
     return generate_test_uid(target);
-
 }
 
-bool SymbianMakefileGenerator::initMmpVariables() {
+bool SymbianMakefileGenerator::initMmpVariables()
+{
     QStringList sysincspaths;
     QStringList srcincpaths;
     QStringList srcpaths;
@@ -655,9 +638,7 @@ bool SymbianMakefileGenerator::initMmpVariables() {
             appendIfnotExist(sysincspaths, includepath + QString("/" QT_EXTRA_INCLUDE_DIR));
     }
 
-    // remove duplicate include path entries
-    // convert to native directory separators
-    // to check if includepaths are same
+    // Remove duplicate include path entries
     QStringList temporary;
     for(int i = 0; i < sysincspaths.size(); ++i) {
         QString origPath = sysincspaths.at(i);
@@ -671,7 +652,7 @@ bool SymbianMakefileGenerator::initMmpVariables() {
             if(origPathInfo.absoluteFilePath() == tmpPathInfo.absoluteFilePath()) {
                 bFound = true;
                 if(!tmpPathInfo.isRelative() && origPathInfo.isRelative()) {
-                    // we keep the relative notation
+                    // We keep the relative notation
                     temporary.removeOne(tmpPath);
                     temporary << origPath;
                 }
@@ -691,8 +672,8 @@ bool SymbianMakefileGenerator::initMmpVariables() {
     return true;
 }
 
-bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList) {
-
+bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList)
+{
     QStringList tmpStringList;
 
     for(int i = 0; i < stringList.size(); ++i) {
@@ -708,7 +689,8 @@ bool SymbianMakefileGenerator::removeDuplicatedStrings(QStringList& stringList)
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t){
+bool SymbianMakefileGenerator::writeMmpFileHeader(QTextStream &t)
+{
     t << "// ==============================================================================" << endl;
     t << "// Generated by qmake (" << qmake_version() << ") (Qt " << QT_VERSION_STR << ") on: ";
     t << QDateTime::currentDateTime().toString(Qt::ISODate) << endl;
@@ -726,8 +708,6 @@ bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symb
     if(ft.open(QIODevice::WriteOnly)) {
         generatedFiles << ft.fileName();
 
-        //printf("WRITING: %s \n", qPrintable(filename));
-
         QTextStream t(&ft);
 
         writeMmpFileHeader(t);
@@ -775,8 +755,8 @@ bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symb
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t) {
-
+bool SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t)
+{
     t << endl;
 
     if(isConfigSetToSymbian())
@@ -804,32 +784,34 @@ bool SymbianMakefileGenerator::writeMmpFileMacrosPart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::addMacro(QTextStream& t, const QString& value) {
+bool SymbianMakefileGenerator::addMacro(QTextStream& t, const QString& value)
+{
      t << "MACRO" << "\t\t" <<  value << endl;
      return true;
 }
 
 
-bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t)
+{
     if(getTargetExtension() == "exe") {
         t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << "\n";
         if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
             t << "TARGETTYPE" << "\t\t" << "STDEXE" << endl;
         else
             t << "TARGETTYPE" << "\t\t" << "EXE" << endl;
-    }  else if (getTargetExtension() == "dll"){
+    } else if (getTargetExtension() == "dll"){
         t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".dll")) << "\n";
         if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
             t << "TARGETTYPE" << "\t\t" << "STDDLL" << endl;
         else
             t << "TARGETTYPE" << "\t\t" << "DLL" << endl;
-    }   else if (getTargetExtension() == "lib"){
+    } else if (getTargetExtension() == "lib"){
         t << "TARGET" << "\t\t" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".lib")) << "\n";
         if (project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive))
             t << "TARGETTYPE" << "\t\t" << "STDLIB" << endl;
         else
             t << "TARGETTYPE" << "\t\t" << "LIB" << endl;
-    }   else {
+    } else {
         printf("unexpected target and targettype %s\n", getTargetExtension().toAscii().data());
     }
 
@@ -846,7 +828,7 @@ bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
             t << "SECUREID" << "\t\t" << uid3 << endl;
     }
 
-    // default value used from mkspecs..qconfig.h is 0
+    // default value used from mkspecs is 0
     if(0 != project->values("TARGET.VID").size()) {
         t << "VENDORID" << "\t\t" << project->values("TARGET.VID").join(" ") << endl;
     }
@@ -861,7 +843,7 @@ bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
         t << "EPOCALLOWDLLDATA" << endl;
 
     if(targetType.compare("plugin", Qt::CaseInsensitive) == 0 && !project->values("CONFIG").contains("stdbinary", Qt::CaseInsensitive)) {
-        // use custom def file for Qt plugins
+        // Use custom def file for Qt plugins
         t << "DEFFILE " PLUGIN_COMMON_DEF_FILE_FOR_MMP << endl;
     }
 
@@ -872,12 +854,11 @@ bool SymbianMakefileGenerator::writeMmpFileTargetPart(QTextStream& t) {
 
 
 /*
-    Application registration resource files
-    should be installed to the
-
+    Application registration resource files should be installed to the
     \private\10003a3f\import\apps directory.
 */
-bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes) {
+bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringList &symbianLangCodes)
+{
     if((getTargetExtension() == "exe") &&
         !project->values("CONFIG").contains("no_icon", Qt::CaseInsensitive)) {
         QString target = escapeFilePath(fileFixify(project->first("TARGET")));
@@ -897,15 +878,10 @@ bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringL
         t << "TARGETPATH\t\t\t" RESOURCE_DIRECTORY_MMP<< endl;
         t << "END" << endl << endl;
 
-        // now append extension
         QString regTarget = target;
         regTarget.append("_reg.rss");
-        // must state SOURCEPATH for resources
-        // relative placement (relative to dir where .mmp located)
-        // absolute placement (!RELATIVE! to EPOCROOT dir)
-
 
-        t << "SOURCEPATH\t\t\t. " << endl;
+        t << "SOURCEPATH\t\t\t." << endl;
         t << "START RESOURCE\t\t" << regTarget << endl;
         if (isForSymbianSbsv2())
             t << "DEPENDS " << target << ".rsg" << endl;
@@ -915,7 +891,8 @@ bool SymbianMakefileGenerator::writeMmpFileResourcePart(QTextStream& t, QStringL
      return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t)
+{
 
     QDir current = QDir::current();
 
@@ -932,14 +909,16 @@ bool SymbianMakefileGenerator::writeMmpFileSystemIncludePart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileIncludePart(QTextStream& t)
+{
 
     writeMmpFileSystemIncludePart(t);
 
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t)
+{
     QStringList &libs = project->values("LIBS");
     libs << project->values("QMAKE_LIBS");
 
@@ -947,8 +926,7 @@ bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
 
     for(int i = 0; i < libs.size(); ++i) {
         QString lib = libs.at(i);
-        // The -L flag is uninteresting, since all symbian libraries exist in the
-        // same directory.
+        // The -L flag is uninteresting, since all symbian libraries exist in the same directory.
         if(lib.startsWith("-l")) {
             lib.remove(0,2);
             QString mmpStatement;
@@ -961,7 +939,7 @@ bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
             } else {
                 // Hacky way to find out what kind of library it is. Check the
                 // ARMV5 build directory for library type. We default to shared
-                // library, since that is probably more common.
+                // library, since that is more common.
                 QString udebStaticLibLocation(epocRoot());
                 QString urelStaticLibLocation(udebStaticLibLocation);
                 udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib);
@@ -981,7 +959,8 @@ bool SymbianMakefileGenerator::writeMmpFileLibraryPart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t)
+{
     if(0 != project->first("TARGET.CAPABILITY").size()) {
         QStringList &capabilities = project->values("TARGET.CAPABILITY");
         t << "CAPABILITY" << "\t\t";
@@ -999,7 +978,8 @@ bool SymbianMakefileGenerator::writeMmpFileCapabilityPart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t)
+{
     QString cw, armcc;
 
     if(0 != project->values("QMAKE_CXXFLAGS.CW").size()) {
@@ -1045,13 +1025,13 @@ bool SymbianMakefileGenerator::writeMmpFileCompilerOptionPart(QTextStream& t) {
         t << "OPTION" << '\t' << " CW " << cw <<  endl;
     if (!armcc.isEmpty())
         t << "OPTION" << '\t' << " ARMCC "<< armcc <<  endl;
-    // others to come
 
     t <<  endl;
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t)
+{
     QString applicationVersion = project->first("VERSION");
     QStringList verNumList = applicationVersion.split('.');
     uint major = 0;
@@ -1088,7 +1068,8 @@ bool SymbianMakefileGenerator::writeMmpFileBinaryVersionPart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t) {
+bool SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t)
+{
     foreach(QString item, project->values("MMP_RULES")) {
         t << endl;
         // If there is no stringlist defined for a rule, use rule name directly
@@ -1104,7 +1085,8 @@ bool SymbianMakefileGenerator::writeMmpFileRulesPart(QTextStream& t) {
     return true;
 }
 
-bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension) {
+bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploymentExtension)
+{
     // Read user defined bld inf rules
     QMap<QString, QStringList> userBldInfRules;
     for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
@@ -1146,7 +1128,7 @@ bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
     removeDuplicatedStrings(mmpProjects);
     removeDuplicatedStrings(shadowProjects);
 
-    // go in reverse order ... as that is the way how I build the list
+    // Go in reverse order as that is the way how we build the list
     QListIterator<QString> iT(mmpProjects);
     iT.toBack();
     while(iT.hasPrevious()) {
@@ -1167,10 +1149,9 @@ bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
             relativePath = directory.relativeFilePath(fullProFilename);
             bldinfFilename = BLD_INF_FILENAME "." + cleanMmpName;
             if(relativePath.contains("/")) {
-                // shadow .pro not in same
-                // directory as parent .pro
+                // Shadow .pro not in same directory as parent .pro
                 if(relativePath.startsWith("..")) {
-                    // shadow .pro out of parent .pro
+                    // Shadow .pro out of parent .pro
                     relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
                     bldinfFilename.prepend("/").prepend(relativePath);
                 } else {
@@ -1178,11 +1159,10 @@ bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
                     bldinfFilename.prepend("/").prepend(relativePath);
                 }
             } else {
-                // shadow .pro and parent .pro in same directory
+                // Shadow .pro and parent .pro in same directory
                 bldinfFilename.prepend("./");
             }
         } else { // regular project
-            // calc relative path
             QDir directory(currentPath);
             relativePath = directory.relativeFilePath(fullProFilename);
             relativePath.replace(relativePath.lastIndexOf("/"), relativePath.length(), QString(""));
@@ -1261,7 +1241,8 @@ bool SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
     return true;
 }
 
-bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &userItems) {
+bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &userItems)
+{
     QString filename(appName);
     filename.append("_reg.rss");
     QFile ft(filename);
@@ -1296,7 +1277,8 @@ bool SymbianMakefileGenerator::writeRegRssFile(QString &appName, QStringList &us
     return true;
 }
 
-bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfIcons, QString &iconFile) {
+bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfIcons, QString &iconFile)
+{
     QString filename(appName);
     filename.append(".rss");
     QFile ft(filename);
@@ -1340,7 +1322,8 @@ bool SymbianMakefileGenerator::writeRssFile(QString &appName, QString &numberOfI
     return true;
 }
 
-bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbianLangCodes) {
+bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbianLangCodes)
+{
     QString filename(appName);
     filename.append(".loc");
     QFile ft(filename);
@@ -1374,7 +1357,8 @@ bool SymbianMakefileGenerator::writeLocFile(QString &appName, QStringList &symbi
     return true;
 }
 
-void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules) {
+void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &iconFile, QStringList &userRssRules)
+{
     for(QMap<QString, QStringList>::iterator it = project->variables().begin(); it != project->variables().end(); ++it) {
         if (it.key().startsWith(RSS_RULES_BASE)) {
             QString newKey = it.key().mid(sizeof(RSS_RULES_BASE)-1);
@@ -1455,7 +1439,8 @@ void SymbianMakefileGenerator::readRssRules(QString &numberOfIcons, QString &ico
     }
 }
 
-QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles() {
+QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles()
+{
     QStringList tsfiles;
     QStringList symbianLangCodes;
     tsfiles << project->values("TRANSLATIONS");
@@ -1476,7 +1461,8 @@ QStringList SymbianMakefileGenerator::symbianLangCodesFromTsFiles() {
     return symbianLangCodes;
 }
 
-void SymbianMakefileGenerator::fillQt2S60LangMapTable() {
+void SymbianMakefileGenerator::fillQt2S60LangMapTable()
+{
     qt2S60LangMapTable.reserve(170); // 165 items at time of writing.
     qt2S60LangMapTable.insert("ab", "SC");            //Abkhazian                     //
     qt2S60LangMapTable.insert("om", "SC");            //Afan                          //
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index ba49118..3bf9f1d 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -46,25 +46,16 @@
 
 QT_BEGIN_NAMESPACE
 
-// In the Qt evaluation and educational version, we have a postfix in the
-// library name (e.g. qtmteval301.dll). QTDLL_POSTFIX is used for this.
-// A script modifies these lines when building eval/edu version, so be careful
-// when changing them.
-#ifndef QTDLL_POSTFIX
-#define QTDLL_POSTFIX ""
-#endif
-
 #define BLD_INF_FILENAME "bld.inf"
 #define MAKEFILE_DEPENDENCY_SEPARATOR " \\\n\t"
 
 #define QT_EXTRA_INCLUDE_DIR "tmp"
 
-class SymbianMakefileGenerator : public MakefileGenerator {
-
+class SymbianMakefileGenerator : public MakefileGenerator
+{
 protected:
 
     QString platform;
-    QString uid1;
     QString uid2;
     QString uid3;
     QString privateDirUid;
@@ -92,8 +83,6 @@ protected:
     QString getTargetExtension();
     bool isConfigSetToSymbian();
 
-    QString generateUID1();
-    QString generateUID2();
     QString generateUID3();
 
     bool initMmpVariables();
@@ -150,8 +139,6 @@ public:
 
     SymbianMakefileGenerator();
     ~SymbianMakefileGenerator();
-
 };
 
 #endif // SYMMAKEFILE_H
-
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index ccda9f2..17c365d 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -64,7 +64,6 @@ SymbianAbldMakefileGenerator::~SymbianAbldMakefileGenerator() { }
 
 bool SymbianAbldMakefileGenerator::writeMkFile(const QString& wrapperFileName, bool deploymentOnly)
 {
-
     QString gnuMakefileName = QLatin1String("Makefile_") + uid3;
     removeSpecialCharacters(gnuMakefileName);
     gnuMakefileName.append(".mk");
@@ -204,9 +203,9 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     t << "endif" << endl;
     t << endl;
     t << "DEFINES" << '\t' << " = "
-        << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
-        << varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")
-        << varGlue("DEFINES","-D"," -D","") << endl;
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+      << varGlue("QMAKE_COMPILER_DEFINES", "-D", "-D", " ")
+      << varGlue("DEFINES","-D"," -D","") << endl;
 
     t << "INCPATH" << '\t' << " = ";
 
@@ -365,7 +364,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     t << "\t-bldmake clean" << endl;
     t << endl;
 
-    // create execution target
+    // Create execution target
     if (debugPlatforms.contains("winscw") && getTargetExtension() == "exe") {
         t << "run:" << endl;
         t << "\t-call " << epocRoot() << "epoc32\\release\\winscw\\udeb\\" << removePathSeparators(escapeFilePath(fileFixify(project->first("TARGET"))).append(".exe")) << endl << endl;
@@ -391,7 +390,7 @@ bool SymbianAbldMakefileGenerator::writeDeploymentTargets(QTextStream &t)
         t << "\t-echo Deploying changed files..." << endl;
 
     for (int i=0; i<depList.size(); ++i) {
-        // xcopy prompts for selecting file or directory if target doesn't exist,
+        // Xcopy prompts for selecting file or directory if target doesn't exist,
         // and doesn't provide switch to force file selection. It does provide dir forcing, though,
         // so strip the last part of the destination.
         t << "\t-$(XCOPY) \"" << depList.at(i).from << "\" \"" << depList.at(i).to.left(depList.at(i).to.lastIndexOf("\\")+1) << "\"" << endl;
@@ -425,4 +424,3 @@ void SymbianAbldMakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool ad
         t << "gnumakefile " << gnuMakefileName << endl;
     }
 }
-
diff --git a/qmake/generators/symbian/symmake_abld.h b/qmake/generators/symbian/symmake_abld.h
index d323813..7de6510 100644
--- a/qmake/generators/symbian/symmake_abld.h
+++ b/qmake/generators/symbian/symmake_abld.h
@@ -46,8 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class SymbianAbldMakefileGenerator : public SymbianMakefileGenerator {
-
+class SymbianAbldMakefileGenerator : public SymbianMakefileGenerator
+{
 protected:
 
     // Inherited from parent
@@ -62,8 +62,6 @@ public:
 
     SymbianAbldMakefileGenerator();
     ~SymbianAbldMakefileGenerator();
-
 };
 
 #endif // SYMMAKE_ABLD_H
-
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 0266bac..34585e8 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -78,7 +78,9 @@ void SymbianSbsv2MakefileGenerator::exportFlm()
                 if (QFile::copy(item.absoluteFilePath(), destInfo.absoluteFilePath()))
                     generatedFiles << destInfo.absoluteFilePath();
                 else
-                    fprintf(stderr, "Error: Could not copy '%s' -> '%s'\n", qPrintable(item.absoluteFilePath()), qPrintable(destInfo.absoluteFilePath()));
+                    fprintf(stderr, "Error: Could not copy '%s' -> '%s'\n",
+                        qPrintable(item.absoluteFilePath()),
+                        qPrintable(destInfo.absoluteFilePath()));
             }
         }
         flmExportDone = true;
@@ -354,8 +356,6 @@ bool SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
 
     t << endl;
 
-    // ### TODO: Linux emulator (platsim?) deployment
-
     // Write post link rules
     if(!project->isEmpty("QMAKE_POST_LINK")) {
         t << "START EXTENSION qt/qmake_post_link" << endl;
@@ -418,4 +418,3 @@ void SymbianSbsv2MakefileGenerator::writeBldInfMkFilePart(QTextStream& t, bool a
     Q_UNUSED(t);
     Q_UNUSED(addDeploymentExtension);
 }
-
diff --git a/qmake/generators/symbian/symmake_sbsv2.h b/qmake/generators/symbian/symmake_sbsv2.h
index e55d177..caa491d 100644
--- a/qmake/generators/symbian/symmake_sbsv2.h
+++ b/qmake/generators/symbian/symmake_sbsv2.h
@@ -46,8 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class SymbianSbsv2MakefileGenerator : public SymbianMakefileGenerator {
-
+class SymbianSbsv2MakefileGenerator : public SymbianMakefileGenerator
+{
 protected:
 
     // Inherited from parent
@@ -69,4 +69,3 @@ private:
 };
 
 #endif // SYMMAKE_SBSV2_H
-
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 0a5e9a3..7c7044c 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3339,26 +3339,24 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
 
 
 // UIDs starting with 0xE are test UIDs in symbian
-QString generate_test_uid(const QString& target) {
+QString generate_test_uid(const QString& target) 
+{
     QString tmp = generate_uid(target);
     tmp.replace(0,1,"E");
     tmp.prepend("0x");
 
-    // printf("generate_test_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
-
     return tmp;
 }
 
 
 // UIDs starting with 0xE are test UIDs in symbian
-QString generate_uid(const QString& target) {
-
+QString generate_uid(const QString& target) 
+{
     static QMap<QString, QString> targetToUid;
 
     QString tmp = targetToUid[target];
 
     if(!tmp.isEmpty()) {
-        // printf("generate_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
         return tmp;
     }
 
diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 2304fab..f43d933 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -17,14 +17,14 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
            generators/symbian/symmake.cpp \
            generators/symbian/symmake_abld.cpp \
            generators/symbian/symmake_sbsv2.cpp \
-           generators/symbian/initprojectdeploy_symbian.cpp 
+           generators/symbian/initprojectdeploy_symbian.cpp
 
 # MWC does not provide an implementation of popen() so fake it.
 win32-mwc {
     SOURCES += qpopen.cpp \
 }
 
-           
+
 HEADERS += project.h property.h generators/makefile.h \
            generators/unix/unixmake.h meta.h option.h cachekeys.h \
            generators/win32/winmakefile.h generators/projectgenerator.h \
diff --git a/qmake/qpopen.cpp b/qmake/qpopen.cpp
index ebde035..7acff92 100644
--- a/qmake/qpopen.cpp
+++ b/qmake/qpopen.cpp
@@ -69,7 +69,6 @@ bool QPopen::init(const char *command, const char* /* mode */)
     // Ensure that the write handle to the child process's pipe for STDIN is not inherited.
     SetHandleInformation( childStdInW, HANDLE_FLAG_INHERIT, 0);
 
-    //TCHAR szCmdline[strlen(command)]=TEXT(command);
     TCHAR *szCmdLine = new TCHAR[strlen(command)+1];
     strcpy(szCmdLine, command);
 
@@ -126,7 +125,6 @@ int QPopen::fwrite(char* buffer, int maxBytes)
     return 0;
 }
 
-
 int QPopen::fread(char* buffer, int maxBytes)
 {
     DWORD bytesRead;
@@ -140,4 +138,3 @@ int QPopen::fread(char* buffer, int maxBytes)
 
     return 0;
 }
-
diff --git a/src/corelib/arch/symbian/qatomic_symbian.cpp b/src/corelib/arch/symbian/qatomic_symbian.cpp
index 9bec0f5..a228696 100644
--- a/src/corelib/arch/symbian/qatomic_symbian.cpp
+++ b/src/corelib/arch/symbian/qatomic_symbian.cpp
@@ -62,9 +62,9 @@ struct SPrintExitInfo
         TInt processHandleCount=0;
         TInt threadHandleCount=0;
         RThread().HandleCount(processHandleCount,threadHandleCount);
-        RDebug::Print(_L("%S exiting with %d allocated cells, %d handles"), 
-                &fullName, 
-                cells - initCells, 
+        RDebug::Print(_L("%S exiting with %d allocated cells, %d handles"),
+                &fullName,
+                cells - initCells,
                 (processHandleCount + threadHandleCount) - (initProcessHandleCount + initThreadHandleCount));
     }
     TInt initCells;
@@ -107,4 +107,3 @@ __declspec(dllexport) __asm int QBasicAtomicInt::fetchAndStoreOrdered(int newVal
 QT_END_NAMESPACE
 
 #endif // Q_CC_RVCT
-
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 818e555..21cbd12 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1914,7 +1914,7 @@ QSysInfo::SymVersion QSysInfo::symbianVersion()
     \relates <QtGlobal>
 
 	Users Q_CHECK_PTR on \a pointer, then returns \a pointer.
-	
+
 	This can be used as an inline version of Q_CHECK_PTR.
 */
 
@@ -2115,8 +2115,8 @@ QString qt_error_string(int errorCode)
     warnings, critical and fatal error messages. The Qt library (debug
     mode) contains hundreds of warning messages that are printed
     when internal errors (usually invalid function arguments)
-    occur. Qt built in release mode also contains such warnings unless 
-    QT_NO_WARNING_OUTPUT and/or QT_NO_DEBUG_OUTPUT have been set during 
+    occur. Qt built in release mode also contains such warnings unless
+    QT_NO_WARNING_OUTPUT and/or QT_NO_DEBUG_OUTPUT have been set during
     compilation. If you implement your own message handler, you get total
     control of these messages.
 
@@ -2516,7 +2516,7 @@ Q_GLOBAL_STATIC(SeedStorage, randTLS)  // Thread Local Storage for seed value
 */
 void qsrand(uint seed)
 {
-#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)	
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
     SeedStorageType *pseed = randTLS()->localData();
     if (!pseed)
         randTLS()->setLocalData(pseed = new SeedStorageType);
@@ -3179,7 +3179,7 @@ bool QInternal::callFunction(InternalFunction func, void **args)
  Compares the floating point value \a p1 and \a p2 and
  returns \c true if they are considered equal, otherwise \c false.
 
- Note that comparing values where either \a p1 or \a p2 is 0.0 will not work. 
+ Note that comparing values where either \a p1 or \a p2 is 0.0 will not work.
  The solution to this is to compare against values greater than or equal to 1.0.
 
  \snippet doc/src/snippets/code/src_corelib_global_qglobal.cpp 46
@@ -3416,7 +3416,7 @@ int qt_exception2SymbianError(const std::exception& aThrow)
             err =  KErrUnderflow;
         qWarning("translation from std exception \"%s\" to %d", aThrow.what(), err);
     }
-    
+
     return err;
 }
 #endif
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 257e3db..3493f13 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -915,9 +915,9 @@ QT_END_INCLUDE_NAMESPACE
 */
 
 #ifndef QT_LINUXBASE /* the LSB defines TRUE and FALSE for us */
-/* Symbian OS defines TRUE = 1 and FALSE = 0, 
+/* Symbian OS defines TRUE = 1 and FALSE = 0,
 redefine to built-in booleans to make autotests work properly */
-#ifdef Q_OS_SYMBIAN  
+#ifdef Q_OS_SYMBIAN
     #undef TRUE
     #undef FALSE
 #endif
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 9787566..836fa44 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -1824,7 +1824,7 @@ QChar QDir::separator()
 {
 #if defined (Q_FS_FAT) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN)
     return QLatin1Char('\\');
-#elif defined(Q_OS_UNIX) 
+#elif defined(Q_OS_UNIX)
     return QLatin1Char('/');
 #elif defined (Q_OS_MAC)
     return QLatin1Char(':');
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index f7120e1..cd8d36d 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -517,7 +517,7 @@ QTemporaryFile::QTemporaryFile()
 #ifdef Q_OS_SYMBIAN
     //Just for verify that folder really exist on hardware
     fileEngine()->mkdir( QDir::tempPath(), true  );
-#endif    
+#endif
 }
 
 /*!
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 3293d47..e876843 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -652,7 +652,7 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla
 
     QT_TRY {
         Q_D(QAbstractEventDispatcher);
-    
+
         // It is safe if this counter overflows. The main importance is that each
         // iteration count is different from the last.
         m_iterationCount++;
@@ -959,7 +959,7 @@ bool QEventDispatcherSymbian::unregisterTimers ( QObject * object )
 {
     if (m_timerList.isEmpty())
         return false;
-    
+
     bool unregistered = false;
     for (QHash<int, SymbianTimerInfoPtr>::iterator i = m_timerList.begin(); i != m_timerList.end(); ) {
         if ((*i)->receiver == object) {
@@ -1002,4 +1002,3 @@ void CQtActiveScheduler::Error(TInt aError) const
 }
 
 QT_END_NAMESPACE
-
diff --git a/src/corelib/kernel/qsystemsemaphore_symbian.cpp b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
index 8179046..1516841 100644
--- a/src/corelib/kernel/qsystemsemaphore_symbian.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_symbian.cpp
@@ -47,7 +47,7 @@
 #include <qcore_symbian_p.h>
 #include <e32cmn.h>
 QT_BEGIN_NAMESPACE
-        
+
 #ifndef QT_NO_SYSTEMSEMAPHORE
 
 QSystemSemaphorePrivate::QSystemSemaphorePrivate() :
@@ -65,7 +65,7 @@ void QSystemSemaphorePrivate::setErrorString(const QString &function, int err)
         errorString = QCoreApplication::tr("%1: already exists", "QSystemSemaphore").arg(function);
         error = QSystemSemaphore::AlreadyExists;
     break;
-    case KErrNotFound:    
+    case KErrNotFound:
         errorString = QCoreApplication::tr("%1: doesn't exists", "QSystemSemaphore").arg(function);
         error = QSystemSemaphore::NotFound;
     break;
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 2b57d2f..dd3468d 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -156,7 +156,7 @@ static void construct(QVariant::Private *x, const void *copy)
         x->data.b = copy ? *static_cast<const bool *>(copy) : false;
         break;
     case QVariant::Double:
-#if defined(Q_CC_RVCT) 
+#if defined(Q_CC_RVCT)
         // Using trinary operator with 64bit constants crashes when ran on Symbian device
         if (copy){
             x->data.d = *static_cast<const double*>(copy);
@@ -165,13 +165,13 @@ static void construct(QVariant::Private *x, const void *copy)
         }
 #else
         x->data.d = copy ? *static_cast<const double*>(copy) : 0.0;
-#endif        
+#endif
         break;
     case QMetaType::Float:
         x->data.f = copy ? *static_cast<const float*>(copy) : 0.0f;
         break;
     case QVariant::LongLong:
-#if defined(Q_CC_RVCT) 
+#if defined(Q_CC_RVCT)
         // Using trinary operator with 64bit constants crashes when ran on Symbian device
         if (copy){
             x->data.ll = *static_cast<const qlonglong *>(copy);
@@ -180,10 +180,10 @@ static void construct(QVariant::Private *x, const void *copy)
         }
 #else
         x->data.ll = copy ? *static_cast<const qlonglong *>(copy) : Q_INT64_C(0);
-#endif        
+#endif
         break;
     case QVariant::ULongLong:
-#if defined(Q_CC_RVCT) 
+#if defined(Q_CC_RVCT)
         // Using trinary operator with 64bit constants crashes when ran on Symbian device
         if (copy){
             x->data.ull = *static_cast<const qulonglong *>(copy);
@@ -192,7 +192,7 @@ static void construct(QVariant::Private *x, const void *copy)
         }
 #else
         x->data.ull = copy ? *static_cast<const qulonglong *>(copy) : Q_UINT64_C(0);
-#endif        
+#endif
         break;
     case QVariant::Invalid:
     case QVariant::UserType:
@@ -618,7 +618,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
         ok = &dummy;
 
     switch (uint(t)) {
-    case QVariant::Url: 
+    case QVariant::Url:
         switch (d->type) {
         case QVariant::String:
             *static_cast<QUrl *>(result) = QUrl(*v_cast<QString>(d));
@@ -1214,8 +1214,8 @@ const QVariant::Handler *QVariant::handler = &qt_kernel_variant_handler;
     and versatile, but may prove less memory and speed efficient than
     storing specific types in standard data structures.
 
-    QVariant also supports the notion of null values, where you can 
-    have a defined type with no value set. However, note that QVariant 
+    QVariant also supports the notion of null values, where you can
+    have a defined type with no value set. However, note that QVariant
     types can only be cast when they have had a value set.
 
     \snippet doc/src/snippets/code/src_corelib_kernel_qvariant.cpp 1
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
index 5364190..d7692b0 100644
--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
@@ -311,7 +311,7 @@ void QPluginLoader::setFileName(const QString &fileName)
             QFileInfoList driveList(QDir::drives());
             foreach(const QFileInfo& drive, driveList) {
                 QString testFilePath(drive.absolutePath() + stubPath);
-                testFilePath = QDir::cleanPath(testFilePath);            
+                testFilePath = QDir::cleanPath(testFilePath);
                 if (QFile::exists(testFilePath)) {
                     fn = testFilePath;
                     break;
@@ -319,7 +319,7 @@ void QPluginLoader::setFileName(const QString &fileName)
             }
         }
     }
-    
+
 #else
     QString fn = QFileInfo(fileName).canonicalFilePath();
 #endif
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index fac50ee..a4a57ce 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -183,7 +183,7 @@ QThreadPrivate::QThreadPrivate(QThreadData *d)
     id = 0;
     waiters = 0;
 #endif
-#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)  
+#if defined (Q_WS_WIN) || defined (Q_OS_SYMBIAN)
     terminationEnabled = true;
     terminatePending = false;
 #endif
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 51de0be..752796b 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -152,7 +152,7 @@ public:
     static void finish(void *, bool lockAnyway=true);
 #endif // Q_OS_WIN32
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)  
+#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN)
     bool terminationEnabled, terminatePending;
 # endif
     QThreadData *data;
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 881b889..cabf823 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -178,7 +178,7 @@ void QThreadPrivate::createEventDispatcher(QThreadData *data)
     else
 #endif
 #ifdef Q_OS_SYMBIAN
-    	data->eventDispatcher = new QEventDispatcherSymbian;
+        data->eventDispatcher = new QEventDispatcherSymbian;
 #else
         data->eventDispatcher = new QEventDispatcherUNIX;
 #endif
@@ -193,7 +193,7 @@ void *QThreadPrivate::start(void *arg)
     pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
     pthread_cleanup_push(QThreadPrivate::finish, arg);
 #endif
-    
+
     QThread *thr = reinterpret_cast<QThread *>(arg);
     QThreadData *data = QThreadData::get2(thr);
 
@@ -226,7 +226,7 @@ void *QThreadPrivate::start(void *arg)
 #ifndef Q_OS_SYMBIAN
     pthread_cleanup_pop(1);
 #else
-    QThreadPrivate::finish(arg);    
+    QThreadPrivate::finish(arg);
 #endif
 
     return 0;
@@ -266,7 +266,7 @@ void QThreadPrivate::finish(void *arg)
     d->thread_id = 0;
 #ifdef Q_OS_SYMBIAN
     if (closeNativeHandle)
-    	d->data->symbian_thread_handle.Close();
+        d->data->symbian_thread_handle.Close();
 #endif
     d->thread_done.wakeAll();
 #ifdef Q_OS_SYMBIAN
@@ -325,7 +325,7 @@ int QThread::idealThreadCount()
 #elif defined(Q_OS_INTEGRITY)
     // ### TODO - how to get the amound of CPUs on INTEGRITY?
 #elif defined(Q_OS_SYMBIAN)
-	// ### TODO - Get the number of cores from HAL? when multicore architectures (SMP) are supported
+    // ### TODO - Get the number of cores from HAL? when multicore architectures (SMP) are supported
     cores = 1;
 #else
     // the rest: Linux, Solaris, AIX, Tru64
@@ -545,10 +545,10 @@ void QThread::terminate()
         d->terminatePending = true;
         return;
     }
-   
+
     d->terminated = true;
     QThreadPrivate::finish(this, false, false);
-    d->data->symbian_thread_handle.Terminate(KErrNone);         
+    d->data->symbian_thread_handle.Terminate(KErrNone);
     d->data->symbian_thread_handle.Close();
 #endif
 
@@ -592,7 +592,7 @@ void QThread::setTerminationEnabled(bool enabled)
         d->terminated = true;
         QThreadPrivate::finish(thr, false);
         locker.unlock(); // don't leave the mutex locked!
-	    pthread_exit(NULL);    
+        pthread_exit(NULL);
     }
 #endif
 }
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h
index fc6a1e3a..a57fec7 100644
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
@@ -150,10 +150,10 @@ struct Q_CORE_EXPORT QHashData
 };
 
 inline void QHashData::mightGrow() // ### Qt 5: eliminate
-{ 
+{
     if (size >= numBuckets)
         rehash(numBits + 1);
-}  
+}
 
 inline bool QHashData::willGrow()
 {
@@ -992,12 +992,12 @@ Q_INLINE_TEMPLATE int QMultiHash<Key, T>::remove(const Key &key, const T &value)
     typename QHash<Key, T>::iterator end(QHash<Key, T>::end());
     while (i != end && i.key() == key) {
         if (i.value() == value) {
-#if defined(Q_CC_RVCT)  
-            // RVCT has problems with scoping, apparently.      
+#if defined(Q_CC_RVCT)
+            // RVCT has problems with scoping, apparently.
             i = QHash<Key, T>::erase(i);
 #else
             i = erase(i);
-#endif            
+#endif
             ++n;
         } else {
             ++i;
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index be80e75..70a2896 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -1019,12 +1019,12 @@ Q_INLINE_TEMPLATE int QMultiMap<Key, T>::remove(const Key &key, const T &value)
     typename QMap<Key, T>::iterator end(QMap<Key, T>::end());
     while (i != end && !qMapLessThanKey<Key>(key, i.key())) {
         if (i.value() == value) {
-#if defined(Q_CC_RVCT)  
-            // RVCT has problems with scoping, apparently.      
+#if defined(Q_CC_RVCT)
+            // RVCT has problems with scoping, apparently.
             i = QMap<Key, T>::erase(i);
 #else
             i = erase(i);
-#endif            
+#endif
             ++n;
         } else {
             ++i;
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index c9478cb..a6c2883 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1915,7 +1915,6 @@ int QPixmap::defaultDepth()
 #elif defined(Q_OS_SYMBIAN)
     return S60->screenDepth;
 #endif
-    
 }
 
 typedef void (*_qt_pixmap_cleanup_hook_64)(qint64);
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index a8d09b0..8b46dc6 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -114,7 +114,7 @@ symbian {
                 kernel/qclipboard_s60.cpp\
                 kernel/qdnd_s60.cpp \
                 kernel/qsound_s60.cpp
-                
+
         HEADERS += \
                 kernel/qt_s60_p.h \
                 kernel/qeventdispatcher_s60_p.h
@@ -198,7 +198,7 @@ embedded {
                 qcocoaview_mac_p.h \
                 qcocoaapplication_mac_p.h \
                 qcocoaapplicationdelegate_mac_p.h \
-                qmultitouch_mac_p.h 
+                qmultitouch_mac_p.h
 
         OBJECTIVE_SOURCES += \
                 kernel/qcursor_mac.mm \
@@ -216,7 +216,7 @@ embedded {
                 kernel/qt_cocoa_helpers_mac.mm \
                 kernel/qdesktopwidget_mac.mm \
                 kernel/qeventdispatcher_mac.mm \
-                kernel/qcocoawindowcustomthemeframe_mac.mm \   
+                kernel/qcocoawindowcustomthemeframe_mac.mm \
                 kernel/qmultitouch_mac.mm \
 
         HEADERS += \
@@ -225,10 +225,10 @@ embedded {
                 kernel/qcocoaapplicationdelegate_mac_p.h \
                 kernel/qeventdispatcher_mac_p.h
 
-        MENU_NIB.files = mac/qt_menu.nib 
-        MENU_NIB.path = Resources 
+        MENU_NIB.files = mac/qt_menu.nib
+        MENU_NIB.path = Resources
         MENU_NIB.version = Versions
-        QMAKE_BUNDLE_DATA += MENU_NIB 
+        QMAKE_BUNDLE_DATA += MENU_NIB
         RESOURCES += mac/macresources.qrc
 
         LIBS += -framework AppKit
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp
index fe40ea8..07c40c7 100644
--- a/src/gui/kernel/qaction.cpp
+++ b/src/gui/kernel/qaction.cpp
@@ -1368,7 +1368,7 @@ QAction::MenuRole QAction::menuRole() const
 
     This indicates what softkey action this action is. Usually used on mobile
     platforms to map QActions to hardware keys.
-    
+
     The softkey role can be changed any time.
 */
 void QAction::setSoftKeyRole(SoftKeyRole softKeyRole)
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 7836238..c831dad 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp