Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

16 files changed, 278 insertions, 253 deletions

diff --git a/demos/demobase.pri b/demos/demobase.pri
index c0bba64..724f64b 100644
--- a/demos/demobase.pri
+++ b/demos/demobase.pri
@@ -1 +1,12 @@
-symbian:RSS_RULES = "group_name=\"QtDemos\";" 
\ No newline at end of file
+symbian {

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

+    

+    vendorinfo = \

+        "; Localised Vendor name" \

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

+        " " \

+        "; Unique Vendor name" \

+        ":\"Nokia, Qt Software\"" \

+        " "

+    default_deployment.pkg_prerules += vendorinfo

+}
\ No newline at end of file
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 469e543..f876dc1 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/embedded/styledemo/stylewidget.ui b/demos/embedded/styledemo/stylewidget.ui
index 9c5f253..a084dde 100644
--- a/demos/embedded/styledemo/stylewidget.ui
+++ b/demos/embedded/styledemo/stylewidget.ui
@@ -1,138 +1,139 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>StyleWidget</class>
- <widget class="QWidget" name="StyleWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="StyleWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>172</width>
+    <width>174</width>
     <height>220</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
     <number>4</number>
    </property>
-   <property name="margin" >
+   <property name="margin">
     <number>4</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Styles</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <property name="margin" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="margin">
        <number>4</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>4</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QPushButton" name="transparentStyle" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+      <item row="0" column="0">
+       <widget class="QPushButton" name="transparentStyle">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="focusPolicy" >
+        <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Transp.</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="autoExclusive" >
+        <property name="autoExclusive">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="blueStyle" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+      <item row="2" column="0">
+       <widget class="QPushButton" name="blueStyle">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="focusPolicy" >
+        <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Blue</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="autoExclusive" >
+        <property name="autoExclusive">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="khakiStyle" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+      <item row="0" column="1">
+       <widget class="QPushButton" name="khakiStyle">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="focusPolicy" >
+        <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Khaki</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="autoExclusive" >
+        <property name="autoExclusive">
          <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="noStyle" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+      <item row="2" column="1">
+       <widget class="QPushButton" name="noStyle">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="focusPolicy" >
+        <property name="focusPolicy">
          <enum>Qt::StrongFocus</enum>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>None</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
-        <property name="autoExclusive" >
+        <property name="autoExclusive">
          <bool>true</bool>
         </property>
        </widget>
@@ -141,11 +142,11 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer_3" >
-     <property name="orientation" >
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
@@ -154,56 +155,56 @@
     </spacer>
    </item>
    <item>
-    <widget class="QFrame" name="frame" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+    <widget class="QFrame" name="frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QVBoxLayout" name="frameLayout" >
-      <property name="margin" >
+     <layout class="QVBoxLayout" name="frameLayout">
+      <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout" >
+       <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <widget class="QLabel" name="label" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>My Value is:</string>
           </property>
-          <property name="alignment" >
+          <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QSpinBox" name="spinBox" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+         <widget class="QSpinBox" name="spinBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="focusPolicy" >
+          <property name="focusPolicy">
            <enum>Qt::WheelFocus</enum>
           </property>
-          <property name="alignment" >
+          <property name="alignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
           </property>
-          <property name="keyboardTracking" >
+          <property name="keyboardTracking">
            <bool>false</bool>
           </property>
          </widget>
@@ -211,88 +212,88 @@
        </layout>
       </item>
       <item>
-       <layout class="QGridLayout" name="gridLayout" >
-        <property name="spacing" >
+       <layout class="QGridLayout" name="gridLayout">
+        <property name="spacing">
          <number>4</number>
         </property>
-        <item row="0" column="0" >
-         <widget class="QScrollBar" name="horizontalScrollBar" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+        <item row="0" column="0">
+         <widget class="QScrollBar" name="horizontalScrollBar">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize" >
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>24</height>
            </size>
           </property>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
          </widget>
         </item>
-        <item row="1" column="0" >
-         <widget class="QPushButton" name="pushButton_2" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+        <item row="1" column="0">
+         <widget class="QPushButton" name="pushButton_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="focusPolicy" >
+          <property name="focusPolicy">
            <enum>Qt::StrongFocus</enum>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Show</string>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
-          <property name="flat" >
+          <property name="flat">
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QScrollBar" name="horizontalScrollBar_2" >
-          <property name="minimumSize" >
+        <item row="0" column="1">
+         <widget class="QScrollBar" name="horizontalScrollBar_2">
+          <property name="minimumSize">
            <size>
             <width>0</width>
             <height>24</height>
            </size>
           </property>
-          <property name="orientation" >
+          <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
          </widget>
         </item>
-        <item row="1" column="1" >
-         <widget class="QPushButton" name="pushButton" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+        <item row="1" column="1">
+         <widget class="QPushButton" name="pushButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="focusPolicy" >
+          <property name="focusPolicy">
            <enum>Qt::StrongFocus</enum>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Enable</string>
           </property>
-          <property name="checkable" >
+          <property name="checkable">
            <bool>true</bool>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
-          <property name="flat" >
+          <property name="flat">
            <bool>false</bool>
           </property>
          </widget>
@@ -303,14 +304,14 @@
     </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
@@ -319,13 +320,13 @@
     </spacer>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -334,11 +335,11 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="close" >
-       <property name="focusPolicy" >
+      <widget class="QPushButton" name="close">
+       <property name="focusPolicy">
         <enum>Qt::StrongFocus</enum>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Close</string>
        </property>
       </widget>
@@ -348,7 +349,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="StyleDemo.qrc" />
+  <include location="StyleDemo.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -357,13 +358,13 @@
    <receiver>horizontalScrollBar_2</receiver>
    <slot>setValue(int)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>134</x>
-     <y>196</y>
+    <hint type="sourcelabel">
+     <x>84</x>
+     <y>147</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>523</x>
-     <y>193</y>
+    <hint type="destinationlabel">
+     <x>166</x>
+     <y>147</y>
     </hint>
    </hints>
   </connection>
@@ -373,13 +374,13 @@
    <receiver>horizontalScrollBar</receiver>
    <slot>setValue(int)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>577</x>
-     <y>199</y>
+    <hint type="sourcelabel">
+     <x>166</x>
+     <y>147</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>127</x>
-     <y>207</y>
+    <hint type="destinationlabel">
+     <x>84</x>
+     <y>147</y>
     </hint>
    </hints>
   </connection>
@@ -389,13 +390,13 @@
    <receiver>horizontalScrollBar_2</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>566</x>
-     <y>241</y>
+    <hint type="sourcelabel">
+     <x>166</x>
+     <y>175</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>492</x>
-     <y>207</y>
+    <hint type="destinationlabel">
+     <x>166</x>
+     <y>147</y>
     </hint>
    </hints>
   </connection>
@@ -405,13 +406,13 @@
    <receiver>horizontalScrollBar</receiver>
    <slot>setVisible(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>123</x>
-     <y>239</y>
+    <hint type="sourcelabel">
+     <x>84</x>
+     <y>175</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>123</x>
-     <y>184</y>
+    <hint type="destinationlabel">
+     <x>84</x>
+     <y>147</y>
     </hint>
    </hints>
   </connection>
@@ -421,13 +422,29 @@
    <receiver>horizontalScrollBar_2</receiver>
    <slot>setValue(int)</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>603</x>
-     <y>136</y>
+    <hint type="sourcelabel">
+     <x>166</x>
+     <y>115</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>575</x>
-     <y>199</y>
+    <hint type="destinationlabel">
+     <x>166</x>
+     <y>147</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>horizontalScrollBar_2</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>spinBox</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>132</x>
+     <y>132</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>135</x>
+     <y>110</y>
     </hint>
    </hints>
   </connection>