Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

34 files changed, 1787 insertions, 1282 deletions

diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 1b0e671..f953ab7 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -72,7 +72,8 @@
 QT_BEGIN_NAMESPACE
 
 namespace {
-    HelpViewer* helpViewerFromTabPosition(const QTabWidget *widget, const QPoint &point)
+    HelpViewer* helpViewerFromTabPosition(const QTabWidget *widget,
+        const QPoint &point)
     {
         QTabBar *tabBar = qFindChild<QTabBar*>(widget);
         for (int i = 0; i < tabBar->count(); ++i) {
@@ -87,38 +88,32 @@ namespace {
 FindWidget::FindWidget(QWidget *parent)
     : QWidget(parent)
 {
-    QString system = QLatin1String("win");
     QHBoxLayout *hboxLayout = new QHBoxLayout(this);
-#ifdef Q_OS_MAC
-    system = QLatin1String("mac");
-#else
-    hboxLayout->setSpacing(6);
+    QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
+
+#ifndef Q_OS_MAC
     hboxLayout->setMargin(0);
+    hboxLayout->setSpacing(6);
+    resourcePath.append(QLatin1String("win"));
+#else
+    resourcePath.append(QLatin1String("mac"));
 #endif
 
-    toolClose = new QToolButton(this);
-    toolClose->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/closetab.png").arg(system)));
-    toolClose->setAutoRaise(true);
+    toolClose = setupToolButton(QLatin1String(""),
+        resourcePath + QLatin1String("/closetab.png"));
     hboxLayout->addWidget(toolClose);
 
     editFind = new QLineEdit(this);
-    editFind->setMinimumSize(QSize(150, 0));
-    connect(editFind, SIGNAL(textChanged(const QString&)),
-        this, SLOT(updateButtons()));
     hboxLayout->addWidget(editFind);
+    editFind->setMinimumSize(QSize(150, 0));
+    connect(editFind, SIGNAL(textChanged(QString)), this, SLOT(updateButtons()));
 
-    toolPrevious = new QToolButton(this);
-    toolPrevious->setAutoRaise(true);
-    toolPrevious->setText(tr("Previous"));
-    toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    toolPrevious->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/previous.png").arg(system)));
+    toolPrevious = setupToolButton(tr("Previous"),
+        resourcePath + QLatin1String("/previous.png"));
     hboxLayout->addWidget(toolPrevious);
 
-    toolNext = new QToolButton(this);
-    toolNext->setAutoRaise(true);
-    toolNext->setText(tr("Next"));
-    toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    toolNext->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/next.png").arg(system)));
+    toolNext = setupToolButton(tr("Next"),
+        resourcePath + QLatin1String("/next.png"));
     hboxLayout->addWidget(toolNext);
 
     checkCase = new QCheckBox(tr("Case Sensitive"), this);
@@ -131,15 +126,17 @@ FindWidget::FindWidget(QWidget *parent)
 #endif
 
     labelWrapped = new QLabel(this);
+    labelWrapped->setScaledContents(true);
+    labelWrapped->setTextFormat(Qt::RichText);
     labelWrapped->setMinimumSize(QSize(0, 20));
     labelWrapped->setMaximumSize(QSize(105, 20));
-    labelWrapped->setTextFormat(Qt::RichText);
-    labelWrapped->setScaledContents(true);
-    labelWrapped->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
-    labelWrapped->setText(tr("<img src=\":/trolltech/assistant/images/wrap.png\">&nbsp;Search wrapped"));
+    labelWrapped->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter);
+    labelWrapped->setText(tr("<img src=\":/trolltech/assistant/images/wrap.png\""
+        ">&nbsp;Search wrapped"));
     hboxLayout->addWidget(labelWrapped);
 
-    QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    QSpacerItem *spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding,
+        QSizePolicy::Minimum);
     hboxLayout->addItem(spacerItem);
     setMinimumWidth(minimumSizeHint().width());
     labelWrapped->hide();
@@ -162,38 +159,54 @@ void FindWidget::updateButtons()
     }
 }
 
+QToolButton* FindWidget::setupToolButton(const QString &text, const QString &icon)
+{
+    QToolButton *toolButton = new QToolButton(this);
+
+    toolButton->setText(text);
+    toolButton->setAutoRaise(true);
+    toolButton->setIcon(QIcon(icon));
+    toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+    return toolButton;
+}
+
+
+// --
+
 
 CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
     : QWidget(parent)
+    , lastTabPage(0)
+    , collectionFile(engine->collectionFile())
     , findBar(0)
     , tabWidget(0)
+    , findWidget(0)
     , helpEngine(engine)
     , printer(0)
+    , usesDefaultCollection(parent->usesDefaultCollection())
     , m_searchWidget(0)
 {
-    staticCentralWidget = this;
-
-    lastTabPage = 0;
     globalActionList.clear();
-    collectionFile = helpEngine->collectionFile();
-    usesDefaultCollection = parent->usesDefaultCollection();
-
-    QString system = QLatin1String("win");
+    staticCentralWidget = this;
     QVBoxLayout *vboxLayout = new QVBoxLayout(this);
+    QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
 
-#ifdef Q_OS_MAC
-    system = QLatin1String("mac");
-#else
+#ifndef Q_OS_MAC
     vboxLayout->setMargin(0);
+    resourcePath.append(QLatin1String("win"));
+#else
+    resourcePath.append(QLatin1String("mac"));
 #endif
 
     tabWidget = new QTabWidget(this);
-    connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentPageChanged(int)));
+    connect(tabWidget, SIGNAL(currentChanged(int)), this,
+        SLOT(currentPageChanged(int)));
 
     QToolButton *newTabButton = new QToolButton(this);
     newTabButton->setAutoRaise(true);
     newTabButton->setToolTip(tr("Add new page"));
-    newTabButton->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/addtab.png").arg(system)));
+    newTabButton->setIcon(QIcon(resourcePath + QLatin1String("/addtab.png")));
 
     tabWidget->setCornerWidget(newTabButton, Qt::TopLeftCorner);
     connect(newTabButton, SIGNAL(clicked()), this, SLOT(newTab()));
@@ -202,7 +215,7 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
     closeTabButton->setEnabled(false);
     closeTabButton->setAutoRaise(true);
     closeTabButton->setToolTip(tr("Close current page"));
-    closeTabButton->setIcon(QIcon(QString::fromUtf8(":/trolltech/assistant/images/%1/closetab.png").arg(system)));
+    closeTabButton->setIcon(QIcon(resourcePath + QLatin1String("/closetab.png")));
 
     tabWidget->setCornerWidget(closeTabButton, Qt::TopRightCorner);
     connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeTab()));
@@ -216,19 +229,20 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
     vboxLayout->addWidget(findBar);
     findBar->hide();
     findWidget->editFind->installEventFilter(this);
-    connect(findWidget->toolClose, SIGNAL(clicked()), findBar, SLOT(hide()));
 
+    connect(findWidget->toolClose, SIGNAL(clicked()), findBar, SLOT(hide()));
     connect(findWidget->toolNext, SIGNAL(clicked()), this, SLOT(findNext()));
     connect(findWidget->editFind, SIGNAL(returnPressed()), this, SLOT(findNext()));
-    connect(findWidget->editFind, SIGNAL(textChanged(const QString&)), this, SLOT(findCurrentText(const QString&)));
+    connect(findWidget->editFind, SIGNAL(textChanged(QString)), this,
+        SLOT(findCurrentText(QString)));
     connect(findWidget->toolPrevious, SIGNAL(clicked()), this, SLOT(findPrevious()));
 
     QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
     if (tabBar) {
         tabBar->installEventFilter(this);
         tabBar->setContextMenuPolicy(Qt::CustomContextMenu);
-        connect(tabBar, SIGNAL(customContextMenuRequested(const QPoint&)),
-                this, SLOT(showTabBarContextMenu(const QPoint&)));
+        connect(tabBar, SIGNAL(customContextMenuRequested(QPoint)), this,
+            SLOT(showTabBarContextMenu(QPoint)));
     }
 
     QPalette p = qApp->palette();
@@ -247,19 +261,17 @@ CentralWidget::~CentralWidget()
 
     QString zoomCount;
     QString currentPages;
-    QLatin1Char sep('|');
-    for (int i = 1; i < tabWidget->count(); ++i) {
+    QLatin1Char separator('|');
+    int i = m_searchWidget->isAttached() ? 1 : 0;
+
+    for (; i < tabWidget->count(); ++i) {
         HelpViewer *viewer = qobject_cast<HelpViewer*>(tabWidget->widget(i));
         if (viewer && viewer->source().isValid()) {
-            currentPages.append(viewer->source().toString()).append(sep);
-#if !defined(QT_NO_WEBKIT)
-            zoomCount.append(QString::number(viewer->textSizeMultiplier())).
-                append(sep);
-#else
-            zoomCount.append(QString::number(viewer->zoom())).append(sep);
-#endif
+            currentPages += viewer->source().toString() + separator;
+            zoomCount += QString::number(viewer->zoom()) + separator;
         }
     }
+
     engine.setCustomValue(QLatin1String("LastTabPage"), lastTabPage);
     engine.setCustomValue(QLatin1String("LastShownPages"), currentPages);
 #if !defined(QT_NO_WEBKIT)
@@ -276,14 +288,18 @@ CentralWidget *CentralWidget::instance()
 
 void CentralWidget::newTab()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
+#if !defined(QT_NO_WEBKIT)
+    if (viewer && viewer->hasLoadFinished())
+#else
     if (viewer)
+#endif
         setSourceInNewTab(viewer->source());
 }
 
 void CentralWidget::zoomIn()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->zoomIn();
 
@@ -293,7 +309,7 @@ void CentralWidget::zoomIn()
 
 void CentralWidget::zoomOut()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->zoomOut();
 
@@ -316,7 +332,7 @@ void CentralWidget::nextPage()
 
 void CentralWidget::resetZoom()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->resetZoom();
 
@@ -340,7 +356,7 @@ void CentralWidget::findPrevious()
 
 void CentralWidget::closeTab()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (!viewer|| tabWidget->count() == 1)
         return;
 
@@ -350,8 +366,8 @@ void CentralWidget::closeTab()
 
 void CentralWidget::setSource(const QUrl &url)
 {
-    HelpViewer* viewer = currentHelpViewer();
-    HelpViewer* lastViewer = qobject_cast<HelpViewer*>(tabWidget->widget(lastTabPage));
+    HelpViewer *viewer = currentHelpViewer();
+    HelpViewer *lastViewer = qobject_cast<HelpViewer*>(tabWidget->widget(lastTabPage));
 
     if (!viewer && !lastViewer) {
         viewer = new HelpViewer(helpEngine, this);
@@ -359,8 +375,9 @@ void CentralWidget::setSource(const QUrl &url)
         lastTabPage = tabWidget->addTab(viewer, QString());
         tabWidget->setCurrentIndex(lastTabPage);
         connectSignals();
-    } else
+    } else {
         viewer = lastViewer;
+    }
 
     viewer->setSource(url);
     currentPageChanged(lastTabPage);
@@ -371,48 +388,46 @@ void CentralWidget::setSource(const QUrl &url)
 
 void CentralWidget::setLastShownPages()
 {
+    const QLatin1String key("LastShownPages");
+    QString value = helpEngine->customValue(key, QString()).toString();
+    const QStringList lastShownPageList = value.split(QLatin1Char('|'),
+        QString::SkipEmptyParts);
+
+    const int pageCount = lastShownPageList.count();
+    if (pageCount == 0 && usesDefaultCollection)
+        return setSource(QUrl(QLatin1String("help")));
+
 #if !defined(QT_NO_WEBKIT)
-    QLatin1String zoom("LastPagesZoomWebView");
+    const QLatin1String zoom("LastPagesZoomWebView");
 #else
-    QLatin1String zoom("LastPagesZoomTextBrowser");
+    const QLatin1String zoom("LastPagesZoomTextBrowser");
 #endif
 
-    const QStringList lastShownPageList =
-        helpEngine->customValue(QLatin1String("LastShownPages")).toString().
-        split(QLatin1Char('|'), QString::SkipEmptyParts);
-
-    if (!lastShownPageList.isEmpty()) {
-        QVector<QString>zoomList = helpEngine->customValue(zoom).toString().
-            split(QLatin1Char('|'), QString::SkipEmptyParts).toVector();
-        if (zoomList.isEmpty())
-            zoomList.fill(QLatin1String("0.0"), lastShownPageList.size());
-        else if(zoomList.count() < lastShownPageList.count()) {
-            zoomList.insert(zoomList.count(),
-                lastShownPageList.count() - zoomList.count(), QLatin1String("0.0"));
-        }
+    value = helpEngine->customValue(zoom, QString()).toString();
+    QVector<QString> zoomVector = value.split(QLatin1Char('|'),
+        QString::SkipEmptyParts).toVector();
 
-        QVector<QString>::const_iterator zIt = zoomList.constBegin();
-        QStringList::const_iterator it = lastShownPageList.constBegin();
-        for (; it != lastShownPageList.constEnd(); ++it, ++zIt)
-            setSourceInNewTab((*it), (*zIt).toFloat());
+    const int zoomCount = zoomVector.count();
+    zoomVector.insert(zoomCount, pageCount - zoomCount, QLatin1String("0.0"));
 
-        tabWidget->setCurrentIndex(helpEngine->customValue(
-            QLatin1String("LastTabPage"), 1).toInt());
-    } else {
-        if (usesDefaultCollection)
-            setSource(QUrl(QLatin1String("help")));
-    }
+    QVector<QString>::const_iterator zIt = zoomVector.constBegin();
+    QStringList::const_iterator it = lastShownPageList.constBegin();
+    for (; it != lastShownPageList.constEnd(); ++it, ++zIt)
+        setSourceInNewTab((*it), (*zIt).toFloat());
+
+    const QLatin1String lastTab("LastTabPage");
+    tabWidget->setCurrentIndex(helpEngine->customValue(lastTab, 1).toInt());
 }
 
 bool CentralWidget::hasSelection() const
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     return viewer ? viewer->hasSelection() : false;
 }
 
 QUrl CentralWidget::currentSource() const
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         return viewer->source();
 
@@ -421,7 +436,7 @@ QUrl CentralWidget::currentSource() const
 
 QString CentralWidget::currentTitle() const
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         return viewer->documentTitle();
 
@@ -430,7 +445,7 @@ QString CentralWidget::currentTitle() const
 
 void CentralWidget::copySelection()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->copy();
 }
@@ -453,7 +468,7 @@ void CentralWidget::initPrinter()
 void CentralWidget::print()
 {
 #ifndef QT_NO_PRINTER
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (!viewer)
         return;
 
@@ -479,7 +494,8 @@ void CentralWidget::printPreview()
 #ifndef QT_NO_PRINTER
     initPrinter();
     QPrintPreviewDialog preview(printer, this);
-    connect(&preview, SIGNAL(paintRequested(QPrinter *)), SLOT(printPreview(QPrinter *)));
+    connect(&preview, SIGNAL(paintRequested(QPrinter*)),
+        SLOT(printPreview(QPrinter*)));
     preview.exec();
 #endif
 }
@@ -509,14 +525,14 @@ bool CentralWidget::isHomeAvailable() const
 
 void CentralWidget::home()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->home();
 }
 
 bool CentralWidget::isForwardAvailable() const
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         return viewer->isForwardAvailable();
 
@@ -525,14 +541,14 @@ bool CentralWidget::isForwardAvailable() const
 
 void CentralWidget::forward()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->forward();
 }
 
 bool CentralWidget::isBackwardAvailable() const
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         return viewer->isBackwardAvailable();
 
@@ -541,7 +557,7 @@ bool CentralWidget::isBackwardAvailable() const
 
 void CentralWidget::backward()
 {
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer)
         viewer->backward();
 }
@@ -559,7 +575,7 @@ void CentralWidget::setGlobalActions(const QList<QAction*> &actions)
 
 void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom)
 {
-    HelpViewer* viewer;
+    HelpViewer *viewer;
 
 #if defined(QT_NO_WEBKIT)
     viewer = currentHelpViewer();
@@ -582,20 +598,20 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom)
     }
 
 #if !defined(QT_NO_WEBKIT)
-    QWebSettings* settings = QWebSettings::globalSettings();
+    QWebSettings *settings = QWebSettings::globalSettings();
     if (!userFont) {
         int fontSize = settings->fontSize(QWebSettings::DefaultFontSize);
         QString fontFamily = settings->fontFamily(QWebSettings::StandardFont);
         font = QFont(fontFamily, fontSize);
     }
 
-    QWebView* view = qobject_cast<QWebView*> (viewer);
+    QWebView *view = qobject_cast<QWebView*> (viewer);
     if (view) {
         settings = view->settings();
         settings->setFontFamily(QWebSettings::StandardFont, font.family());
         settings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize());
     } else if (viewer) {
-    viewer->setFont(font);
+        viewer->setFont(font);
     }
     viewer->setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom);
 #else
@@ -609,7 +625,7 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, qreal zoom)
 
 HelpViewer *CentralWidget::newEmptyTab()
 {
-    HelpViewer* viewer = new HelpViewer(helpEngine, this);
+    HelpViewer *viewer = new HelpViewer(helpEngine, this);
     viewer->installEventFilter(this);
     viewer->setFocus(Qt::OtherFocusReason);
 #if defined(QT_NO_WEBKIT)
@@ -628,15 +644,20 @@ void CentralWidget::findCurrentText(const QString &text)
 
 void CentralWidget::connectSignals()
 {
-    const HelpViewer* viewer = currentHelpViewer();
+    const HelpViewer *viewer = currentHelpViewer();
     if (viewer) {
-        connect(viewer, SIGNAL(copyAvailable(bool)), this, SIGNAL(copyAvailable(bool)));
-        connect(viewer, SIGNAL(forwardAvailable(bool)), this, SIGNAL(forwardAvailable(bool)));
-        connect(viewer, SIGNAL(backwardAvailable(bool)), this, SIGNAL(backwardAvailable(bool)));
-        connect(viewer, SIGNAL(sourceChanged(const QUrl&)), this, SIGNAL(sourceChanged(const QUrl&)));
-        connect(viewer, SIGNAL(highlighted(const QString&)), this, SIGNAL(highlighted(const QString&)));
-
-        connect(viewer, SIGNAL(sourceChanged(const QUrl&)), this, SLOT(setTabTitle(const QUrl&)));
+        connect(viewer, SIGNAL(copyAvailable(bool)), this,
+            SIGNAL(copyAvailable(bool)));
+        connect(viewer, SIGNAL(forwardAvailable(bool)), this,
+            SIGNAL(forwardAvailable(bool)));
+        connect(viewer, SIGNAL(backwardAvailable(bool)), this,
+            SIGNAL(backwardAvailable(bool)));
+        connect(viewer, SIGNAL(sourceChanged(QUrl)), this,
+            SIGNAL(sourceChanged(QUrl)));
+        connect(viewer, SIGNAL(highlighted(QString)), this,
+            SIGNAL(highlighted(QString)));
+        connect(viewer, SIGNAL(sourceChanged(QUrl)), this,
+            SLOT(setTabTitle(QUrl)));
     }
 }
 
@@ -658,85 +679,72 @@ void CentralWidget::activateTab(bool onlyHelpViewer)
     }
 }
 
-void CentralWidget::setTabTitle(const QUrl& url)
+void CentralWidget::setTabTitle(const QUrl &url)
 {
-    int tab = lastTabPage;
-    HelpViewer* viewer = currentHelpViewer();
-
+    Q_UNUSED(url)
 #if !defined(QT_NO_WEBKIT)
-    if (!viewer || viewer->source() != url) {
-        QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
-        for (tab = 0; tab < tabBar->count(); ++tab) {
-            viewer = qobject_cast<HelpViewer*>(tabWidget->widget(tab));
-            if (viewer && viewer->source() == url)
-                break;
-        }
+    QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
+    for (int tab = 0; tab < tabBar->count(); ++tab) {
+        HelpViewer *viewer = qobject_cast<HelpViewer*>(tabWidget->widget(tab));
+        if (viewer)
+            tabWidget->setTabText(tab, viewer->documentTitle().trimmed());
     }
 #else
-    Q_UNUSED(url)
-#endif
-
+    HelpViewer *viewer = currentHelpViewer();
     if (viewer) {
-        tabWidget->setTabText(tab,
+        tabWidget->setTabText(lastTabPage,
             quoteTabTitle(viewer->documentTitle().trimmed()));
     }
+#endif
 }
 
 void CentralWidget::currentPageChanged(int index)
 {
     const HelpViewer *viewer = currentHelpViewer();
-
-    if (viewer || tabWidget->count() == 1)
+    if (viewer)
         lastTabPage = index;
 
-    bool enabled = false;
-    if (viewer) {
-        enabled = true;
-        if (!m_searchWidget)
-            enabled = tabWidget->count() > 1;
-    }
+    QWidget *widget = tabWidget->cornerWidget(Qt::TopRightCorner);
+    widget->setEnabled(viewer && enableTabCloseAction());
 
-    tabWidget->cornerWidget(Qt::TopRightCorner)->setEnabled(enabled);
-    tabWidget->cornerWidget(Qt::TopLeftCorner)->setEnabled(m_searchWidget ? enabled : true);
+    widget = tabWidget->cornerWidget(Qt::TopLeftCorner);
+    widget->setEnabled(viewer ? true : false);
 
-     emit currentViewerChanged();
+    emit currentViewerChanged();
 }
 
 void CentralWidget::showTabBarContextMenu(const QPoint &point)
 {
-    HelpViewer* viewer = helpViewerFromTabPosition(tabWidget, point);
+    HelpViewer *viewer = helpViewerFromTabPosition(tabWidget, point);
     if (!viewer)
         return;
 
     QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
 
     QMenu menu(QLatin1String(""), tabBar);
-    QAction *new_page = menu.addAction(tr("Add New Page"));
-    QAction *close_page = menu.addAction(tr("Close This Page"));
-    QAction *close_pages = menu.addAction(tr("Close Other Pages"));
-    menu.addSeparator();
-    QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page..."));
+    QAction *newPage = menu.addAction(tr("Add New Page"));
 
-    if (tabBar->count() == 1) {
-        close_page->setEnabled(false);
-        close_pages->setEnabled(false);
-    } else if (m_searchWidget && tabBar->count() == 2) {
-        close_pages->setEnabled(false);
-    }
+    bool enableAction = enableTabCloseAction();
+    QAction *closePage = menu.addAction(tr("Close This Page"));
+    closePage->setEnabled(enableAction);
 
-    QAction *picked_action = menu.exec(tabBar->mapToGlobal(point));
-    if (!picked_action)
-        return;
+    QAction *closePages = menu.addAction(tr("Close Other Pages"));
+    closePages->setEnabled(enableAction);
+
+    menu.addSeparator();
 
-    if (picked_action == new_page)
+    QAction *newBookmark = menu.addAction(tr("Add Bookmark for this Page..."));
+
+    QAction *pickedAction = menu.exec(tabBar->mapToGlobal(point));
+    if (pickedAction == newPage)
         setSourceInNewTab(viewer->source());
 
-    if (picked_action == close_page) {
+    if (pickedAction == closePage) {
         tabWidget->removeTab(tabWidget->indexOf(viewer));
         QTimer::singleShot(0, viewer, SLOT(deleteLater()));
     }
 
-    if (picked_action == close_pages) {
+    if (pickedAction == closePages) {
         int currentPage = tabWidget->indexOf(viewer);
         for (int i = tabBar->count() -1; i >= 0; --i) {
             viewer = qobject_cast<HelpViewer*>(tabWidget->widget(i));
@@ -750,58 +758,68 @@ void CentralWidget::showTabBarContextMenu(const QPoint &point)
         }
     }
 
-    if (picked_action == newBookmark)
+    if (pickedAction == newBookmark)
         emit addNewBookmark(viewer->documentTitle(), viewer->source().toString());
 }
 
 bool CentralWidget::eventFilter(QObject *object, QEvent *e)
 {
-    if (currentHelpViewer() == object && e->type() == QEvent::KeyPress){
+    if (e->type() == QEvent::KeyPress) {
         QKeyEvent *ke = static_cast<QKeyEvent*>(e);
-        if (ke->key() == Qt::Key_Backspace) {
-            HelpViewer *viewer = currentHelpViewer();
+        switch (ke->key()) {
+            default: {
+                return QWidget::eventFilter(object, e);
+            }   break;
+
+            case Qt::Key_Escape: {
+                if (findWidget->editFind == object) {
+                    findBar->hide();
+                    if (HelpViewer *viewer = currentHelpViewer())
+                        viewer->setFocus();
+                }
+            }   break;
+
+            case Qt::Key_Backspace: {
+                HelpViewer *viewer = currentHelpViewer();
+                if (viewer == object) {
 #if defined(QT_NO_WEBKIT)
-            if (viewer && viewer->isBackwardAvailable()) {
+                    if (viewer->isBackwardAvailable()) {
 #else
-            if (viewer && viewer->isBackwardAvailable() && !viewer->hasFocus()) {
+                    if (viewer->isBackwardAvailable() && !viewer->hasFocus()) {
 #endif
-                viewer->backward();
-                return true;
-            }
+                        viewer->backward();
+                        return true;
+                    }
+                }
+            }   break;
         }
     }
 
-    QTabBar *tabBar = qobject_cast<QTabBar*>(object);
-    bool mousRel = e->type() == QEvent::MouseButtonRelease;
-    bool dblClick = e->type() == QEvent::MouseButtonDblClick;
-
-    if (tabBar && (mousRel || dblClick)) {
-        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(e);
-        HelpViewer *viewer = helpViewerFromTabPosition(tabWidget, mouseEvent->pos());
-        if (!m_searchWidget && tabWidget->count() <= 1)
-            return QWidget::eventFilter(object, e);
-
-        if (viewer && (mouseEvent->button() == Qt::MidButton || dblClick)) {
-            tabWidget->removeTab(tabWidget->indexOf(viewer));
-            QTimer::singleShot(0, viewer, SLOT(deleteLater()));
-            currentPageChanged(tabWidget->currentIndex());
-            return true;
-        }
-    } else if (object == findWidget->editFind && e->type() == QEvent::KeyPress) {
-        QKeyEvent *ke = static_cast<QKeyEvent*>(e);
-        if (ke->key() == Qt::Key_Escape) {
-            findBar->hide();
-            HelpViewer *hv = currentHelpViewer();
-            if (hv)
-                hv->setFocus();
+    if (QTabBar *tabBar = qobject_cast<QTabBar*>(object)) {
+        const bool dblClick = e->type() == QEvent::MouseButtonDblClick;
+        if ((e->type() == QEvent::MouseButtonRelease) || dblClick) {
+            QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(e);
+            HelpViewer *viewer = helpViewerFromTabPosition(tabWidget,
+                mouseEvent->pos());
+            if (viewer) {
+                if ((mouseEvent->button() == Qt::MidButton) || dblClick) {
+                    if (availableHelpViewer() > 1) {
+                        tabWidget->removeTab(tabWidget->indexOf(viewer));
+                        QTimer::singleShot(0, viewer, SLOT(deleteLater()));
+                        currentPageChanged(tabWidget->currentIndex());
+                        return true;
+                    }
+                }
+            }
         }
     }
+
     return QWidget::eventFilter(object, e);
 }
 
 void CentralWidget::keyPressEvent(QKeyEvent *e)
 {
-    QString text = e->text();
+    const QString &text = e->text();
     if (text.startsWith(QLatin1Char('/'))) {
         if (!findBar->isVisible()) {
             findBar->show();
@@ -821,7 +839,7 @@ void CentralWidget::find(QString ttf, bool forward, bool backward)
     QTextDocument *doc = 0;
     QTextBrowser *browser = 0;
 
-    HelpViewer* viewer = currentHelpViewer();
+    HelpViewer *viewer = currentHelpViewer();
     QPalette p = findWidget->editFind->palette();
     p.setColor(QPalette::Active, QPalette::Base, Qt::white);
 
@@ -860,7 +878,7 @@ void CentralWidget::find(QString ttf, bool forward, bool backward)
     }
 
     if (tabWidget->currentWidget() == m_searchWidget) {
-        QTextBrowser* browser = qFindChild<QTextBrowser*>(m_searchWidget);
+        QTextBrowser *browser = qFindChild<QTextBrowser*>(m_searchWidget);
         if (browser) {
             doc = browser->document();
             cursor = browser->textCursor();
@@ -872,8 +890,10 @@ void CentralWidget::find(QString ttf, bool forward, bool backward)
 
     QTextDocument::FindFlags options;
 
-    if (cursor.hasSelection())
-        cursor.setPosition(forward ? cursor.position() : cursor.anchor(), QTextCursor::MoveAnchor);
+    if (cursor.hasSelection()) {
+        cursor.setPosition(forward ? cursor.position() : cursor.anchor(),
+            QTextCursor::MoveAnchor);
+    }
 
     QTextCursor newCursor = cursor;
 
@@ -915,15 +935,6 @@ void CentralWidget::find(QString ttf, bool forward, bool backward)
     findWidget->editFind->setPalette(p);
 }
 
-void CentralWidget::activateSearch()
-{
-    if (tabWidget->widget(0) != m_searchWidget)
-        createSearchWidget(helpEngine->searchEngine());
-
-    tabWidget->setCurrentWidget(m_searchWidget);
-    m_searchWidget->setFocus();
-}
-
 void CentralWidget::updateBrowserFont()
 {
     QFont font = qApp->font();
@@ -934,7 +945,7 @@ void CentralWidget::updateBrowserFont()
     }
 
 #if !defined(QT_NO_WEBKIT)
-    QWebSettings* settings = QWebSettings::globalSettings();
+    QWebSettings *settings = QWebSettings::globalSettings();
     if (!userFont) {
         int fontSize = settings->fontSize(QWebSettings::DefaultFontSize);
         QString fontFamily = settings->fontFamily(QWebSettings::StandardFont);
@@ -942,11 +953,11 @@ void CentralWidget::updateBrowserFont()
     }
 #endif
 
-    QWidget* widget = 0;
+    QWidget *widget = 0;
     for (int i = 0; i < tabWidget->count(); ++i) {
         widget = tabWidget->widget(i);
 #if !defined(QT_NO_WEBKIT)
-        QWebView* view = qobject_cast<QWebView*> (widget);
+        QWebView *view = qobject_cast<QWebView*> (widget);
         if (view) {
             settings = view->settings();
             settings->setFontFamily(QWebSettings::StandardFont, font.family());
@@ -967,17 +978,47 @@ void CentralWidget::createSearchWidget(QHelpSearchEngine *searchEngine)
 {
     if (!m_searchWidget) {
         m_searchWidget = new SearchWidget(searchEngine, this);
-        connect(m_searchWidget, SIGNAL(requestShowLink(const QUrl&)), this,
-            SLOT(setSourceFromSearch(const QUrl&)));
-        connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(const QUrl&)), this,
-            SLOT(setSourceFromSearchInNewTab(const QUrl&)));
+        connect(m_searchWidget, SIGNAL(requestShowLink(QUrl)), this,
+            SLOT(setSourceFromSearch(QUrl)));
+        connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(QUrl)), this,
+            SLOT(setSourceFromSearchInNewTab(QUrl)));
     }
     tabWidget->insertTab(0, m_searchWidget, tr("Search"));
+    m_searchWidget->setAttached(true);
+}
+
+void CentralWidget::activateSearchWidget()
+{
+    if (!m_searchWidget->isAttached())
+        createSearchWidget(helpEngine->searchEngine());
+
+    tabWidget->setCurrentWidget(m_searchWidget);
+    m_searchWidget->setFocus();
 }
 
 void CentralWidget::removeSearchWidget()
 {
-    tabWidget->removeTab(0);
+    if (m_searchWidget && m_searchWidget->isAttached()) {
+        tabWidget->removeTab(0);
+        m_searchWidget->setAttached(false);
+    }
+}
+
+int CentralWidget::availableHelpViewer() const
+{
+    int count = tabWidget->count();
+    if (m_searchWidget && m_searchWidget->isAttached())
+        count--;
+    return count;
+}
+
+bool CentralWidget::enableTabCloseAction() const
+{
+    int minTabCount = 1;
+    if (m_searchWidget && m_searchWidget->isAttached())
+        minTabCount = 2;
+
+    return (tabWidget->count() > minTabCount);
 }
 
 QString CentralWidget::quoteTabTitle(const QString &title) const
@@ -1008,7 +1049,7 @@ CentralWidget::highlightSearchTerms()
     if (!viewer)
         return;
 
-    QHelpSearchEngine* searchEngine = helpEngine->searchEngine();
+    QHelpSearchEngine *searchEngine = helpEngine->searchEngine();
     QList<QHelpSearchQuery> queryList = searchEngine->query();
 
     QStringList terms;
diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h
index 75bd8be..2c28091 100644
--- a/tools/assistant/tools/assistant/centralwidget.h
+++ b/tools/assistant/tools/assistant/centralwidget.h
@@ -83,6 +83,9 @@ private slots:
     void updateButtons();
 
 private:
+    QToolButton* setupToolButton(const QString &text, const QString &icon);
+
+private:
     QLineEdit *editFind;
     QCheckBox *checkCase;
     QLabel *labelWrapped;
@@ -113,10 +116,14 @@ public:
     void setGlobalActions(const QList<QAction*> &actions);
     HelpViewer *currentHelpViewer() const;
     void activateTab(bool onlyHelpViewer = false);
-    void activateSearch();
+
     void createSearchWidget(QHelpSearchEngine *searchEngine);
+    void activateSearchWidget();
     void removeSearchWidget();
 
+    int availableHelpViewer() const;
+    bool enableTabCloseAction() const;
+
     void closeTabAt(int index);
     QMap<int, QString> currentSourceFileList() const;
 
@@ -167,7 +174,7 @@ private slots:
     void setSourceFromSearchInNewTab(const QUrl &url);
 
 private:
-    void connectSignals();    
+    void connectSignals();
     bool eventFilter(QObject *object, QEvent *e);
     void find(QString ttf, bool forward, bool backward);
     void initPrinter();
@@ -180,13 +187,13 @@ private:
     QList<QAction*> globalActionList;
 
     QWidget *findBar;
-    QTabWidget* tabWidget;
+    QTabWidget *tabWidget;
     FindWidget *findWidget;
     QHelpEngine *helpEngine;
     QPrinter *printer;
     bool usesDefaultCollection;
-    
-    SearchWidget* m_searchWidget;
+
+    SearchWidget *m_searchWidget;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/doc/assistant.qdocconf b/tools/assistant/tools/assistant/doc/assistant.qdocconf
index 0d2271d..aca97ed 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdocconf
+++ b/tools/assistant/tools/assistant/doc/assistant.qdocconf
@@ -10,8 +10,7 @@ description = "Qt Assistant"
 HTML.{postheader,address} = ""
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation " \
-              "and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.5.1</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.5.2</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp
index f7225fa..5726136 100644
--- a/tools/assistant/tools/assistant/helpviewer.cpp
+++ b/tools/assistant/tools/assistant/helpviewer.cpp
@@ -269,7 +269,10 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *,
 }
 
 HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
-    : QWebView(parent), helpEngine(engine), parentWidget(parent)
+    : QWebView(parent)
+    , helpEngine(engine)
+    , parentWidget(parent)
+    , loadFinished(false)
 {
     setAcceptDrops(false);
 
@@ -295,10 +298,12 @@ HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
     connect(page(), SIGNAL(linkHovered(QString, QString, QString)), this,
         SIGNAL(highlighted(QString)));
     connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
+    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool)));
 }
 
 void HelpViewer::setSource(const QUrl &url)
 {
+    loadFinished = false;
     if (url.toString() == QLatin1String("help")) {
         load(QUrl(QLatin1String("qthelp://com.trolltech.com."
             "assistantinternal_1.0.0/assistant/assistant.html")));
@@ -385,6 +390,12 @@ void HelpViewer::mousePressEvent(QMouseEvent *event)
     QWebView::mousePressEvent(event);
 }
 
+void HelpViewer::setLoadFinished(bool ok)
+{
+    loadFinished = ok;
+    emit sourceChanged(url());
+}
+
 #else  // !defined(QT_NO_WEBKIT)
 
 HelpViewer::HelpViewer(QHelpEngine *engine, CentralWidget *parent)
diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h
index eea7340..37545c7 100644
--- a/tools/assistant/tools/assistant/helpviewer.h
+++ b/tools/assistant/tools/assistant/helpviewer.h
@@ -92,6 +92,10 @@ public:
     { return pageAction(QWebPage::Forward)->isEnabled(); }
     inline bool isBackwardAvailable() const
     { return pageAction(QWebPage::Back)->isEnabled(); }
+    inline bool hasLoadFinished() const
+    { return loadFinished; }
+    inline qreal zoom() const
+    { return textSizeMultiplier(); }
 
 public Q_SLOTS:
     void home();
@@ -111,10 +115,12 @@ protected:
 
 private Q_SLOTS:
     void actionChanged();
+    void setLoadFinished(bool ok);
 
 private:
     QHelpEngine *helpEngine;
     CentralWidget* parentWidget;
+    bool loadFinished;
 };
 
 #else
diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp
index 0beb5ee..a2c0950 100644
--- a/tools/assistant/tools/assistant/indexwindow.cpp
+++ b/tools/assistant/tools/assistant/indexwindow.cpp
@@ -197,6 +197,8 @@ void IndexWindow::open(QHelpIndexWidget* indexWidget, const QModelIndex &index)
                 url = tc.link();
         } else if (links.count() == 1) {
             url = links.constBegin().value();
+        } else {
+            return;
         }
 
         if (url.path().endsWith(QLatin1String(".pdf"), Qt::CaseInsensitive))
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index bcafacc..426a828 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -86,9 +86,9 @@ QT_BEGIN_NAMESPACE
 
 MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
     : QMainWindow(parent)
+    , m_filterCombo(0)
     , m_toolBarMenu(0)
     , m_cmdLine(cmdLine)
-    , m_searchWidget(0)
     , m_progressWidget(0)
     , m_qtDocInstaller(0)
     , m_connectedInitSignals(false)
@@ -125,20 +125,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
     connect(searchEngine, SIGNAL(indexingStarted()), this, SLOT(indexingStarted()));
     connect(searchEngine, SIGNAL(indexingFinished()), this, SLOT(indexingFinished()));
 
-#ifdef QT_CLUCENE_SUPPORT
     m_centralWidget->createSearchWidget(searchEngine);
-#else
-    QDockWidget *dock = new QDockWidget(tr("Search"), this);
-    dock->setObjectName(QLatin1String("SearchWindow"));
-    m_searchWidget = new SearchWidget(searchEngine, this);
-    dock->setWidget(m_searchWidget);
-    addDockWidget(Qt::LeftDockWidgetArea, dock);
-
-    connect(m_searchWidget, SIGNAL(requestShowLink(const QUrl&)),
-        m_centralWidget, SLOT(setSource(const QUrl&)));
-    connect(m_searchWidget, SIGNAL(requestShowLinkInNewTab(const QUrl&)),
-        m_centralWidget, SLOT(setSourceInNewTab(const QUrl&)));
-#endif
 
     QString defWindowTitle = tr("Qt Assistant");
     setWindowTitle(defWindowTitle);
@@ -228,6 +215,20 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
         else if (m_cmdLine->bookmarks() == CmdLineParser::Activate)
             showBookmarks();
 
+        if (!m_cmdLine->currentFilter().isEmpty()) {
+            const QString &curFilter = m_cmdLine->currentFilter();
+            m_helpEngine->setCurrentFilter(curFilter);
+            if (m_filterCombo) {
+                int idx = m_filterCombo->findText(curFilter);
+                if (idx >= 0) {
+                    bool blocked = m_filterCombo->signalsBlocked();
+                    m_filterCombo->blockSignals(true);
+                    m_filterCombo->setCurrentIndex(idx);
+                    m_filterCombo->blockSignals(blocked);
+                }
+            }
+        }
+
         if (usesDefaultCollection())
             QTimer::singleShot(0, this, SLOT(lookForNewQtDocumentation()));
         else
@@ -304,6 +305,7 @@ bool MainWindow::initHelpDB()
             hc.addCustomFilter(tr("Unfiltered"), QStringList());
             hc.setCustomValue(unfiltered, 1);
         }
+
         m_helpEngine->blockSignals(true);
         m_helpEngine->setCurrentFilter(tr("Unfiltered"));
         m_helpEngine->blockSignals(false);
@@ -318,10 +320,10 @@ bool MainWindow::initHelpDB()
 void MainWindow::lookForNewQtDocumentation()
 {
     m_qtDocInstaller = new QtDocInstaller(m_helpEngine->collectionFile());
-    connect(m_qtDocInstaller, SIGNAL(errorMessage(const QString&)),
-        this, SLOT(displayInstallationError(const QString&)));
-    connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)),
-        this, SLOT(qtDocumentationInstalled(bool)));
+    connect(m_qtDocInstaller, SIGNAL(errorMessage(QString)), this,
+        SLOT(displayInstallationError(QString)));
+    connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)), this,
+        SLOT(qtDocumentationInstalled(bool)));
 
     QString versionKey = QString(QLatin1String("qtVersion%1$$$qt")).
         arg(QLatin1String(QT_VERSION_STR));
@@ -353,8 +355,8 @@ void MainWindow::checkInitState()
         if (!m_connectedInitSignals) {
             connect(m_helpEngine->contentModel(), SIGNAL(contentsCreated()),
                 this, SLOT(checkInitState()));
-            connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()),
-                this, SLOT(checkInitState()));
+            connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), this,
+                SLOT(checkInitState()));
             m_connectedInitSignals = true;
         }
     } else {
@@ -533,6 +535,8 @@ void MainWindow::setupActions()
         SLOT(copyAvailable(bool)));
     connect(m_centralWidget, SIGNAL(currentViewerChanged()), this,
         SLOT(updateNavigationItems()));
+    connect(m_centralWidget, SIGNAL(currentViewerChanged()), this,
+        SLOT(updateTabCloseAction()));
     connect(m_centralWidget, SIGNAL(forwardAvailable(bool)), this,
         SLOT(updateNavigationItems()));
     connect(m_centralWidget, SIGNAL(backwardAvailable(bool)), this,
@@ -601,8 +605,8 @@ void MainWindow::setupFilterToolbar()
 
     connect(m_helpEngine, SIGNAL(setupFinished()), this,
         SLOT(setupFilterCombo()));
-    connect(m_filterCombo, SIGNAL(activated(const QString&)), this,
-        SLOT(filterDocumentation(const QString&)));
+    connect(m_filterCombo, SIGNAL(activated(QString)), this,
+        SLOT(filterDocumentation(QString)));
 
     setupFilterCombo();
 }
@@ -626,12 +630,12 @@ void MainWindow::setupAddressToolbar()
     toolBarMenu()->addAction(addressToolBar->toggleViewAction());
 
     // address lineedit
-    connect(m_addressLineEdit, SIGNAL(returnPressed()),
-        this, SLOT(gotoAddress()));
-    connect(m_centralWidget, SIGNAL(currentViewerChanged()),
-        this, SLOT(showNewAddress()));
-    connect(m_centralWidget, SIGNAL(sourceChanged(const QUrl&)),
-        this, SLOT(showNewAddress(const QUrl&)));
+    connect(m_addressLineEdit, SIGNAL(returnPressed()), this,
+        SLOT(gotoAddress()));
+    connect(m_centralWidget, SIGNAL(currentViewerChanged()), this,
+        SLOT(showNewAddress()));
+    connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this,
+        SLOT(showNewAddress(QUrl)));
 }
 
 void MainWindow::updateAboutMenuText()
@@ -695,10 +699,14 @@ void MainWindow::updateNavigationItems()
     m_printAction->setEnabled(hasCurrentViewer);
     m_nextAction->setEnabled(m_centralWidget->isForwardAvailable());
     m_backAction->setEnabled(m_centralWidget->isBackwardAvailable());
-    m_closeTabAction->setEnabled(hasCurrentViewer);
     m_newTabAction->setEnabled(hasCurrentViewer);
 }
 
+void MainWindow::updateTabCloseAction()
+{
+    m_closeTabAction->setEnabled(m_centralWidget->enableTabCloseAction());
+}
+
 void MainWindow::showTopicChooser(const QMap<QString, QUrl> &links,
                                   const QString &keyword)
 {
@@ -712,10 +720,10 @@ void MainWindow::showPreferences()
 {
     PreferencesDialog dia(m_helpEngine, this);
 
-    connect(&dia, SIGNAL(updateApplicationFont()),
-        this, SLOT(updateApplicationFont()));
-    connect(&dia, SIGNAL(updateBrowserFont()),
-        m_centralWidget, SLOT(updateBrowserFont()));
+    connect(&dia, SIGNAL(updateApplicationFont()), this,
+        SLOT(updateApplicationFont()));
+    connect(&dia, SIGNAL(updateBrowserFont()), m_centralWidget,
+        SLOT(updateBrowserFont()));
 
     dia.showDialog();
 }
@@ -869,19 +877,12 @@ void MainWindow::activateCurrentCentralWidgetTab()
 
 void MainWindow::showSearch()
 {
-    if (m_searchWidget)
-        activateDockWidget(m_searchWidget);
-    else
-        m_centralWidget->activateSearch();
+    m_centralWidget->activateSearchWidget();
 }
 
 void MainWindow::hideSearch()
 {
-    if (m_searchWidget) {
-        m_searchWidget->parentWidget()->parentWidget()->hide();
-    } else {
-        m_centralWidget->removeSearchWidget();
-    }
+    m_centralWidget->removeSearchWidget();
 }
 
 void MainWindow::updateApplicationFont()
@@ -950,8 +951,7 @@ QWidget* MainWindow::setupBookmarkWidget()
 {
     m_bookmarkManager = new BookmarkManager(m_helpEngine);
     m_bookmarkWidget = new BookmarkWidget(m_bookmarkManager, this);
-    connect(m_bookmarkWidget, SIGNAL(addBookmark()),
-        this, SLOT(addBookmark()));
+    connect(m_bookmarkWidget, SIGNAL(addBookmark()), this, SLOT(addBookmark()));
     return m_bookmarkWidget;
 }
 
diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h
index c716b1c..7d08a74 100644
--- a/tools/assistant/tools/assistant/mainwindow.h
+++ b/tools/assistant/tools/assistant/mainwindow.h
@@ -62,8 +62,6 @@ class BookmarkWidget;
 class CmdLineParser;
 class QtDocInstaller;
 
-class SearchWidget;
-
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -106,6 +104,7 @@ private slots:
     void showAboutDialog();
     void copyAvailable(bool yes);
     void updateNavigationItems();
+    void updateTabCloseAction();
     void showNewAddress(const QUrl &url);
     void addNewBookmark(const QString &title, const QString &url);
     void showTopicChooser(const QMap<QString, QUrl> &links, const QString &keyword);
@@ -159,7 +158,6 @@ private:
     QMenu *m_toolBarMenu;
 
     CmdLineParser *m_cmdLine;
-    SearchWidget *m_searchWidget;
 
     QWidget *m_progressWidget;
     QtDocInstaller *m_qtDocInstaller;
diff --git a/tools/assistant/tools/assistant/searchwidget.cpp b/tools/assistant/tools/assistant/searchwidget.cpp
index 000c73d..c40a9c4 100644
--- a/tools/assistant/tools/assistant/searchwidget.cpp
+++ b/tools/assistant/tools/assistant/searchwidget.cpp
@@ -62,6 +62,7 @@ QT_BEGIN_NAMESPACE
 SearchWidget::SearchWidget(QHelpSearchEngine *engine, QWidget *parent)
     : QWidget(parent)
     , zoomCount(0)
+    , attached(false)
     , searchEngine(engine)
 {
     QVBoxLayout *vLayout = new QVBoxLayout(this);
@@ -70,16 +71,18 @@ SearchWidget::SearchWidget(QHelpSearchEngine *engine, QWidget *parent)
     QHelpSearchQueryWidget *queryWidget = searchEngine->queryWidget();
 
     vLayout->addWidget(queryWidget);
-    vLayout->addWidget(resultWidget);        
-    
+    vLayout->addWidget(resultWidget);
+
     setFocusProxy(queryWidget);
 
     connect(queryWidget, SIGNAL(search()), this, SLOT(search()));
-    connect(resultWidget, SIGNAL(requestShowLink(const QUrl&)), 
-        this, SIGNAL(requestShowLink(const QUrl&)));
+    connect(resultWidget, SIGNAL(requestShowLink(QUrl)), this,
+        SIGNAL(requestShowLink(QUrl)));
 
-    connect(searchEngine, SIGNAL(searchingStarted()), this, SLOT(searchingStarted()));
-    connect(searchEngine, SIGNAL(searchingFinished(int)), this, SLOT(searchingFinished(int)));
+    connect(searchEngine, SIGNAL(searchingStarted()), this,
+        SLOT(searchingStarted()));
+    connect(searchEngine, SIGNAL(searchingFinished(int)), this,
+        SLOT(searchingFinished(int)));
 
     QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
     browser->viewport()->installEventFilter(this);
@@ -92,10 +95,6 @@ SearchWidget::~SearchWidget()
 
 void SearchWidget::zoomIn()
 {
-#ifndef QT_CLUCENE_SUPPORT
-    return;
-#endif
-
     QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
     if (browser && zoomCount != 10) {
         zoomCount++;
@@ -105,10 +104,6 @@ void SearchWidget::zoomIn()
 
 void SearchWidget::zoomOut()
 {
-#ifndef QT_CLUCENE_SUPPORT
-        return;
-#endif
-
     QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
     if (browser && zoomCount != -5) {
         zoomCount--;
@@ -118,10 +113,6 @@ void SearchWidget::zoomOut()
 
 void SearchWidget::resetZoom()
 {
-#ifndef QT_CLUCENE_SUPPORT
-    return;
-#endif
-
     if (zoomCount == 0)
         return;
 
@@ -132,6 +123,16 @@ void SearchWidget::resetZoom()
     }
 }
 
+bool SearchWidget::isAttached() const
+{
+    return attached;
+}
+
+void SearchWidget::setAttached(bool state)
+{
+    attached = state;
+}
+
 void SearchWidget::search() const
 {
     QList<QHelpSearchQuery> query = searchEngine->queryWidget()->query();
@@ -152,7 +153,8 @@ void SearchWidget::searchingFinished(int hits)
 bool SearchWidget::eventFilter(QObject* o, QEvent *e)
 {
     QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
-    if (browser && o == browser->viewport() && e->type() == QEvent::MouseButtonRelease){
+    if (browser && o == browser->viewport()
+        && e->type() == QEvent::MouseButtonRelease){
         QMouseEvent *me = static_cast<QMouseEvent*>(e);
         QUrl link = resultWidget->linkAt(me->pos());
         if (!link.isEmpty() || link.isValid()) {
@@ -179,7 +181,6 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
     QMenu menu;
     QPoint point = contextMenuEvent->globalPos();
 
-#ifdef QT_CLUCENE_SUPPORT
     QTextBrowser* browser = qFindChild<QTextBrowser*>(resultWidget);
     if (!browser)
         return;
@@ -190,22 +191,25 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
 
     QUrl link = browser->anchorAt(point);
 
-    QAction *copyAction = menu.addAction(tr("&Copy") + 
-        QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL | Qt::Key_C))));
+    QKeySequence keySeq(QKeySequence::Copy);
+    QAction *copyAction = menu.addAction(tr("&Copy") + QLatin1String("\t") +
+        keySeq.toString(QKeySequence::NativeText));
     copyAction->setEnabled(QTextCursor(browser->textCursor()).hasSelection());
 
     QAction *copyAnchorAction = menu.addAction(tr("Copy &Link Location"));
     copyAnchorAction->setEnabled(!link.isEmpty() && link.isValid());
 
-    QAction *newTabAction = menu.addAction(tr("Open Link in New Tab") + 
-        QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL))) + 
+    keySeq = QKeySequence(Qt::CTRL);
+    QAction *newTabAction = menu.addAction(tr("Open Link in New Tab") +
+        QLatin1String("\t") + keySeq.toString(QKeySequence::NativeText) +
         QLatin1String("LMB"));
     newTabAction->setEnabled(!link.isEmpty() && link.isValid());
 
     menu.addSeparator();
 
-    QAction *selectAllAction = menu.addAction(tr("Select All") + 
-        QString(QLatin1String("\t") + QString(QKeySequence(Qt::CTRL | Qt::Key_A))));
+    keySeq = QKeySequence::SelectAll;
+    QAction *selectAllAction = menu.addAction(tr("Select All") +
+        QLatin1String("\t") + keySeq.toString(QKeySequence::NativeText));
 
     QAction *usedAction = menu.exec(mapToGlobal(contextMenuEvent->pos()));
     if (usedAction == copyAction) {
@@ -222,25 +226,10 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
     }
     else if (usedAction == newTabAction) {
         emit requestShowLinkInNewTab(link);
-    } 
+    }
     else if (usedAction == selectAllAction) {
         browser->selectAll();
     }
-#else
-    point = resultWidget->mapFromGlobal(point);
-    QUrl link = resultWidget->linkAt(point);
-    if (link.isEmpty() || !link.isValid())
-        return;
-
-    QAction *curTab = menu.addAction(tr("Open Link"));
-    QAction *newTab = menu.addAction(tr("Open Link in New Tab"));
-
-    QAction *action = menu.exec(mapToGlobal(contextMenuEvent->pos()));
-    if (curTab == action)
-        emit requestShowLink(link);
-    else if (newTab == action)
-        emit requestShowLinkInNewTab(link);
-#endif
 }
 
 QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/searchwidget.h b/tools/assistant/tools/assistant/searchwidget.h
index 22fe80d..34eb86f 100644
--- a/tools/assistant/tools/assistant/searchwidget.h
+++ b/tools/assistant/tools/assistant/searchwidget.h
@@ -65,6 +65,9 @@ public:
     void zoomOut();
     void resetZoom();
 
+    bool isAttached() const;
+    void setAttached(bool state);
+
 signals:
     void requestShowLink(const QUrl &url);
     void requestShowLinkInNewTab(const QUrl &url);
@@ -81,6 +84,7 @@ private:
 
 private:
     int zoomCount;
+    bool attached;
     QHelpSearchEngine *searchEngine;
     QHelpSearchResultWidget *resultWidget;
 };
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 9930da8..40bf59f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -315,7 +315,6 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "QT3SUPPORT" ]      = "yes";
     dictionary[ "ACCESSIBILITY" ]   = "yes";
     dictionary[ "OPENGL" ]          = "yes";
-    dictionary[ "DIRECT3D" ]        = "auto";
     dictionary[ "IPV6" ]            = "yes"; // Always, dynamicly loaded
     dictionary[ "OPENSSL" ]         = "auto";
     dictionary[ "DBUS" ]            = "auto";
@@ -818,11 +817,7 @@ void Configure::parseCmdLine()
         else if (configCmdLine.at(i) == "-iwmmxt")
             dictionary[ "IWMMXT" ] = "yes";
 
-        else if (configCmdLine.at(i) == "-no-direct3d") {
-            dictionary["DIRECT3D"] = "no";
-        }else if (configCmdLine.at(i) == "-direct3d") {
-            dictionary["DIRECT3D"] = "auto"; // have to pass auto detection to enable Direct3D
-        } else if( configCmdLine.at(i) == "-no-openssl" ) {
+        else if( configCmdLine.at(i) == "-no-openssl" ) {
               dictionary[ "OPENSSL"] = "no";
         } else if( configCmdLine.at(i) == "-openssl" ) {
               dictionary[ "OPENSSL" ] = "yes";
@@ -1320,7 +1315,6 @@ void Configure::applySpecSpecifics()
         dictionary[ "MMX" ]                 = "no";
         dictionary[ "IWMMXT" ]              = "no";
         dictionary[ "CE_CRT" ]              = "yes";
-        dictionary[ "DIRECT3D" ]            = "no";
         dictionary[ "WEBKIT" ]              = "no";
         dictionary[ "PHONON" ]              = "yes";
         dictionary[ "DIRECTSHOW" ]          = "no";
@@ -1419,7 +1413,7 @@ bool Configure::displayHelp()
                     "[-system-libtiff] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg]\n"
                     "[-no-libmng] [-qt-libmng] [-system-libmng] [-no-qt3support] [-mmx]\n"
                     "[-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n"
-                    "[-no-iwmmxt] [-iwmmxt] [-direct3d] [-openssl] [-openssl-linked]\n"
+                    "[-no-iwmmxt] [-iwmmxt] [-openssl] [-openssl-linked]\n"
                     "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
                     "[-qtnamespace <namespace>] [-no-phonon] [-phonon]\n"
                     "[-no-phonon-backend] [-phonon-backend]\n"
@@ -1583,7 +1577,6 @@ bool Configure::displayHelp()
         desc("SSE", "yes",      "-sse",                 "Compile with use of SSE instructions");
         desc("SSE2", "no",      "-no-sse2",             "Do not compile with use of SSE2 instructions");
         desc("SSE2", "yes",      "-sse2",               "Compile with use of SSE2 instructions");
-        desc("DIRECT3D", "yes",  "-direct3d",           "Compile in Direct3D support (experimental - see INSTALL for more info)");
         desc("OPENSSL", "no",    "-no-openssl",         "Do not compile in OpenSSL support");
         desc("OPENSSL", "yes",   "-openssl",            "Compile in run-time OpenSSL support");
         desc("OPENSSL", "linked","-openssl-linked",     "Compile in linked OpenSSL support");
@@ -1831,47 +1824,6 @@ bool Configure::checkAvailability(const QString &part)
                && dictionary.value("QMAKESPEC") != "win32-msvc.net" // Leave for now, since we can't be sure if they are using 2002 or 2003 with this spec
                && dictionary.value("QMAKESPEC") != "win32-msvc2002"
                && dictionary.value("EXCEPTIONS") == "yes";
-    } else if (part == "DIRECT3D") {
-        QString sdk_dir(QString::fromLocal8Bit(getenv("DXSDK_DIR")));
-        QDir dir;
-        bool has_d3d = false;
-
-        if (!sdk_dir.isEmpty() && dir.exists(sdk_dir))
-            has_d3d = true;
-
-        if (has_d3d && !QFile::exists(sdk_dir + QLatin1String("\\include\\d3d9.h"))) {
-            cout << "No Direct3D version 9 SDK found." << endl;
-           has_d3d = false;
-        }
-
-        // find the first dxguid.lib in the current LIB paths, if it is NOT
-        // the D3D SDK one, we're most likely in trouble..
-        if (has_d3d) {
-            has_d3d = false;
-            QString env_lib(QString::fromLocal8Bit(getenv("LIB")));
-            QStringList lib_paths = env_lib.split(';');
-            for (int i=0; i<lib_paths.size(); ++i) {
-               QString lib_path = lib_paths.at(i);
-                if (QFile::exists(lib_path + QLatin1String("\\dxguid.lib")))
-                {
-                    if (lib_path.startsWith(sdk_dir)) {
-                        has_d3d = true;
-                    } else {
-                        cout << "Your D3D/Platform SDK library paths seem to appear in the wrong order." << endl;
-                    }
-                    break;
-                }
-            }
-        }
-
-        available = has_d3d;
-        if (!has_d3d) {
-            cout << "Setting Direct3D to NO, since the proper Direct3D SDK was not detected." << endl
-                 << "Make sure you have the Direct3D SDK installed, and that you have run" << endl
-                 << "the <path to SDK>\\Utilities\\Bin\\dx_setenv.cmd script." << endl
-                 << "The D3D SDK library path *needs* to appear before the Platform SDK library" << endl
-                 << "path in your LIB environment variable." << endl;
-        }
     } else if (part == "PHONON") {
         available = findFile("vmr9.h") && findFile("dshow.h") && findFile("strmiids.lib") &&
                         findFile("dmoguids.lib") && findFile("msdmo.lib") && findFile("d3d9.h");
@@ -1965,8 +1917,6 @@ void Configure::autoDetection()
         dictionary["SCRIPTTOOLS"] = checkAvailability("SCRIPTTOOLS") ? "yes" : "no";
     if (dictionary["XMLPATTERNS"] == "auto")
         dictionary["XMLPATTERNS"] = checkAvailability("XMLPATTERNS") ? "yes" : "no";
-    if (dictionary["DIRECT3D"] == "auto")
-        dictionary["DIRECT3D"] = checkAvailability("DIRECT3D") ? "yes" : "no";
     if (dictionary["PHONON"] == "auto")
         dictionary["PHONON"] = checkAvailability("PHONON") ? "yes" : "no";
     if (dictionary["WEBKIT"] == "auto")
@@ -2291,9 +2241,6 @@ void Configure::generateOutputVars()
      if ( dictionary["DIRECTSHOW"] == "yes" )
         qtConfig += "directshow";
 
-    if (dictionary[ "DIRECT3D" ] == "yes")
-        qtConfig += "direct3d";
-
     if (dictionary[ "OPENSSL" ] == "yes")
         qtConfig += "openssl";
     else if (dictionary[ "OPENSSL" ] == "linked")
@@ -2676,7 +2623,6 @@ void Configure::generateConfigfiles()
         if(dictionary["ACCESSIBILITY"] == "no")     qconfigList += "QT_NO_ACCESSIBILITY";
         if(dictionary["EXCEPTIONS"] == "no")        qconfigList += "QT_NO_EXCEPTIONS";
         if(dictionary["OPENGL"] == "no")            qconfigList += "QT_NO_OPENGL";
-        if(dictionary["DIRECT3D"] == "no")          qconfigList += "QT_NO_DIRECT3D";
         if(dictionary["OPENSSL"] == "no")           qconfigList += "QT_NO_OPENSSL";
         if(dictionary["OPENSSL"] == "linked")       qconfigList += "QT_LINKED_OPENSSL";
         if(dictionary["DBUS"] == "no")              qconfigList += "QT_NO_DBUS";
@@ -2937,7 +2883,6 @@ void Configure::displayConfig()
     cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;
     cout << "IWMMXT support.............." << dictionary[ "IWMMXT" ] << endl;
     cout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl;
-    cout << "Direct3D support............" << dictionary[ "DIRECT3D" ] << endl;
     cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
     cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl;
     cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl;
diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.cpp b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
index ead404b..eab7a12 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -200,14 +200,15 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
     colors.push_back(QColor(234, 191, 255));
     colors.push_back(QColor(255, 191, 239));
     m_colors.reserve(colors.count());
+    const int darknessFactor = 250;
     for (int i = 0; i < colors.count(); i++) {
         QColor c = colors.at(i);
-        m_colors.push_back(qMakePair(c, c.darker(150)));
+        m_colors.push_back(qMakePair(c, c.darker(darknessFactor)));
     }
     QColor dynamicColor(191, 207, 255);
     QColor layoutColor(255, 191, 191);
-    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(150));
-    m_layoutColor = qMakePair(layoutColor, layoutColor.darker(150));
+    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(darknessFactor));
+    m_layoutColor = qMakePair(layoutColor, layoutColor.darker(darknessFactor));
 
     updateForegroundBrightness();
 
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index e271590..7e84c90 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -694,7 +694,7 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
         QString element;
         QString name;
         QmlClassNode* qmlClass = 0;
-        if (splitQmlArg(arg,element,name)) {
+        if (splitQmlArg(doc,arg,element,name)) {
             Node* n = tre->findNode(QStringList(element),Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 qmlClass = static_cast<const QmlClassNode*>(n);
@@ -721,7 +721,8 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc,
   and returns true. If any of the parts isn't found,
   a debug message is output and false is returned.
  */
-bool CppCodeParser::splitQmlPropertyArg(const QString& arg,
+bool CppCodeParser::splitQmlPropertyArg(const Doc& doc,
+                                        const QString& arg,
                                         QString& type,
                                         QString& element,
                                         QString& property)
@@ -736,10 +737,10 @@ bool CppCodeParser::splitQmlPropertyArg(const QString& arg,
             return true;
         }
         else
-            qDebug() << "Missing QML element name or property name";
+            doc.location().warning(tr("Missing QML element name or property name"));
     }
     else
-        qDebug() << "Missing QML property type or property path";
+        doc.location().warning(tr("Missing QML property type or property path"));
     return false;
 }
 
@@ -753,7 +754,8 @@ bool CppCodeParser::splitQmlPropertyArg(const QString& arg,
   true. If either of the parts isn't found, a debug
   message is output and false is returned.
  */
-bool CppCodeParser::splitQmlArg(const QString& arg,
+bool CppCodeParser::splitQmlArg(const Doc& doc,
+                                const QString& arg,
                                 QString& element,
                                 QString& name)
 {
@@ -764,7 +766,7 @@ bool CppCodeParser::splitQmlArg(const QString& arg,
         return true;
     }
     else
-        qDebug() << "Missing QML element name or signal/method name";
+        doc.location().warning(tr("Missing QML element name or signal/method name"));
     return false;
 }
 
@@ -773,7 +775,8 @@ bool CppCodeParser::splitQmlArg(const QString& arg,
 
   Currently, this function is called only for \e{qmlproperty}.
  */
-Node *CppCodeParser::processTopicCommandGroup(const QString& command,
+Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
+                                              const QString& command,
                                               const QStringList& args)
 {
     QmlPropGroupNode* qmlPropGroup = 0;
@@ -782,7 +785,7 @@ Node *CppCodeParser::processTopicCommandGroup(const QString& command,
         QString element;
         QString property;
         QStringList::ConstIterator arg = args.begin();
-        if (splitQmlPropertyArg(*arg,type,element,property)) {
+        if (splitQmlPropertyArg(doc,(*arg),type,element,property)) {
             Node* n = tre->findNode(QStringList(element),Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 QmlClassNode* qmlClass = static_cast<QmlClassNode*>(n);
@@ -794,7 +797,7 @@ Node *CppCodeParser::processTopicCommandGroup(const QString& command,
             new QmlPropertyNode(qmlPropGroup,property,type);
             ++arg;
             while (arg != args.end()) {
-                if (splitQmlPropertyArg(*arg,type,element,property)) {
+                if (splitQmlPropertyArg(doc,(*arg),type,element,property)) {
                     new QmlPropertyNode(qmlPropGroup,property,type);
                 }
                 ++arg;
@@ -1974,7 +1977,7 @@ bool CppCodeParser::matchDocsAndStuff()
 #ifdef QDOC_QML
                 if (topic == COMMAND_QMLPROPERTY) {
                     Doc nodeDoc = doc;
-                    Node *node = processTopicCommandGroup(topic, args);
+                    Node *node = processTopicCommandGroup(nodeDoc,topic,args);
                     if (node != 0) {
                         nodes.append(node);
                         docs.append(nodeDoc);
@@ -1984,7 +1987,7 @@ bool CppCodeParser::matchDocsAndStuff()
                     QStringList::ConstIterator a = args.begin();
                     while (a != args.end()) {
                         Doc nodeDoc = doc;
-                        Node *node = processTopicCommand(nodeDoc, topic, *a);
+                        Node *node = processTopicCommand(nodeDoc,topic,*a);
                         if (node != 0) {
                             nodes.append(node);
                             docs.append(nodeDoc);
diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h
index 2eb2fb3..3864990 100644
--- a/tools/qdoc3/cppcodeparser.h
+++ b/tools/qdoc3/cppcodeparser.h
@@ -92,13 +92,16 @@ class CppCodeParser : public CodeParser
                                       const QString& arg);
 #ifdef QDOC_QML    
     // might need to implement this in QsCodeParser as well.
-    virtual Node *processTopicCommandGroup(const QString& command,
+    virtual Node *processTopicCommandGroup(const Doc& doc,
+                                           const QString& command,
                                            const QStringList& args);
-    bool splitQmlPropertyArg(const QString& arg,
+    bool splitQmlPropertyArg(const Doc& doc,
+                             const QString& arg,
                              QString& type,
                              QString& element,
                              QString& property);
-    bool splitQmlArg(const QString& arg,
+    bool splitQmlArg(const Doc& doc,
+                     const QString& arg,
                      QString& element,
                      QString& name);
 #endif
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 3268585..2bba8fb 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -99,10 +99,3 @@ SOURCES += apigenerator.cpp \
            webxmlgenerator.cpp \
 	   yyindent.cpp
 
-
-win32 {
-    QT_WINCONFIG = release
-    CONFIG(debug, debug|release) {
-        QT_WINCONFIG = debug
-    }    
-}
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index c023c51..b82507f 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -6,14 +6,14 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Assistant
 description             = Qt Assistant Manual
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
 qhp.projects            = Assistant
 
 qhp.Assistant.file                = assistant.qhp
-qhp.Assistant.namespace           = com.trolltech.assistant.451
+qhp.Assistant.namespace           = com.trolltech.assistant.452
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
diff --git a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
index 683048d..aee5e17 100644
--- a/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
@@ -6,7 +6,7 @@ macro.TheEclipseIntegration = Carbide.c++
 
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"40%\" align="left">Copyright &copy; 2009 <a href=\"http://doc.trolltech.com/trolltech.html\">Nokia Corporation</a></td>\n" \
-              "<td width=\"30%\" align=\"center\"><a href=\"http://doc.trolltech.com\">Trademarks</a></td>\n" \
-              "<td width=\"40%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"40%\" align=\"center\"><a href=\"http://doc.qtsoftware.com\">Trademarks</a></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 45bb4b5..9c0790e 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -6,14 +6,14 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Designer
 description             = Qt Designer Manual
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
 qhp.projects            = Designer
 
 qhp.Designer.file                = designer.qhp
-qhp.Designer.namespace           = com.trolltech.designer.451
+qhp.Designer.namespace           = com.trolltech.designer.452
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
diff --git a/tools/qdoc3/test/eclipse-integration.qdocconf b/tools/qdoc3/test/eclipse-integration.qdocconf
index 1fdaa1b..d9e4ac7 100644
--- a/tools/qdoc3/test/eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/eclipse-integration.qdocconf
@@ -8,6 +8,6 @@ outputdir = $QTDIR/../qteclipsetools/main/doc/html
 
 project               = Qt Eclipse Integration
 description           = "Qt Eclipse Integration"
-url                   = http://doc.trolltech.com/eclipse-integration-4.4
+url                   = http://doc.qtsoftware.com/qt-eclipse-1.5
 
 HTML.{postheader,address} = ""
diff --git a/tools/qdoc3/test/jambi.qdocconf b/tools/qdoc3/test/jambi.qdocconf
index 3644b69..101b33a 100644
--- a/tools/qdoc3/test/jambi.qdocconf
+++ b/tools/qdoc3/test/jambi.qdocconf
@@ -3,7 +3,7 @@ include(macros.qdocconf)
 
 project                 = Qt Jambi
 description             = Qt Jambi Reference Documentation
-url                     = http://doc.trolltech.com/qtjambi
+url                     = http://doc.qtsoftware.com/qtjambi
 
 version                 = 4.4.0_01
 
@@ -41,7 +41,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\">Copyright &copy; \$THISYEAR\$ <a href=\"trolltech.html\">Trolltech</a></td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Jambi \\version</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index f4ee211..da49abe 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -6,14 +6,14 @@ include(qt-defines.qdocconf)
 
 project                 = Qt Linguist
 description             = Qt Linguist Manual
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
 qhp.projects            = Linguist
 
 qhp.Linguist.file                = linguist.qhp
-qhp.Linguist.namespace           = com.trolltech.linguist.451
+qhp.Linguist.namespace           = com.trolltech.linguist.452
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 642e3be..5e2cac7 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -6,14 +6,14 @@ include(qt-defines.qdocconf)
 
 project                 = QMake
 description             = QMake Manual
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
 
 qhp.projects            = qmake
 
 qhp.qmake.file                = qmake.qhp
-qhp.qmake.namespace           = com.trolltech.qmake.451
+qhp.qmake.namespace           = com.trolltech.qmake.452
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 1b3063b..6e0253a 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qt
 description             = Qt Reference Documentation
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
@@ -20,7 +20,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.451
+qhp.Qt.namespace           = com.trolltech.qt.452
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -105,7 +105,8 @@ exampledirs             = $QT_SOURCE_TREE/doc/src \
                           $QT_SOURCE_TREE/examples \
                           $QT_SOURCE_TREE/examples/tutorials \
                           $QT_SOURCE_TREE \
-                          $QT_SOURCE_TREE/qmake/examples
+                          $QT_SOURCE_TREE/qmake/examples \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
 imagedirs               = $QT_SOURCE_TREE/doc/src/images \
                           $QT_SOURCE_TREE/examples \
                           $QT_SOURCE_TREE/doc/src/declarative/pics
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index f09192a..dc027d0 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -25,8 +25,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\" align=\"left\">Copyright &copy; %THISYEAR% Nokia Corporation " \
-                          "and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 97893dc..d6cb0e6 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -3,7 +3,7 @@ include(macros.qdocconf)
 
 project                 = Qt
 description             = Qt Reference Documentation
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 edition.Console         = QtCore QtNetwork QtSql QtXml QtScript QtTest
 edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
@@ -20,7 +20,8 @@ headerdirs              = $QDOC_CURRENT_DIR
 exampledirs             = $QTDIR/doc/src \
                           $QTDIR/examples \
                           $QTDIR \
-                          $QTDIR/qmake/examples
+                          $QTDIR/qmake/examples \
+                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
 imagedirs               = $QTDIR/doc/src/images \
                           $QTDIR/examples
 outputdir               = $QTDIR/doc/html
@@ -140,7 +141,7 @@ HTML.postheader         = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\">Copyright &copy; %THISYEAR% <a href=\"trolltech.html\">Trolltech</a></td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
                           "</tr></table></div></address>"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index ac86348..e1ce8d3 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -8,7 +8,7 @@ project                 = Qt
 versionsym              =
 version                 = %VERSION%
 description             = Qt Reference Documentation
-url                     = http://doc.trolltech.com/4.5
+url                     = http://doc.qtsoftware.com/4.5
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
@@ -22,7 +22,7 @@ edition.DesktopLight.groups       = -graphicsview-api
 qhp.projects            = Qt
 
 qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.451
+qhp.Qt.namespace           = com.trolltech.qt.452
 qhp.Qt.virtualFolder       = qdoc
 qhp.Qt.indexTitle          = Qt Reference Documentation
 qhp.Qt.indexRoot           =
@@ -107,7 +107,8 @@ exampledirs             = $QTDIR/doc/src \
                           $QTDIR/examples \
                           $QTDIR/examples/tutorials \
                           $QTDIR \
-                          $QTDIR/qmake/examples
+                          $QTDIR/qmake/examples \
+                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
 imagedirs               = $QTDIR/doc/src/images \
                           $QTDIR/examples \
 			  $QTDIR/doc/src/declarative/pics
diff --git a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
index c3c4291..127b578 100644
--- a/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
+++ b/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
@@ -5,7 +5,7 @@ macro.TheEclipseIntegration = The Qt Eclipse Integration
 
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"40%\" align="left">Copyright &copy; 2009 <a href=\"http://doc.trolltech.com\">Nokia Corporation</a></td>\n" \
-              "<td width=\"30%\" align=\"center\"><a href=\"http://doc.trolltech.com/trademarks.html\">Trademarks</a></td>\n" \
-              "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.4.3</div></td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"40%\" align=\"center\"><a href=\"http://doc.qtsoftware.com/trademarks.html\">Trademarks</a></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.4.3</div></td>\n" \
               "</tr></table></div></address>"
diff --git a/tools/qmlconv/qmlconv.cpp b/tools/qmlconv/qmlconv.cpp
new file mode 100644
index 0000000..3ba40a4
--- /dev/null
+++ b/tools/qmlconv/qmlconv.cpp
@@ -0,0 +1,480 @@
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QStack>
+#include <QtCore/QStringList>
+#include <QtCore/QDebug>
+
+
+static bool optionInPlace = false;
+
+class Reader
+{
+    QString outString;
+    QTextStream out;
+    QXmlStreamReader xml;
+    int depth;
+    bool supressIndent;
+
+    QStringList knownListProperties;
+    inline QString depthString() {if (supressIndent) { supressIndent = false; return QString(); }
+        return QString(depth*4, QLatin1Char(' '));}
+
+public:
+    Reader(QIODevice *in)
+        :xml(in) {
+
+        knownListProperties << "states" << "transitions" << "children" << "resources"
+                << "transform" << "notes";
+        depth = 0;
+        supressIndent = false;
+
+        out.setString(&outString);
+
+        loop();
+
+        out.flush();
+
+        if (! optionInPlace) {
+            QTextStream print(stdout);
+            print << outString;
+        }
+    }
+
+    QString output() const
+    {
+        return outString;
+    }
+
+    void comment()
+    {
+        if (xml.isComment()) {
+            out << depthString() << "// "
+                << xml.text().toString().trimmed().replace(QRegExp("\n\\s*"),"\n"+depthString()+"// ")
+                << endl;
+        }
+    }
+
+    void emptyLoop() {
+        while (!xml.atEnd()) {
+            xml.readNext();
+            comment();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                return;
+        }
+    }
+
+    void loop()
+    {
+        while (!xml.atEnd()) {
+            xml.readNext();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                return;
+            else if (xml.tokenType() == QXmlStreamReader::StartElement)
+                startElement();
+            else if (xml.tokenType() == QXmlStreamReader::ProcessingInstruction) {
+                if (xml.processingInstructionTarget() == QLatin1String("qtfx")) {
+                    QString data = xml.processingInstructionData().toString().trimmed();
+                    if (data.startsWith(QLatin1String("namespacepath:="))) {
+                        outString.prepend( QLatin1String("import \"") + data.mid(data.indexOf(QLatin1Char('='))+1) + QLatin1String("\"\n"));
+                    }
+                }
+            }
+            comment();
+        }
+    }
+
+    void startElement() {
+
+        if (!propertyChangeSet.isEmpty()
+            && xml.name() != "SetProperties"
+            && xml.name() != "SetProperty") {
+            clearPropertyChangeSet();
+        }
+
+        if (false && xml.name() == "properties")
+            startDeclareProperties();
+        else if (false && xml.name() == "signals")
+            startDeclareSignals();
+        else if (false && xml.name() == "states")
+            loop(); // ignore
+        else if (false && xml.name() == "transitions")
+            loop(); // ignore
+        else if (knownListProperties.contains(xml.name().toString()))
+            startList();
+        else if (false && xml.name() == "SetProperties")
+            startSetProperties();
+        else if (false && xml.name() == "SetProperty")
+            startSetProperty();
+        else if (false && xml.name() == "ParentChange")
+            startParentChange();
+        else if (true && xml.name() == "Connection")
+            startConnection();
+        else if (false && xml.name() == "Script")
+            startScript();
+        else if (xml.name().at(0).isLower() && xml.attributes().isEmpty())
+            startObjectProperty();
+        else
+            startItem();
+    }
+
+    static void possiblyRemoveBraces(QString *s) {
+        if (s->startsWith('{') && s->endsWith('}'))
+            *s = s->mid(1, s->length() - 2);
+    }
+
+    static bool isNumber(const QString &s) {
+        bool ok = true;
+        s.toFloat(&ok);
+        return ok;
+    }
+
+    static bool isSignalHandler(const QString &s) {
+        return s.size() > 3
+                && s.startsWith("on")
+                && s.at(2).isUpper();
+    }
+
+    static bool isEnum(const QString &property, const QString &value)  {
+        return !value.contains(' ') && (property == "vAlign" || property == "hAlign"
+                                        || property == "style");
+    }
+
+    static bool isIdentifier(const QString &s) {
+        if (s.isEmpty())
+            return false;
+        if (!s.at(1).isLetter())
+            return false;
+        for (int i = 1; i < s.size(); ++i) {
+            QChar c = s.at(i);
+            if (c.isLetterOrNumber()
+                || c == QLatin1Char('_')
+                || c == QLatin1Char('-'))
+                continue;
+            return false;
+        }
+        return true;
+    }
+
+
+    void setProperty(const QString &property, const QString &value, bool newline = true) {
+        QString v = value.trimmed();
+        if (v.startsWith('{')) {
+            possiblyRemoveBraces(&v);
+        } else if (v == "true"
+                   || v == "false"
+                   || isNumber(v)
+                   || property == "id"
+                   || isEnum(property, value)
+                   ) {
+            ;
+        } else if (isSignalHandler(property)) {
+            // if not a function name, create an anonymous function
+            if (!isIdentifier(v)) {
+                v.prepend("{ ");
+                v.append(" }");
+            }
+        } else
+
+            //            if (property == "text" || property == "name" || value.contains(' ')
+            //            || value.contains("/") || value.startsWith('#')
+            //            || property == "filename" || property == "source" || property == "src"
+            //                    || property == "title" || property == "movieTitle" || property == "movieDescription"
+            //                    || property == "properties" || property == "fromState" || property == "toState"
+            //                    )
+        {
+            v.prepend('\"');
+            v.append('\"');
+        }
+
+//        QByteArray semiColon = ";";
+//        if (v.endsWith(QLatin1Char('}')) || v.endsWith(QLatin1Char(';')))
+//            semiColon.clear();
+
+        if (!newline)
+            out << property << ": " << v /* << semiColon.constData() */;
+        else
+            out << depthString() << property << ": " << v /* << semiColon.constData() */  << endl;
+    }
+
+
+    typedef QPair<QString,QString> StringPair;
+    QList<StringPair> propertyChangeSet;
+    void startItem(bool inList = false) {
+
+        QString name = xml.name().toString();
+
+        out << depthString() << name << " {" << endl;
+        ++depth;
+
+        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
+            setProperty(attribute.name().toString(), attribute.value().toString());
+        }
+
+        if (name == "Script") {
+            QString text = xml.readElementText();
+            if (!text.trimmed().isEmpty()) {
+                out << text << endl;
+            }
+        } else {
+            loop();
+        }
+
+        if (name == "State")
+            clearPropertyChangeSet();
+
+        --depth;
+        out << depthString() << "}";
+        if (!inList)
+            out << endl;
+    }
+
+    void clearPropertyChangeSet() {
+        if (propertyChangeSet.isEmpty())
+            return;
+
+        out << depthString() << "PropertyChangeSet" << " {" << endl;
+        ++depth;
+        foreach(StringPair pair, propertyChangeSet)
+            setProperty(pair.first, pair.second);
+        --depth;
+        out << depthString() << "}" << endl;
+        propertyChangeSet.clear();
+    }
+
+    void startObjectProperty() {
+
+        QString name = xml.name().toString();
+        bool hasElements = false;
+        while (!xml.atEnd()) {
+            xml.readNext();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                break;
+            if (xml.tokenType() == QXmlStreamReader::StartElement) {
+                hasElements = true;
+                out << depthString() << name << ": ";
+                supressIndent = true;
+                startElement();
+            } else if (!hasElements && xml.tokenType() == QXmlStreamReader::Characters) {
+                if (!xml.text().toString().trimmed().isEmpty()) {
+                    setProperty(name, xml.text().toString());
+                }
+            }
+            comment();
+        }
+    }
+
+    void startDeclareProperty() {
+        out << depthString() << "public property ";
+
+        if (xml.attributes().hasAttribute("type"))
+            out << "/* " << xml.attributes().value("type").toString() << " */ ";
+
+        QString name = xml.attributes().value("name").toString();
+
+        if (xml.attributes().hasAttribute("value"))
+            setProperty(name, xml.attributes().value("value").toString(), false);
+        else out << name;
+
+        QMap<QString, QString> attributes;
+        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
+            if (attribute.name() == "name" || attribute.name() == "value")
+                continue;
+            attributes.insert(attribute.name().toString(), attribute.value().toString());
+        }
+        out << endl;
+        emptyLoop();
+    }
+
+    void startDeclareProperties() {
+        while (!xml.atEnd()) {
+            xml.readNext();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                return;
+            if (xml.tokenType() == QXmlStreamReader::StartElement) {
+                if (xml.name() == "Property")
+                    startDeclareProperty();
+            }
+            comment();
+        }
+    }
+
+    void startDeclareSignal() {
+        out << depthString() << "public signal " << xml.attributes().value("name").toString() << endl;
+        emptyLoop();
+    }
+
+    void startDeclareSignals() {
+        while (!xml.atEnd()) {
+            xml.readNext();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                return;
+            if (xml.tokenType() == QXmlStreamReader::StartElement) {
+                if (xml.name() == "Signal")
+                    startDeclareSignal();
+            }
+            comment();
+        }
+    }
+
+
+    void startSetProperties() {
+        QString target = xml.attributes().value("target").toString();
+        possiblyRemoveBraces(&target);
+        foreach (QXmlStreamAttribute attribute, xml.attributes()) {
+            if (attribute.name() == "target")
+                continue;
+            propertyChangeSet += StringPair(target + "." + attribute.name().toString(), attribute.value().toString());
+        }
+        emptyLoop();
+    }
+
+    void startSetProperty() {
+        QString target = xml.attributes().value("target").toString();
+        possiblyRemoveBraces(&target);
+        propertyChangeSet += StringPair(target + "." + xml.attributes().value("property").toString(),
+                                        xml.attributes().value("value").toString());
+
+        emptyLoop();
+    }
+
+    void startParentChange() {
+        QString target = xml.attributes().value("target").toString();
+        possiblyRemoveBraces(&target);
+
+        out << depthString() << "ParentChangeSet" << " {" << endl;
+        ++depth;
+        setProperty(target + ".parent", xml.attributes().value("parent").toString());
+        --depth;
+        out << depthString() << "}" << endl;
+
+//        propertyChangeSet += StringPair(target + ".moveToParent", xml.attributes().value("parent").toString());
+
+        emptyLoop();
+    }
+
+    void startConnection() {
+        QString sender = xml.attributes().value("sender").toString();
+        possiblyRemoveBraces(&sender);
+        out << depthString() << "Connection {" << endl;
+        ++depth;
+        if (! sender.isEmpty())
+            out << depthString() << "sender: " << sender << endl;
+        if (xml.attributes().hasAttribute("signal"))
+            out << depthString() << "signal: \"" << xml.attributes().value("signal").toString() << '"' << endl;
+        if (xml.attributes().hasAttribute("script")) {
+            out << depthString() << "script: { " << xml.attributes().value("script").toString() << " }" << endl;
+            --depth;
+            out << depthString() << "}" << endl;
+        } else {
+            QString text;
+            while (!xml.atEnd()) {
+                xml.readNext();
+                if (xml.tokenType() == QXmlStreamReader::EndElement)
+                    break;
+                else if (xml.tokenType() == QXmlStreamReader::Characters)
+                    text.append(xml.text());
+            }
+
+            out << depthString() << "script: {" << endl;
+            foreach (QString line, text.split(QLatin1Char('\n'))) {
+                out << depthString() << line << endl;
+            }
+            out << depthString() << "}" << endl;
+            --depth;
+            out << depthString() << "}" << endl;
+        }
+        emptyLoop();
+    }
+
+    void startScript() {
+        if (xml.attributes().hasAttribute(QLatin1String("src"))) {
+            /*
+            QString import;
+            QTextStream ts(&import);
+            ts << "import \"";
+            ts << xml.attributes().value(QLatin1String("src")).toString();
+            ts << "\"" << endl;
+            ts.flush();
+            outString.prepend(import);
+            */
+        }
+        QString text = xml.readElementText();
+        if (!text.trimmed().isEmpty()) {
+            out << text << endl;
+        }
+        if (xml.tokenType() != QXmlStreamReader::EndElement)
+            emptyLoop();
+    }
+
+    void startList()
+    {
+        out << depthString() << xml.name().toString() << ": [" << endl;
+        ++depth;
+        bool needComma = false;
+
+        while (!xml.atEnd()) {
+            xml.readNext();
+            if (xml.tokenType() == QXmlStreamReader::EndElement)
+                break;
+            if (xml.tokenType() == QXmlStreamReader::StartElement) {
+                if (needComma)
+                    out << "," << endl;
+                startItem(true);
+                needComma = true;
+            }
+            comment();
+        }
+
+        out << endl;
+        --depth;
+        out << depthString() << "]" << endl;
+    }
+
+};
+
+
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    QStringList args = a.arguments();
+    args.removeFirst();
+
+again:
+    if (args.isEmpty()) {
+        qWarning() << "Usage: qmlconf [-i] filename";
+        exit(1);
+    }
+
+    if (args.first() == QLatin1String("-i")) {
+        optionInPlace = true;
+        args.removeFirst();
+        goto again;
+    }
+
+    const QString fileName = args.first();
+
+    QFile file(fileName);
+    if (! file.open(QIODevice::ReadOnly)) {
+        qWarning() << "qmlconv: no input file";
+        exit(1);
+    }
+
+    Reader r(&file);
+    file.close();
+
+    if (optionInPlace) {
+        if (! file.open(QFile::WriteOnly)) {
+            qWarning() << "qmlconv: cannot open file" << qPrintable(fileName);
+            exit(1);
+        }
+
+        QTextStream out(&file);
+        out << r.output();
+        file.close();
+    }
+
+    return 0;
+}
diff --git a/tools/qmlconv/qmlconv.pro b/tools/qmlconv/qmlconv.pro
new file mode 100644
index 0000000..331f4ee
--- /dev/null
+++ b/tools/qmlconv/qmlconv.pro
@@ -0,0 +1,10 @@
+DESTDIR = ../../bin
+QT -= gui
+# Input
+SOURCES += qmlconv.cpp
+
+target.path=$$[QT_INSTALL_BINS]
+INSTALLS += target
+
+CONFIG += console
+macx:CONFIG -= app_bundle
diff --git a/tools/qvfb/config.ui b/tools/qvfb/config.ui
index 7a45bfe..82a3d38 100644
--- a/tools/qvfb/config.ui
+++ b/tools/qvfb/config.ui
@@ -1,4 +1,5 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <comment>*********************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,181 +41,145 @@
 **
 *********************************************************************</comment>
  <class>Config</class>
- <widget class="QDialog" name="Config" >
-  <property name="geometry" >
+ <widget class="QDialog" name="Config">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>650</height>
+    <height>665</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Configure</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="spacing" >
+  <layout class="QVBoxLayout">
+   <property name="spacing">
     <number>6</number>
    </property>
-   <property name="leftMargin" >
-    <number>8</number>
-   </property>
-   <property name="topMargin" >
-    <number>8</number>
-   </property>
-   <property name="rightMargin" >
-    <number>8</number>
-   </property>
-   <property name="bottomMargin" >
+   <property name="margin">
     <number>8</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QGroupBox" name="ButtonGroup1" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+      <widget class="QGroupBox" name="ButtonGroup1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="title" >
+       <property name="title">
         <string>Size</string>
        </property>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
+       <layout class="QVBoxLayout">
+        <property name="spacing">
          <number>6</number>
         </property>
-        <property name="leftMargin" >
-         <number>11</number>
-        </property>
-        <property name="topMargin" >
-         <number>11</number>
-        </property>
-        <property name="rightMargin" >
-         <number>11</number>
-        </property>
-        <property name="bottomMargin" >
+        <property name="margin">
          <number>11</number>
         </property>
         <item>
-         <widget class="QRadioButton" name="size_176_220" >
-          <property name="text" >
-           <string>176x220 "SmartPhone"</string>
+         <widget class="QRadioButton" name="size_176_220">
+          <property name="text">
+           <string>176x220 &quot;SmartPhone&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_240_320" >
-          <property name="text" >
-           <string>240x320 "PDA"</string>
+         <widget class="QRadioButton" name="size_240_320">
+          <property name="text">
+           <string>240x320 &quot;PDA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_320_240" >
-          <property name="text" >
-           <string>320x240 "TV" / "QVGA"</string>
+         <widget class="QRadioButton" name="size_320_240">
+          <property name="text">
+           <string>320x240 &quot;TV&quot; / &quot;QVGA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_640_480" >
-          <property name="text" >
-           <string>640x480 "VGA"</string>
+         <widget class="QRadioButton" name="size_640_480">
+          <property name="text">
+           <string>640x480 &quot;VGA&quot;</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_800_600" >
-          <property name="text" >
+         <widget class="QRadioButton" name="size_800_600">
+          <property name="text">
            <string>800x600</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="size_1024_768" >
-          <property name="text" >
+         <widget class="QRadioButton" name="size_1024_768">
+          <property name="text">
            <string>1024x768</string>
           </property>
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" >
-          <property name="spacing" >
+         <layout class="QHBoxLayout">
+          <property name="spacing">
            <number>6</number>
           </property>
-          <property name="leftMargin" >
-           <number>0</number>
-          </property>
-          <property name="topMargin" >
-           <number>0</number>
-          </property>
-          <property name="rightMargin" >
-           <number>0</number>
-          </property>
-          <property name="bottomMargin" >
+          <property name="margin">
            <number>0</number>
           </property>
           <item>
-           <widget class="QRadioButton" name="size_custom" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+           <widget class="QRadioButton" name="size_custom">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Custom</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QSpinBox" name="size_width" >
-            <property name="minimum" >
+           <widget class="QSpinBox" name="size_width">
+            <property name="minimum">
              <number>1</number>
             </property>
-            <property name="maximum" >
+            <property name="maximum">
              <number>1280</number>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <number>16</number>
             </property>
-            <property name="value" >
+            <property name="value">
              <number>400</number>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QSpinBox" name="size_height" >
-            <property name="minimum" >
+           <widget class="QSpinBox" name="size_height">
+            <property name="minimum">
              <number>1</number>
             </property>
-            <property name="maximum" >
+            <property name="maximum">
              <number>1024</number>
             </property>
-            <property name="singleStep" >
+            <property name="singleStep">
              <number>16</number>
             </property>
-            <property name="value" >
+            <property name="value">
              <number>300</number>
             </property>
            </widget>
@@ -225,135 +190,128 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="ButtonGroup2" >
-       <property name="title" >
+      <widget class="QGroupBox" name="ButtonGroup2">
+       <property name="title">
         <string>Depth</string>
        </property>
-       <layout class="QVBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>11</number>
-        </property>
-        <property name="topMargin" >
-         <number>11</number>
-        </property>
-        <property name="rightMargin" >
-         <number>11</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>11</number>
-        </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QRadioButton" name="depth_1" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_1">
+          <property name="text">
            <string>1 bit monochrome</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_4gray" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_2gray">
+          <property name="text">
+           <string>2 bit grayscale</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="depth_4gray">
+          <property name="text">
            <string>4 bit grayscale</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_8" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_8">
+          <property name="text">
            <string>8 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_12" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_12">
+          <property name="text">
            <string>12 (16) bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_15" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_15">
+          <property name="text">
            <string>15 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_16" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_16">
+          <property name="text">
            <string>16 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_18" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_18">
+          <property name="text">
            <string>18 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_24" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_24">
+          <property name="text">
            <string>24 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_32" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_32">
+          <property name="text">
            <string>32 bit</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="depth_32_argb" >
-          <property name="text" >
+         <widget class="QRadioButton" name="depth_32_argb">
+          <property name="text">
            <string>32 bit ARGB</string>
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="rgbSwapped">
+          <property name="toolTip">
+           <string>Swap red and blue channels</string>
+          </property>
+          <property name="text">
+           <string>BGR format</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="TextLabel1_3" >
-       <property name="text" >
+      <widget class="QLabel" name="TextLabel1_3">
+       <property name="text">
         <string>Skin</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="skin" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <widget class="QComboBox" name="skin">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <item>
-        <property name="text" >
+        <property name="text">
          <string>None</string>
         </property>
        </item>
@@ -362,25 +320,25 @@
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="touchScreen" >
-     <property name="text" >
+    <widget class="QCheckBox" name="touchScreen">
+     <property name="text">
       <string>Emulate touch screen (no mouse move)</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="lcdScreen" >
-     <property name="text" >
+    <widget class="QCheckBox" name="lcdScreen">
+     <property name="text">
       <string>Emulate LCD screen (Only with fixed zoom of 3.0 times magnification)</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>10</height>
@@ -389,204 +347,192 @@
     </spacer>
    </item>
    <item>
-    <widget class="QLabel" name="TextLabel1" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <widget class="QLabel" name="TextLabel1">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text" >
-      <string>&lt;p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i>above&lt;/i>. You may freely modify the Gamma &lt;i>below&lt;/i>.</string>
+     <property name="text">
+      <string>&lt;p&gt;Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth &lt;i&gt;above&lt;/i&gt;. You may freely modify the Gamma &lt;i&gt;below&lt;/i&gt;.</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
       <string>Gamma</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>11</number>
-      </property>
-      <property name="topMargin" >
-       <number>11</number>
-      </property>
-      <property name="rightMargin" >
-       <number>11</number>
-      </property>
-      <property name="bottomMargin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>11</number>
       </property>
-      <property name="horizontalSpacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
-      <item row="6" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="text" >
+      <item row="6" column="0">
+       <widget class="QLabel" name="TextLabel3">
+        <property name="text">
          <string>Blue</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="1" >
-       <widget class="QSlider" name="bslider" >
-        <property name="palette" >
+      <item row="6" column="1">
+       <widget class="QSlider" name="bslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -595,153 +541,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -750,153 +696,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>38</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -906,183 +852,183 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="6" column="2" >
-       <widget class="QLabel" name="blabel" >
-        <property name="text" >
+      <item row="6" column="2">
+       <widget class="QLabel" name="blabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="text" >
+      <item row="4" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="text">
          <string>Green</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="QSlider" name="gslider" >
-        <property name="palette" >
+      <item row="4" column="1">
+       <widget class="QSlider" name="gslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1091,153 +1037,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1246,153 +1192,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>255</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>255</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>38</red>
               <green>255</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>127</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>170</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1402,190 +1348,190 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QLabel" name="glabel" >
-        <property name="text" >
+      <item row="4" column="2">
+       <widget class="QLabel" name="glabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel7" >
-        <property name="text" >
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel7">
+        <property name="text">
          <string>All</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="TextLabel8" >
-        <property name="text" >
+      <item row="0" column="2">
+       <widget class="QLabel" name="TextLabel8">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QSlider" name="gammaslider" >
-        <property name="palette" >
+      <item row="0" column="1">
+       <widget class="QSlider" name="gammaslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1594,153 +1540,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1749,153 +1695,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>170</green>
               <blue>170</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -1905,183 +1851,183 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel1_2" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel1_2">
+        <property name="text">
          <string>Red</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" >
-       <widget class="QLabel" name="rlabel" >
-        <property name="text" >
+      <item row="2" column="2">
+       <widget class="QLabel" name="rlabel">
+        <property name="text">
          <string>1.0</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QSlider" name="rslider" >
-        <property name="palette" >
+      <item row="2" column="1">
+       <widget class="QSlider" name="rslider">
+        <property name="palette">
          <palette>
           <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2090,153 +2036,153 @@
            </colorrole>
           </active>
           <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2245,153 +2191,153 @@
            </colorrole>
           </inactive>
           <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="WindowText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Button" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Button">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Light" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Light">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>127</green>
               <blue>127</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Midlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Midlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>38</green>
               <blue>38</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Dark" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Dark">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>127</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Mid" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Mid">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>170</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Text" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Text">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="BrightText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="BrightText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="ButtonText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="ButtonText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>128</red>
               <green>128</green>
               <blue>128</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Base" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Base">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Window" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Window">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>220</red>
               <green>220</green>
               <blue>220</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Shadow" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Shadow">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Highlight" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Highlight">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>10</red>
               <green>95</green>
               <blue>137</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="HighlightedText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="HighlightedText">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>255</red>
               <green>255</green>
               <blue>255</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="Link" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="Link">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="LinkVisited" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="LinkVisited">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>0</red>
               <green>0</green>
               <blue>0</blue>
              </color>
             </brush>
            </colorrole>
-           <colorrole role="AlternateBase" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
+           <colorrole role="AlternateBase">
+            <brush brushstyle="SolidPattern">
+             <color alpha="255">
               <red>232</red>
               <green>232</green>
               <blue>232</blue>
@@ -2401,53 +2347,44 @@
           </disabled>
          </palette>
         </property>
-        <property name="maximum" >
+        <property name="maximum">
          <number>400</number>
         </property>
-        <property name="value" >
+        <property name="value">
          <number>100</number>
         </property>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="8" column="0" colspan="3" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="text" >
+      <item row="8" column="0" colspan="3">
+       <widget class="QPushButton" name="PushButton3">
+        <property name="text">
          <string>Set all to 1.0</string>
         </property>
        </widget>
       </item>
-      <item rowspan="9" row="0" column="3" >
-       <widget class="GammaView" native="1" name="MyCustomWidget1" />
+      <item row="0" column="3" rowspan="9">
+       <widget class="GammaView" name="MyCustomWidget1" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+    <layout class="QHBoxLayout">
+     <property name="spacing">
       <number>6</number>
      </property>
-     <property name="leftMargin" >
-      <number>0</number>
-     </property>
-     <property name="topMargin" >
-      <number>0</number>
-     </property>
-     <property name="rightMargin" >
-      <number>0</number>
-     </property>
-     <property name="bottomMargin" >
+     <property name="margin">
       <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
@@ -2456,24 +2393,24 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonOk" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonCancel" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonCancel">
+       <property name="text">
         <string>&amp;Cancel</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
       </widget>
@@ -2482,7 +2419,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>GammaView</class>
@@ -2498,11 +2435,11 @@
    <receiver>size_custom</receiver>
    <slot>click()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>152</x>
      <y>193</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>94</x>
      <y>199</y>
     </hint>
@@ -2514,11 +2451,11 @@
    <receiver>size_custom</receiver>
    <slot>click()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>259</x>
      <y>196</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>64</x>
      <y>188</y>
     </hint>
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 62149a1..8de638f 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -635,6 +635,7 @@ void QVFb::configure()
     config->touchScreen->setChecked(view->touchScreenEmulation());
     config->lcdScreen->setChecked(view->lcdScreenEmulation());
     chooseDepth(view->displayDepth(), view->displayFormat());
+    config->rgbSwapped->setChecked(view->rgbSwapped());
     connect(config->skin, SIGNAL(activated(int)), this, SLOT(skinConfigChosen(int)));
     if ( view->gammaRed() == view->gammaGreen() && view->gammaGreen() == view->gammaBlue() ) {
 	config->gammaslider->setValue(int(view->gammaRed()*400));
@@ -678,6 +679,8 @@ void QVFb::configure()
 	int d;
 	if ( config->depth_1->isChecked() )
 	    d=1;
+	else if ( config->depth_2gray->isChecked() )
+	    d=2;
 	else if ( config->depth_4gray->isChecked() )
 	    d=4;
 	else if ( config->depth_8->isChecked() )
@@ -708,6 +711,7 @@ void QVFb::configure()
 	}
 	view->setViewFormat(displayFormat);
 	view->setTouchscreenEmulation( config->touchScreen->isChecked() );
+	view->setRgbSwapped(config->rgbSwapped->isChecked());
 	bool lcdEmulation = config->lcdScreen->isChecked();
 	view->setLcdScreenEmulation( lcdEmulation );
 	if ( lcdEmulation )
@@ -741,6 +745,7 @@ void QVFb::chooseSize(const QSize& sz)
 void QVFb::chooseDepth(int depth, QVFbView::PixelFormat displayFormat)
 {
     config->depth_1->setChecked(depth==1);
+    config->depth_2gray->setChecked(depth==2);
     config->depth_4gray->setChecked(depth==4);
     config->depth_8->setChecked(depth==8);
     config->depth_12->setChecked(depth==12);
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index 53a5360..e7c99ed 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -89,7 +89,7 @@ QVFbAbstractView::~QVFbAbstractView()
 
 QVFbView::QVFbView(int id, int w, int h, int d, Rotation r, QWidget *parent)
         : QVFbAbstractView(parent),
-          viewdepth(d), viewFormat(DefaultFormat), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15),
+          viewdepth(d), viewFormat(DefaultFormat), rgb_swapped(0), rsh(0), gsh(0), bsh(0), rmax(15), gmax(15), bmax(15),
         contentsWidth(w), contentsHeight(h), gred(1.0), ggreen(1.0), gblue(1.0),
         gammatable(0), refreshRate(30), animation(0),
         hzm(0.0), vzm(0.0), mView(0),
@@ -457,6 +457,67 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
         }
         break;
     }
+
+    case 2: {
+        if (requiredSize > buffer.size())
+            buffer.resize(requiredSize);
+
+        // XXX: hw: replace by drawhelper functionality
+
+        const int pixelsPerByte = 4;
+        quint8 *src = reinterpret_cast<quint8*>(mView->data())
+                      + r.y() * mView->linestep() + r.x() / pixelsPerByte;
+        const int align = qMin(r.width(), (4 - (r.x() & 3)) & 3);
+        const int doAlign = (align > 0 ? 1 : 0);
+        const int tail = qMin(r.width(), (r.width() - align) & 3);
+        const int doTail = (tail > 0 ? 1 : 0);
+        const int width8 = (r.width() - align) / pixelsPerByte;
+        const int stride = mView->linestep() - (width8 + doAlign);
+
+        uchar *b = reinterpret_cast<uchar*>(buffer.data());
+	img = QImage(b, r.width(), r.height(), QImage::Format_RGB32);
+	for (int y = 0; y < r.height(); ++y) {
+            quint32 *dest = reinterpret_cast<quint32*>(img.scanLine(y));
+            quint8 c;
+
+            if (doAlign) {
+                switch (align) {
+                case 3: c = ((*src & 0x30) >> 4) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 2: c = ((*src & 0x0c) >> 2) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                case 1: c = ((*src & 0x03)) * 0x55;
+                        *dest++ = qRgb(c, c, c);
+                }
+                ++src;
+            }
+            for (int i = 0; i < width8; ++i) {
+                c = ((*src & 0xc0) >> 6) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x30) >> 4) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x0c) >> 2) * 0x55;
+                *dest++ = qRgb(c, c, c);
+                c = ((*src & 0x03)) * 0x55;
+                *dest++ = qRgb(c, c, c);
+
+                ++src;
+            }
+            if (doTail) {
+                switch (tail) {
+                case 3: c = ((*src & 0x0c) >> 2) * 0x55;
+                        dest[2] = qRgb(c, c, c);
+                case 2: c = ((*src & 0x30) >> 4) * 0x55;
+                        dest[1] = qRgb(c, c, c);
+                case 1: c = ((*src & 0xc0) >> 6) * 0x55;
+                        dest[0] = qRgb(c, c, c);
+                }
+            }
+            src += stride;
+        }
+        break;
+    }
+
     case 4: {
         if (requiredSize > buffer.size())
             buffer.resize(requiredSize);
@@ -540,6 +601,9 @@ QImage QVFbView::getBuffer(const QRect &r, int &leading) const
         break;
     }
 
+    if (rgb_swapped)
+        img = img.rgbSwapped();
+
     if ( brightness != 255 ) {
         if (img.format() == QImage::Format_Indexed8) {
             QVector<QRgb> c = img.colorTable();
diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h
index d533613..1d43bdc 100644
--- a/tools/qvfb/qvfbview.h
+++ b/tools/qvfb/qvfbview.h
@@ -77,6 +77,7 @@ public:
     virtual int displayHeight() const = 0;
     virtual int displayDepth() const = 0;
     virtual PixelFormat displayFormat() const { return DefaultFormat; }
+    virtual bool rgbSwapped() const { return false; }
     virtual Rotation displayRotation() const = 0;
 
     virtual void setGamma(double gr, double gg, double gb) = 0;
@@ -105,6 +106,7 @@ public slots:
     virtual void skinKeyPressEvent( int code, const QString& text, bool autorep=FALSE ) = 0;
     virtual void skinKeyReleaseEvent( int code, const QString& text, bool autorep=FALSE ) = 0;
     virtual void setViewFormat(PixelFormat) {}
+    virtual void setRgbSwapped( bool ) {};
     virtual void embedDisplay(WId) {}
 };
 
@@ -120,6 +122,7 @@ public:
     int displayHeight() const;
     int displayDepth() const;
     PixelFormat displayFormat() const;
+    bool rgbSwapped() const { return rgb_swapped; }
     Rotation displayRotation() const;
 
     bool touchScreenEmulation() const { return emulateTouchscreen; }
@@ -151,6 +154,7 @@ public slots:
     void skinKeyPressEvent(int code, const QString& text, bool autorep=FALSE);
     void skinKeyReleaseEvent(int code, const QString& text, bool autorep=FALSE);
     void setViewFormat(PixelFormat);
+    void setRgbSwapped(bool b) { rgb_swapped = b; }
 #ifdef Q_WS_X11
     void embedDisplay(WId id);
 #endif
@@ -180,6 +184,7 @@ private:
     void setDirty(const QRect&);
     int viewdepth; // "faked" depth
     PixelFormat viewFormat;
+    bool rgb_swapped;
     int rsh;
     int gsh;
     int bsh;
diff --git a/tools/tools.pro b/tools/tools.pro
index da4ff67..12da18c 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -24,7 +24,7 @@ mac {
 
 SUBDIRS += kmap2qmap
 
-contains(QT_CONFIG, declarative):SUBDIRS += duiviewer
+contains(QT_CONFIG, declarative):SUBDIRS += duiviewer qmlconv
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
 embedded: SUBDIRS += makeqpf