Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/stylesheet.qdoc

23 files changed, 811 insertions, 407 deletions

diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp
index 9f91f9b..5de0d3c 100644
--- a/tools/assistant/compat/mainwindow.cpp
+++ b/tools/assistant/compat/mainwindow.cpp
@@ -312,21 +312,14 @@ void MainWindow::about()
 {
     QMessageBox box(this);
 
-    // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
-    QString edition;
-    QString info;
-    QString moreInfo;
-
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/assistant/images/assistant-128.png\">"
                                     "<h3>%1</h3>"
-                                    "<p>Version %2 %3</p></center>"
-                                    "<p>%4</p>"
-                                    "<p>%5</p>"
+                                    "<p>Version %2</p></center>"
                                     "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
                                     "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
                                     " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
                                     " PARTICULAR PURPOSE.<p/>")
-                   .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)).arg(edition).arg(info).arg(moreInfo));
+                   .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Assistant"));
     box.setIcon(QMessageBox::NoIcon);
     box.exec();
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 6f5732f..66475a4 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -536,58 +536,57 @@ void BookmarkWidget::focusInEvent(QFocusEvent *e)
 
 bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
 {
-    if (object == this && e->type() == QEvent::KeyPress) {
-        QKeyEvent *ke = static_cast<QKeyEvent*>(e);
+    if ((object == this) || (object == treeView->viewport())) {
         QModelIndex index = treeView->currentIndex();
-        switch (ke->key()) {
+        if (e->type() == QEvent::KeyPress) {
+            QKeyEvent *ke = static_cast<QKeyEvent*>(e);
             if (index.isValid() && searchField->text().isEmpty()) {
-                case Qt::Key_F2: {
-                    const QModelIndex& source = filterBookmarkModel->mapToSource(index);
-                    QStandardItem *item =
-                        bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
+                if (ke->key() == Qt::Key_F2) {
+                    QStandardItem *item =  bookmarkManager->treeBookmarkModel()
+                        ->itemFromIndex(filterBookmarkModel->mapToSource(index));
                     if (item) {
                         item->setEditable(true);
                         treeView->edit(index);
                         item->setEditable(false);
                     }
-                }   break;
-
-                case Qt::Key_Delete: {
+                } else if (ke->key() == Qt::Key_Delete) {
                     bookmarkManager->removeBookmarkItem(treeView,
                         filterBookmarkModel->mapToSource(index));
-                }   break;
+                }
             }
 
-            case Qt::Key_Up:
-            case Qt::Key_Down:
-                treeView->subclassKeyPressEvent(ke);
-                break;
-
-            case Qt::Key_Enter: {
-            case Qt::Key_Return:
-                index = treeView->selectionModel()->currentIndex();
-                if (index.isValid()) {
-                    QString data = index.data(Qt::UserRole + 10).toString();
-                    if (!data.isEmpty() && data != QLatin1String("Folder"))
-                        emit requestShowLink(data);
-                }
-            }   break;
+            switch (ke->key()) {
+                default: break;
+                case Qt::Key_Up: {
+                case Qt::Key_Down:
+                    treeView->subclassKeyPressEvent(ke);    
+                }   break;
 
-            case Qt::Key_Escape:
-                emit escapePressed();
-                break;
+                case Qt::Key_Enter: {
+                case Qt::Key_Return:
+                    index = treeView->selectionModel()->currentIndex();
+                    if (index.isValid()) {
+                        QString data = index.data(Qt::UserRole + 10).toString();
+                        if (!data.isEmpty() && data != QLatin1String("Folder"))
+                            emit requestShowLink(data);
+                    }
+                }   break;
 
-            default:
-                break;
-        }
-    }
-    else if (object == treeView->viewport() && e->type() == QEvent::MouseButtonRelease) {
-        const QModelIndex& index = treeView->currentIndex();
-        QMouseEvent *me = static_cast<QMouseEvent*>(e);
-        if (index.isValid() && (me->button() == Qt::MidButton)) {
-            QString data = index.data(Qt::UserRole + 10).toString();
-            if (!data.isEmpty() && data != QLatin1String("Folder"))
-                CentralWidget::instance()->setSourceInNewTab(data);
+                case Qt::Key_Escape: {
+                    emit escapePressed();
+                }   break;
+            }
+        } else if (e->type() == QEvent::MouseButtonRelease) {
+            if (index.isValid()) {
+                QMouseEvent *me = static_cast<QMouseEvent*>(e);
+                bool controlPressed = me->modifiers() & Qt::ControlModifier;
+                if(((me->button() == Qt::LeftButton) && controlPressed)
+                    || (me->button() == Qt::MidButton)) {
+                        QString data = index.data(Qt::UserRole + 10).toString();
+                        if (!data.isEmpty() && data != QLatin1String("Folder"))
+                            CentralWidget::instance()->setSourceInNewTab(data);
+                }
+            }
         }
     }
     return QWidget::eventFilter(object, e);
diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp
index 89060bd..9f39de5 100644
--- a/tools/assistant/tools/assistant/contentwindow.cpp
+++ b/tools/assistant/tools/assistant/contentwindow.cpp
@@ -124,10 +124,10 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
         QModelIndex index = m_contentWidget->indexAt(me->pos());
         QItemSelectionModel *sm = m_contentWidget->selectionModel();
 
+        Qt::MouseButtons button = me->button();
         if (index.isValid() && (sm && sm->isSelected(index))) {
-            if (me->button() == Qt::LeftButton) {
-                itemClicked(index);
-            } else if (me->button() == Qt::MidButton) {
+            if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier))
+                || (button == Qt::MidButton)) {
                 QHelpContentModel *contentModel =
                     qobject_cast<QHelpContentModel*>(m_contentWidget->model());
                 if (contentModel) {
@@ -135,12 +135,15 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
                     if (itm && !isPdfFile(itm))
                         CentralWidget::instance()->setSourceInNewTab(itm->url());
                 }
+            } else if (button == Qt::LeftButton) {
+                itemClicked(index);
             }
         }
     }
     return QWidget::eventFilter(o, e);
 }
 
+
 void ContentWindow::showContextMenu(const QPoint &pos)
 {
     if (!m_contentWidget->indexAt(pos).isValid())
diff --git a/tools/assistant/tools/assistant/indexwindow.cpp b/tools/assistant/tools/assistant/indexwindow.cpp
index a2c0950..1117ae0 100644
--- a/tools/assistant/tools/assistant/indexwindow.cpp
+++ b/tools/assistant/tools/assistant/indexwindow.cpp
@@ -146,8 +146,13 @@ bool IndexWindow::eventFilter(QObject *obj, QEvent *e)
         && e->type() == QEvent::MouseButtonRelease) {
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(e);
         QModelIndex idx = m_indexWidget->indexAt(mouseEvent->pos());
-        if (idx.isValid() && mouseEvent->button()==Qt::MidButton)
-            open(m_indexWidget, idx);
+        if (idx.isValid()) {
+            Qt::MouseButtons button = mouseEvent->button();
+            if (((button == Qt::LeftButton) && (mouseEvent->modifiers() & Qt::ControlModifier))
+                || (button == Qt::MidButton)) {
+                open(m_indexWidget, idx);
+            }
+        }
     }
 #ifdef Q_OS_MAC
     else if (obj == m_indexWidget && e->type() == QEvent::KeyPress) {
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index cb10e3f..2b53f09 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -797,23 +797,16 @@ void MainWindow::showAboutDialog()
             aboutDia.setPixmap(pix);
         aboutDia.setWindowTitle(aboutDia.documentTitle());
     } else {
-        // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
-        QString edition;
-        QString info;
-        QString moreInfo;
-
         QByteArray resources;
         aboutDia.setText(QString::fromLatin1("<center>"
             "<h3>%1</h3>"
-            "<p>Version %2 %3</p></center>"
-            "<p>%4</p>"
-            "<p>%5</p>"
+            "<p>Version %2</p></center>"
             "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)"
             ".</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
             " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
             " PARTICULAR PURPOSE.<p/>")
-            .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR))
-            .arg(edition).arg(info).arg(moreInfo), resources);
+            .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
+            resources);
         QLatin1String path(":/trolltech/assistant/images/assistant-128.png");
         aboutDia.setPixmap(QString(path));
     }
@@ -926,25 +919,27 @@ void MainWindow::expandTOC(int depth)
 
 void MainWindow::indexingStarted()
 {
-    m_progressWidget = new QWidget();
-    QLayout* hlayout = new QHBoxLayout(m_progressWidget);
+    if (!m_progressWidget) {
+        m_progressWidget = new QWidget();
+        QLayout* hlayout = new QHBoxLayout(m_progressWidget);
 
-    QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
-    QLabel *label = new QLabel(tr("Updating search index"));
-    label->setSizePolicy(sizePolicy);
-    hlayout->addWidget(label);
+        QLabel *label = new QLabel(tr("Updating search index"));
+        label->setSizePolicy(sizePolicy);
+        hlayout->addWidget(label);
 
-    QProgressBar *progressBar = new QProgressBar();
-    progressBar->setRange(0, 0);
-    progressBar->setTextVisible(false);
-    progressBar->setSizePolicy(sizePolicy);
+        QProgressBar *progressBar = new QProgressBar();
+        progressBar->setRange(0, 0);
+        progressBar->setTextVisible(false);
+        progressBar->setSizePolicy(sizePolicy);
 
-    hlayout->setSpacing(6);
-    hlayout->setMargin(0);
-    hlayout->addWidget(progressBar);
+        hlayout->setSpacing(6);
+        hlayout->setMargin(0);
+        hlayout->addWidget(progressBar);
 
-    statusBar()->addPermanentWidget(m_progressWidget);
+        statusBar()->addPermanentWidget(m_progressWidget);
+    }
 }
 
 void MainWindow::indexingFinished()
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index b0e7b53..8fd8c0a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -350,6 +350,7 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "QMAKESPEC" ] = tmp;
 
     dictionary[ "INCREDIBUILD_XGE" ] = "auto";
+    dictionary[ "LTCG" ]            = "no";
 }
 
 Configure::~Configure()
@@ -486,6 +487,12 @@ void Configure::parseCmdLine()
         else if( configCmdLine.at(i) == "-commercial" ) {
             dictionary[ "BUILDTYPE" ] = "commercial";
         }
+        else if( configCmdLine.at(i) == "-ltcg" ) {
+            dictionary[ "LTCG" ] = "yes";
+        }
+        else if( configCmdLine.at(i) == "-no-ltcg" ) {
+            dictionary[ "LTCG" ] = "no";
+        }
 #endif
 
         else if( configCmdLine.at(i) == "-platform" ) {
@@ -1459,6 +1466,9 @@ bool Configure::displayHelp()
         desc("SHARED", "yes",   "-shared",              "Create and use shared Qt libraries.");
         desc("SHARED", "no",    "-static",              "Create and use static Qt libraries.\n");
 
+        desc("LTCG", "yes",   "-ltcg",                  "Use Link Time Code Generation. (Release builds only)");
+        desc("LTCG", "no",    "-no-ltcg",               "Do not use Link Time Code Generation.\n");
+
         desc("FAST", "no",      "-no-fast",             "Configure Qt normally by generating Makefiles for all project files.");
         desc("FAST", "yes",     "-fast",                "Configure Qt quickly by generating Makefiles only for library and "
                                                         "subdirectory targets.  All other Makefiles are created as wrappers "
@@ -2441,6 +2451,8 @@ void Configure::generateCachefile()
         else
             configStream << " static";
 
+        if( dictionary[ "LTCG" ] == "yes" )
+            configStream << " ltcg";
         if( dictionary[ "STL" ] == "yes" )
             configStream << " stl";
         if ( dictionary[ "EXCEPTIONS" ] == "yes" )
@@ -2862,6 +2874,7 @@ void Configure::displayConfig()
     cout << "Architecture................" << dictionary[ "ARCHITECTURE" ] << endl;
     cout << "Maketool...................." << dictionary[ "MAKE" ] << endl;
     cout << "Debug symbols..............." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl;
+    cout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl;
     cout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl;
     cout << "STL support................." << dictionary[ "STL" ] << endl;
     cout << "Exception support..........." << dictionary[ "EXCEPTIONS" ] << endl;
diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
index 7270628..58127b0 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -57,16 +57,20 @@ using namespace qdesigner_internal;
 FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) :
     QObject(parent),
     m_formContainer(new QWidget),
-    m_formContainerLayout(new QVBoxLayout),
+    m_formContainerLayout(new QStackedLayout),
     m_layout(new QStackedLayout)
 {
     m_layout->setMargin(0);
     m_layout->setSpacing(0);
     m_layout->setStackingMode(QStackedLayout::StackAll);
 
+    // We choose a QStackedLayout as immediate layout for
+    // the form windows as it ignores the sizePolicy of
+    // its child (for example, Fixed would cause undesired side effects).
     m_formContainerLayout->setMargin(0);
     m_formContainer->setObjectName(QLatin1String("formContainer"));
     m_formContainer->setLayout(m_formContainerLayout);
+    m_formContainerLayout->setStackingMode(QStackedLayout::StackAll);
     // System settings might have different background colors, autofill them
     // (affects for example mainwindow status bars)
     m_formContainer->setAutoFillBackground(true);
diff --git a/tools/designer/src/components/formeditor/formwindow_widgetstack.h b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
index 92323c5..f21c4f0 100644
--- a/tools/designer/src/components/formeditor/formwindow_widgetstack.h
+++ b/tools/designer/src/components/formeditor/formwindow_widgetstack.h
@@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowToolInterface;
 
 class QStackedLayout;
-class QVBoxLayout;
 class QWidget;
 
 namespace qdesigner_internal {
@@ -92,7 +91,7 @@ protected:
 private:
     QList<QDesignerFormWindowToolInterface*> m_tools;
     QWidget *m_formContainer;
-    QVBoxLayout *m_formContainerLayout;
+    QStackedLayout *m_formContainerLayout;
     QStackedLayout *m_layout;
 };
 
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index c21912b..97dc5a1 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -172,15 +172,11 @@ VersionDialog::VersionDialog(QWidget *parent)
     version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR));
     version.append(tr("<br/>Qt Designer is a graphical user interface designer for Qt applications.<br/>"));
 
-    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze
-    QString edition;
-
     lbl->setText(tr("%1"
-                    "<br/>%2"
                     "<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
                     "<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
                     " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                    " PARTICULAR PURPOSE.<br/> ").arg(version).arg(edition));
+                    " PARTICULAR PURPOSE.<br/> ").arg(version));
 
     lbl->setWordWrap(true);
     lbl->setOpenExternalLinks(true);
diff --git a/tools/designer/src/lib/shared/formwindowbase.cpp b/tools/designer/src/lib/shared/formwindowbase.cpp
index 5be907b..377ae43 100644
--- a/tools/designer/src/lib/shared/formwindowbase.cpp
+++ b/tools/designer/src/lib/shared/formwindowbase.cpp
@@ -51,7 +51,7 @@
 #include "deviceprofile_p.h"
 #include "qdesigner_utils_p.h"
 
-#include <abstractformbuilder.h>
+#include "qsimpleresource_p.h"
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerContainerExtension>
@@ -478,6 +478,14 @@ void FormWindowBase::setupDefaultAction(QDesignerFormWindowInterface *fw)
     QObject::connect(fw, SIGNAL(activated(QWidget*)), fw, SLOT(triggerDefaultAction(QWidget*)));
 }
 
+QString FormWindowBase::fileContents() const
+{
+    const bool oldValue = QSimpleResource::setWarningsEnabled(false);
+    const QString rc = contents();
+    QSimpleResource::setWarningsEnabled(oldValue);
+    return rc;
+}
+
 } // namespace qdesigner_internal
 
 QT_END_NAMESPACE
diff --git a/tools/designer/src/lib/shared/formwindowbase_p.h b/tools/designer/src/lib/shared/formwindowbase_p.h
index 68e977e..0891f6e 100644
--- a/tools/designer/src/lib/shared/formwindowbase_p.h
+++ b/tools/designer/src/lib/shared/formwindowbase_p.h
@@ -90,6 +90,9 @@ public:
     QVariantMap formData();
     void setFormData(const QVariantMap &vm);
 
+    // Return contents without warnings. Should be 'contents(bool quiet)'
+    QString fileContents() const;
+
     // Return the widget containing the form. This is used to
     // apply embedded design settings to that are inherited (for example font).
     // These are meant to be applied to the form only and not to the other editors
diff --git a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
index ff3b50b..94e8044 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -316,6 +316,10 @@ Qt::Alignment variantToAlignment(const QVariant & q)
 // find changed subproperties of a variant
 unsigned compareSubProperties(const QVariant & q1, const QVariant & q2, qdesigner_internal::SpecialProperty specialProperty)
 {
+    // Do not clobber new value in the comparison function in
+    // case someone sets a QString on a PropertySheetStringValue.
+    if (q1.type() != q2.type())
+        return SubPropertyAll;
     switch (q1.type()) {
     case QVariant::Rect:
         return compareSubProperties(q1.toRect(), q2.toRect());
diff --git a/tools/kmap2qmap/main.cpp b/tools/kmap2qmap/main.cpp
index b518392..12d91c6 100644
--- a/tools/kmap2qmap/main.cpp
+++ b/tools/kmap2qmap/main.cpp
@@ -384,10 +384,12 @@ static const symbol_synonyms_t symbol_synonyms[] = {
 static const int symbol_synonyms_size = sizeof(symbol_synonyms)/sizeof(symbol_synonyms_t);
 
 // makes the generated array in --header mode a bit more human readable
+QT_BEGIN_NAMESPACE
 static bool operator<(const QWSKeyboard::Mapping &m1, const QWSKeyboard::Mapping &m2)
 {
     return m1.keycode != m2.keycode ? m1.keycode < m2.keycode : m1.modifiers < m2.modifiers;
 }
+QT_END_NAMESPACE
 
 class KeymapParser {
 public:
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 5157fbe..921b8b6 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1342,17 +1342,13 @@ void MainWindow::about()
     QString version = tr("Version %1");
     version = version.arg(QLatin1String(QT_VERSION_STR));
 
-    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
-    QString edition;
-
     box.setText(tr("<center><img src=\":/images/splash.png\"/></img><p>%1</p></center>"
                     "<p>Qt Linguist is a tool for adding translations to Qt "
                     "applications.</p>"
-                    "<p>%2</p>"
                     "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
                     "</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
                     " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                    " PARTICULAR PURPOSE.</p>").arg(version).arg(edition));
+                    " PARTICULAR PURPOSE.</p>").arg(version));
 
     box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
     box.setIcon(QMessageBox::NoIcon);
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index a10e668..3b9ba73 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/macdeployqt/shared/shared.cpp
@@ -357,7 +357,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         copiedFrameworks.append(framework.frameworkName);
 
         // Get the qt path from one of the Qt frameworks;
-        if (deploymenInfo.qtPath == QString() && framework.frameworkName.contains("Qt")
+        if (deploymenInfo.qtPath.isNull() && framework.frameworkName.contains("Qt") 
             && framework.frameworkDirectory.contains("/lib"))
         {
                 deploymenInfo.qtPath = framework.frameworkDirectory;
@@ -375,7 +375,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         // Copy farmework to app bundle.
         const QString deployedBinaryPath = copyFramework(framework, bundlePath);
         // Skip the rest if already was deployed.
-        if (deployedBinaryPath == QString())
+        if (deployedBinaryPath.isNull())
             continue;
 
         runStrip(deployedBinaryPath);
diff --git a/tools/porting/src/portingrules.cpp b/tools/porting/src/portingrules.cpp
index 4931064..cd29403 100644
--- a/tools/porting/src/portingrules.cpp
+++ b/tools/porting/src/portingrules.cpp
@@ -189,7 +189,7 @@ void PortingRules::parseXml(QString fileName)
 
     QString includeFile = xml[QLatin1String("Rules")][QLatin1String("Include")].text();
 
-    if(includeFile != QString()) {
+    if(!includeFile.isNull()) {
         QString resolvedIncludeFile = resolveFileName(fileName, includeFile);
         if (!resolvedIncludeFile.isEmpty())
             parseXml(resolvedIncludeFile);
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
index 9c25a89..fcb63a8 100644
--- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -441,21 +441,14 @@ void QDBusViewer::about()
 {
     QMessageBox box(this);
 
-    // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
-    QString edition;
-    QString info;
-    QString moreInfo;
-
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">"
                 "<h3>%1</h3>"
-                "<p>Version %2 %3</p></center>"
-                "<p>%4</p>"
-                "<p>%5</p>"
+                "<p>Version %2</p></center>"
                 "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
                 "<p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
                 " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
                 " PARTICULAR PURPOSE.<p/>")
-            .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR)).arg(edition).arg(info).arg(moreInfo));
+            .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("D-Bus Viewer"));
     box.exec();
 }
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index f5b5a2d..e271338 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -61,6 +61,127 @@ QT_BEGIN_NAMESPACE
 
 static bool showBrokenLinks = false;
 
+static QRegExp linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
+static QRegExp funcTag("(<@func target=\"([^\"]*)\">)(.*)(</@func>)");
+static QRegExp typeTag("(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)");
+static QRegExp spanTag("</@(?:comment|preprocessor|string|char)>");
+static QRegExp unknownTag("</?@[^>]*>");
+
+bool parseArg(const QString &src,
+              const QString &tag,
+              int *pos,
+              int n,
+              QStringRef *contents,
+              QStringRef *par1 = 0,
+              bool debug = false)
+{
+#define SKIP_CHAR(c) \
+    if (debug) \
+        qDebug() << "looking for " << c << " at " << QString(src.data() + i, n - i); \
+    if (i >= n || src[i] != c) { \
+        if (debug) \
+            qDebug() << " char '" << c << "' not found"; \
+        return false; \
+    } \
+    ++i;
+
+
+#define SKIP_SPACE \
+    while (i < n && src[i] == ' ') \
+        ++i;
+
+    int i = *pos;
+    int j = i;
+
+    // assume "<@" has been parsed outside
+    //SKIP_CHAR('<');
+    //SKIP_CHAR('@');
+
+    if (tag != QStringRef(&src, i, tag.length())) {
+        if (0 && debug)
+            qDebug() << "tag " << tag << " not found at " << i;
+        return false;
+    }
+
+    if (debug)
+        qDebug() << "haystack:" << src << "needle:" << tag << "i:" <<i;
+
+    // skip tag
+    i += tag.length();
+
+    // parse stuff like:  linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
+    if (par1) {
+        SKIP_SPACE;
+        // read parameter name
+        j = i;
+        while (i < n && src[i].isLetter())
+            ++i;
+        if (src[i] == '=') {
+            if (debug)
+                qDebug() << "read parameter" << QString(src.data() + j, i - j);
+            SKIP_CHAR('=');
+            SKIP_CHAR('"');
+            // skip parameter name
+            j = i;
+            while (i < n && src[i] != '"')
+                ++i;
+            *par1 = QStringRef(&src, j, i - j);
+            SKIP_CHAR('"');
+            SKIP_SPACE;
+        } else {
+            if (debug)
+                qDebug() << "no optional parameter found";
+        }
+    }
+    SKIP_SPACE;
+    SKIP_CHAR('>');
+
+    // find contents up to closing "</@tag>
+    j = i;
+    for (; true; ++i) {
+        if (i + 4 + tag.length() > n)
+            return false;
+        if (src[i] != '<')
+            continue;
+        if (src[i + 1] != '/')
+            continue;
+        if (src[i + 2] != '@')
+            continue;
+        if (tag != QStringRef(&src, i + 3, tag.length()))
+            continue;
+        if (src[i + 3 + tag.length()] != '>')
+            continue;
+        break;
+    }
+
+    *contents = QStringRef(&src, j, i - j);
+
+    i += tag.length() + 4;
+
+    *pos = i;
+    if (debug)
+        qDebug() << " tag " << tag << " found: pos now: " << i;
+    return true;
+#undef SKIP_CHAR
+}
+
+static void addLink(const QString &linkTarget,
+                    const QStringRef &nestedStuff,
+                    QString *res)
+{
+    if (!linkTarget.isEmpty()) {
+        *res += "<a href=\"";
+        *res += linkTarget;
+        *res += "\">";
+        *res += nestedStuff;
+        *res += "</a>";
+    }
+    else {
+        *res += nestedStuff;
+    }
+}
+
+
 HtmlGenerator::HtmlGenerator()
     : helpProjectWriter(0), inLink(false), inContents(false),
       inSectionHeading(false), inTableHeader(false), numTableRows(0),
@@ -1928,40 +2049,6 @@ void HtmlGenerator::generateLegaleseList(const Node *relative, CodeMarker *marke
     }
 }
 
-void HtmlGenerator::generateSynopsis(const Node *node, const Node *relative,
-                                     CodeMarker *marker, CodeMarker::SynopsisStyle style)
-{
-    QString marked = marker->markedUpSynopsis(node, relative, style);
-    QRegExp templateTag("(<[^@>]*>)");
-    if (marked.indexOf(templateTag) != -1) {
-        QString contents = protect(marked.mid(templateTag.pos(1),
-                                              templateTag.cap(1).length()));
-        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-                        contents);
-    }
-    marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"), "<i>\\1<sub>\\2</sub></i>");
-    marked.replace("<@param>", "<i>");
-    marked.replace("</@param>", "</i>");
-
-    if (style == CodeMarker::Summary)
-        marked.replace("@name>", "b>");
-
-    if (style == CodeMarker::SeparateList) {
-        QRegExp extraRegExp("<@extra>.*</@extra>");
-        extraRegExp.setMinimal(true);
-        marked.replace(extraRegExp, "");
-    } else {
-        marked.replace("<@extra>", "&nbsp;&nbsp;<tt>");
-        marked.replace("</@extra>", "</tt>");
-    }
-
-    if (style != CodeMarker::Detailed) {
-        marked.replace("<@type>", "");
-        marked.replace("</@type>", "");
-    }
-    out() << highlightedCode(marked, marker, relative);
-}
-
 void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* marker */)
 {
     QMap<const FakeNode *, QMap<QString, FakeNode *> > fakeNodeMap;
@@ -2075,21 +2162,35 @@ void HtmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* m
     }
 }
 
-void HtmlGenerator::generateSectionList(const Section& section, const Node *relative,
-                                        CodeMarker *marker, CodeMarker::SynopsisStyle style)
+#ifdef QDOC_NAME_ALIGNMENT
+void HtmlGenerator::generateSectionList(const Section& section,
+                                        const Node *relative,
+                                        CodeMarker *marker,
+                                        CodeMarker::SynopsisStyle style)
 {
+    bool name_alignment = true;
     if (!section.members.isEmpty()) {
         bool twoColumn = false;
         if (style == CodeMarker::SeparateList) {
+            name_alignment = false;
             twoColumn = (section.members.count() >= 16);
-        } else if (section.members.first()->type() == Node::Property) {
+        }
+        else if (section.members.first()->type() == Node::Property) {
             twoColumn = (section.members.count() >= 5);
+            name_alignment = false;
+        }
+        if (name_alignment) {
+            out() << "<table border=\"0\" cellpadding=\"0\" "
+                  << "cellspacing=\"0\">\n";
+        }
+        else {
+            if (twoColumn)
+                out() << "<p><table width=\"100%\" "
+                      << "border=\"0\" cellpadding=\"0\""
+                      << " cellspacing=\"0\">\n"
+                      << "<tr><td width=\"45%\" valign=\"top\">";
+            out() << "<ul>\n";
         }
-        if (twoColumn)
-            out() << "<p><table width=\"100%\" border=\"0\" cellpadding=\"0\""
-                     " cellspacing=\"0\">\n"
-                  << "<tr><td width=\"45%\" valign=\"top\">";
-        out() << "<ul>\n";
 
         int i = 0;
         NodeList::ConstIterator m = section.members.begin();
@@ -2099,41 +2200,60 @@ void HtmlGenerator::generateSectionList(const Section& section, const Node *rela
                 continue;
             }
 
-            if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                out() << "</ul></td><td valign=\"top\"><ul>\n";
+            if (name_alignment) {
+                out() << "<tr><td class=\"memItemLeft\" "
+                      << "nowrap align=\"right\" valign=\"top\">";
+            }
+            else {
+                if (twoColumn && i == (int) (section.members.count() + 1) / 2)
+                    out() << "</ul></td><td valign=\"top\"><ul>\n";
+                out() << "<li><div class=\"fn\"></div>";
+            }
 
-            out() << "<li><div class=\"fn\"></div>";
             if (style == CodeMarker::Accessors)
                 out() << "<b>";
-            generateSynopsis(*m, relative, marker, style);
+            generateSynopsis(*m, relative, marker, style, name_alignment);
             if (style == CodeMarker::Accessors)
                 out() << "</b>";
-            out() << "</li>\n";
+            if (name_alignment)
+                out() << "</td></tr>\n";
+            else
+                out() << "</li>\n";
             i++;
             ++m;
         }
-        out() << "</ul>\n";
-        if (twoColumn)
-            out() << "</td></tr>\n</table></p>\n";
+        if (name_alignment)
+            out() << "</table>\n";
+        else {
+            out() << "</ul>\n";
+            if (twoColumn)
+                out() << "</td></tr>\n</table></p>\n";
+        }
     }
 
     if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
         out() << "<ul>\n";
-        generateSectionInheritedList(section, relative, marker);
+        generateSectionInheritedList(section, relative, marker, name_alignment);
         out() << "</ul>\n";
     }
 }
 
-void HtmlGenerator::generateSectionInheritedList(const Section& section, const Node *relative,
-                                                 CodeMarker *marker)
+void HtmlGenerator::generateSectionInheritedList(const Section& section,
+                                                 const Node *relative,
+                                                 CodeMarker *marker,
+                                                 bool nameAlignment)
 {
     QList<QPair<ClassNode *, int> >::ConstIterator p = section.inherited.begin();
     while (p != section.inherited.end()) {
-        out() << "<li><div class=\"fn\"></div>";
+        if (nameAlignment)
+            out() << "<li><div bar=2 class=\"fn\"></div>";
+        else
+            out() << "<li><div class=\"fn\"></div>";
         out() << (*p).second << " ";
         if ((*p).second == 1) {
             out() << section.singularMember;
-        } else {
+        }
+        else {
             out() << section.pluralMember;
         }
         out() << " inherited from <a href=\"" << fileName((*p).first)
@@ -2144,270 +2264,315 @@ void HtmlGenerator::generateSectionInheritedList(const Section& section, const N
     }
 }
 
-void HtmlGenerator::generateLink(const Atom *atom, const Node * /* relative */, CodeMarker *marker)
+void HtmlGenerator::generateSynopsis(const Node *node,
+                                     const Node *relative,
+                                     CodeMarker *marker,
+                                     CodeMarker::SynopsisStyle style,
+                                     bool nameAlignment)
 {
-    static QRegExp camelCase("[A-Z][A-Z][a-z]|[a-z][A-Z0-9]|_");
-
-    if (funcLeftParen.indexIn(atom->string()) != -1 && marker->recognizeLanguage("Cpp")) {
-        // hack for C++: move () outside of link
-        int k = funcLeftParen.pos(1);
-        out() << protect(atom->string().left(k));
-        if (link.isEmpty()) {
-            if (showBrokenLinks)
-                out() << "</i>";
-        } else {
-            out() << "</a>";
-        }
-        inLink = false;
-        out() << protect(atom->string().mid(k));
-    } else if (marker->recognizeLanguage("Java")) {
-	// hack for Java: remove () and use <tt> when appropriate
-        bool func = atom->string().endsWith("()");
-        bool tt = (func || atom->string().contains(camelCase));
-        if (tt)
-            out() << "<tt>";
-        if (func) {
-            out() << protect(atom->string().left(atom->string().length() - 2));
-        } else {
-            out() << protect(atom->string());
-        }
-        out() << "</tt>";
-    } else {
-        out() << protect(atom->string());
+    QString marked = marker->markedUpSynopsis(node, relative, style);
+    QRegExp templateTag("(<[^@>]*>)");
+    if (marked.indexOf(templateTag) != -1) {
+        QString contents = protect(marked.mid(templateTag.pos(1),
+                                              templateTag.cap(1).length()));
+        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
+                        contents);
     }
-}
-
-QString HtmlGenerator::cleanRef(const QString& ref)
-{
-    QString clean;
-
-    if (ref.isEmpty())
-        return clean;
+    marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"),
+                   "<i>\\1<sub>\\2</sub></i>");
+    marked.replace("<@param>", "<i>");
+    marked.replace("</@param>", "</i>");
 
-    clean.reserve(ref.size() + 20);
-    const QChar c = ref[0];
-    const uint u = c.unicode();
+    if (style == CodeMarker::Summary)
+        marked.replace("@name>", "b>");
 
-    if ((u >= 'a' && u <= 'z') ||
-         (u >= 'A' && u <= 'Z') ||
-         (u >= '0' && u <= '9')) {
-        clean += c;
-    } else if (u == '~') {
-        clean += "dtor.";
-    } else if (u == '_') {
-        clean += "underscore.";
+    if (style == CodeMarker::SeparateList) {
+        QRegExp extraRegExp("<@extra>.*</@extra>");
+        extraRegExp.setMinimal(true);
+        marked.replace(extraRegExp, "");
     } else {
-        clean += "A";
+        marked.replace("<@extra>", "&nbsp;&nbsp;<tt>");
+        marked.replace("</@extra>", "</tt>");
     }
 
-    for (int i = 1; i < (int) ref.length(); i++) {
-        const QChar c = ref[i];
-        const uint u = c.unicode();
-        if ((u >= 'a' && u <= 'z') ||
-             (u >= 'A' && u <= 'Z') ||
-             (u >= '0' && u <= '9') || u == '-' ||
-             u == '_' || u == ':' || u == '.') {
-            clean += c;
-        } else if (c.isSpace()) {
-            clean += "-";
-        } else if (u == '!') {
-            clean += "-not";
-        } else if (u == '&') {
-            clean += "-and";
-        } else if (u == '<') {
-            clean += "-lt";
-        } else if (u == '=') {
-            clean += "-eq";
-        } else if (u == '>') {
-            clean += "-gt";
-        } else if (u == '#') {
-            clean += "#";
-        } else {
-            clean += "-";
-            clean += QString::number((int)u, 16);
-        }
+    if (style != CodeMarker::Detailed) {
+        marked.replace("<@type>", "");
+        marked.replace("</@type>", "");
     }
-    return clean;
+    out() << highlightedCode(marked, marker, relative, nameAlignment);
 }
 
-QString HtmlGenerator::registerRef(const QString& ref)
+QString HtmlGenerator::highlightedCode(const QString& markedCode,
+                                       CodeMarker *marker,
+                                       const Node *relative,
+                                       bool nameAlignment)
 {
-    QString clean = HtmlGenerator::cleanRef(ref);
+    QString src = markedCode;
+    QString html;
+    QStringRef arg;
+    QStringRef par1;
 
-    for (;;) {
-        QString& prevRef = refMap[clean.toLower()];
-        if (prevRef.isEmpty()) {
-            prevRef = ref;
-            break;
-        } else if (prevRef == ref) {
-            break;
+    const QChar charLangle = '<';
+    const QChar charAt = '@';
+
+    // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
+    static const QString linkTag("link");
+    for (int i = 0, n = src.size(); i < n;) {
+        if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
+            if (nameAlignment && (i != 0))
+                html += "&nbsp;</td><td class=\"memItemRight\" valign=\"bottom\">";
+            i += 2;
+            if (parseArg(src, linkTag, &i, n, &arg, &par1)) {
+                QString link = linkForNode(
+                    CodeMarker::nodeForString(par1.toString()), relative);
+                addLink(link, arg, &html);
+            }
+            else {
+                html += charLangle;
+                html += charAt;
+            }
+        }
+        else {
+            html += src.at(i++);
         }
-        clean += "x";
     }
-    return clean;
-}
 
-QString HtmlGenerator::protect(const QString& string)
-{
-#define APPEND(x) \
-    if (html.isEmpty()) { \
-        html = string; \
-        html.truncate(i); \
-    } \
-    html += (x);
 
-    QString html;
-    int n = string.length();
-
-    for (int i = 0; i < n; ++i) {
-        QChar ch = string.at(i);
+    if (slow) {
+        // is this block ever used at all?
+        // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
+        src = html;
+        html = QString();
+        static const QString funcTag("func");
+        for (int i = 0, n = src.size(); i < n;) {
+            if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+                i += 2;
+                if (parseArg(src, funcTag, &i, n, &arg, &par1)) {
+                    QString link = linkForNode(
+                            marker->resolveTarget(par1.toString(),
+                                                  tre,
+                                                  relative),
+                            relative);
+                    addLink(link, arg, &html);
+                    par1 = QStringRef();
+                }
+                else {
+                    html += charLangle;
+                    html += charAt;
+                }
+            }
+            else {
+                html += src.at(i++);
+            }
+        }
+    }
 
-        if (ch == QLatin1Char('&')) {
-            APPEND("&amp;");
-        } else if (ch == QLatin1Char('<')) {
-            APPEND("&lt;");
-        } else if (ch == QLatin1Char('>')) {
-            APPEND("&gt;");
-        } else if (ch == QLatin1Char('"')) {
-            APPEND("&quot;");
-        } else if (ch.unicode() > 0x007F
-                   || (ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/'))
-                   || (ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
-            // we escape '*/' and the last dot in 'e.g.' and 'i.e.' for the Javadoc generator
-            APPEND("&#x");
-            html += QString::number(ch.unicode(), 16);
-            html += QLatin1Char(';');
-        } else {
-            if (!html.isEmpty())
-                html += ch;
+    // replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
+    src = html;
+    html = QString();
+    static const QString typeTags[] = { "type", "headerfile", "func" };
+    for (int i = 0, n = src.size(); i < n;) {
+        if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+            i += 2;
+            bool handled = false;
+            for (int k = 0; k != 3; ++k) {
+                if (parseArg(src, typeTags[k], &i, n, &arg, &par1)) {
+                    par1 = QStringRef();
+                    QString link = linkForNode(
+                            marker->resolveTarget(arg.toString(), tre, relative),
+                            relative);
+                    addLink(link, arg, &html);
+                    handled = true;
+                    break;
+                }
+            }
+            if (!handled) {
+                html += charLangle;
+                html += charAt;
+            }
+        }
+        else {
+            html += src.at(i++);
         }
     }
 
-    if (!html.isEmpty())
-        return html;
-    return string;
+    // replace all
+    // "<@comment>" -> "<span class=\"comment\">";
+    // "<@preprocessor>" -> "<span class=\"preprocessor\">";
+    // "<@string>" -> "<span class=\"string\">";
+    // "<@char>" -> "<span class=\"char\">";
+    // "</@(?:comment|preprocessor|string|char)>" -> "</span>"
+    src = html;
+    html = QString();
+    static const QString spanTags[] = {
+        "<@comment>",      "<span class=\"comment\">",
+        "<@preprocessor>", "<span class=\"preprocessor\">",
+        "<@string>",       "<span class=\"string\">",
+        "<@char>",         "<span class=\"char\">",
+        "</@comment>",     "</span>",
+        "</@preprocessor>","</span>",
+        "</@string>",      "</span>",
+        "</@char>",        "</span>"
+        // "<@char>",      "<font color=blue>",
+        // "</@char>",     "</font>",
+        // "<@func>",      "<font color=green>",
+        // "</@func>",     "</font>",
+        // "<@id>",        "<i>",
+        // "</@id>",       "</i>",
+        // "<@keyword>",   "<b>",
+        // "</@keyword>",  "</b>",
+        // "<@number>",    "<font color=yellow>",
+        // "</@number>",   "</font>",
+        // "<@op>",        "<b>",
+        // "</@op>",       "</b>",
+        // "<@param>",     "<i>",
+        // "</@param>",    "</i>",
+        // "<@string>",    "<font color=green>",
+        // "</@string>",  "</font>",
+    };
+    for (int i = 0, n = src.size(); i < n;) {
+        if (src.at(i) == charLangle) {
+            bool handled = false;
+            for (int k = 0; k != 8; ++k) {
+                const QString & tag = spanTags[2 * k];
+                if (tag == QStringRef(&src, i, tag.length())) {
+                    html += spanTags[2 * k + 1];
+                    i += tag.length();
+                    handled = true;
+                    break;
+                }
+            }
+            if (!handled) {
+                ++i;
+                if (src.at(i) == charAt ||
+                    (src.at(i) == QLatin1Char('/') && src.at(i + 1) == charAt)) {
+                    // drop 'our' unknown tags (the ones still containing '@')
+                    while (i < n && src.at(i) != QLatin1Char('>'))
+                        ++i;
+                    ++i;
+                }
+                else {
+                    // retain all others
+                    html += charLangle;
+                }
+            }
+        }
+        else {
+            html += src.at(i);
+            ++i;
+        }
+    }
 
-#undef APPEND
+    return html;
 }
 
-static QRegExp linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
-static QRegExp funcTag("(<@func target=\"([^\"]*)\">)(.*)(</@func>)");
-static QRegExp typeTag("(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)");
-static QRegExp spanTag("</@(?:comment|preprocessor|string|char)>");
-static QRegExp unknownTag("</?@[^>]*>");
-
-bool parseArg(const QString &src,
-              const QString &tag,
-              int *pos,
-              int n,
-              QStringRef *contents,
-              QStringRef *par1 = 0,
-              bool debug = false)
+#else
+void HtmlGenerator::generateSectionList(const Section& section,
+                                        const Node *relative,
+                                        CodeMarker *marker,
+                                        CodeMarker::SynopsisStyle style)
 {
-#define SKIP_CHAR(c) \
-    if (debug) \
-        qDebug() << "looking for " << c << " at " << QString(src.data() + i, n - i); \
-    if (i >= n || src[i] != c) { \
-        if (debug) \
-            qDebug() << " char '" << c << "' not found"; \
-        return false; \
-    } \
-    ++i;
-
-
-#define SKIP_SPACE \
-    while (i < n && src[i] == ' ') \
-        ++i;
+    if (!section.members.isEmpty()) {
+        bool twoColumn = false;
+        if (style == CodeMarker::SeparateList) {
+            twoColumn = (section.members.count() >= 16);
+        } else if (section.members.first()->type() == Node::Property) {
+            twoColumn = (section.members.count() >= 5);
+        }
+        if (twoColumn)
+            out() << "<p><table width=\"100%\" border=\"0\" cellpadding=\"0\""
+                     " cellspacing=\"0\">\n"
+                  << "<tr><td width=\"45%\" valign=\"top\">";
+        out() << "<ul>\n";
 
-    int i = *pos;
-    int j = i;
+        int i = 0;
+        NodeList::ConstIterator m = section.members.begin();
+        while (m != section.members.end()) {
+            if ((*m)->access() == Node::Private) {
+                ++m;
+                continue;
+            }
 
-    // assume "<@" has been parsed outside
-    //SKIP_CHAR('<');
-    //SKIP_CHAR('@');
+            if (twoColumn && i == (int) (section.members.count() + 1) / 2)
+                out() << "</ul></td><td valign=\"top\"><ul>\n";
 
-    if (tag != QStringRef(&src, i, tag.length())) {
-        if (0 && debug)
-            qDebug() << "tag " << tag << " not found at " << i;
-        return false;
+            out() << "<li><div class=\"fn\"></div>";
+            if (style == CodeMarker::Accessors)
+                out() << "<b>";
+            generateSynopsis(*m, relative, marker, style);
+            if (style == CodeMarker::Accessors)
+                out() << "</b>";
+            out() << "</li>\n";
+            i++;
+            ++m;
+        }
+        out() << "</ul>\n";
+        if (twoColumn)
+            out() << "</td></tr>\n</table></p>\n";
     }
 
-    if (debug)
-        qDebug() << "haystack:" << src << "needle:" << tag << "i:" <<i;
-
-    // skip tag
-    i += tag.length();
+    if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
+        out() << "<ul>\n";
+        generateSectionInheritedList(section, relative, marker);
+        out() << "</ul>\n";
+    }
+}
 
-    // parse stuff like:  linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
-    if (par1) {
-        SKIP_SPACE;
-        // read parameter name
-        j = i;
-        while (i < n && src[i].isLetter())
-            ++i;
-        if (src[i] == '=') {
-            if (debug)
-                qDebug() << "read parameter" << QString(src.data() + j, i - j);
-            SKIP_CHAR('=');
-            SKIP_CHAR('"');
-            // skip parameter name
-            j = i;
-            while (i < n && src[i] != '"')
-                ++i;
-            *par1 = QStringRef(&src, j, i - j);
-            SKIP_CHAR('"');
-            SKIP_SPACE;
+void HtmlGenerator::generateSectionInheritedList(const Section& section,
+                                                 const Node *relative,
+                                                 CodeMarker *marker)
+{
+    QList<QPair<ClassNode *, int> >::ConstIterator p = section.inherited.begin();
+    while (p != section.inherited.end()) {
+        out() << "<li><div bar=2 class=\"fn\"></div>";
+        out() << (*p).second << " ";
+        if ((*p).second == 1) {
+            out() << section.singularMember;
         } else {
-            if (debug)
-                qDebug() << "no optional parameter found";
+            out() << section.pluralMember;
         }
+        out() << " inherited from <a href=\"" << fileName((*p).first)
+              << "#" << HtmlGenerator::cleanRef(section.name.toLower()) << "\">"
+              << protect(marker->plainFullName((*p).first, relative))
+              << "</a></li>\n";
+        ++p;
     }
-    SKIP_SPACE;
-    SKIP_CHAR('>');
+}
 
-    // find contents up to closing "</@tag>
-    j = i;
-    for (; true; ++i) {
-        if (i + 4 + tag.length() > n)
-            return false;
-        if (src[i] != '<')
-            continue;
-        if (src[i + 1] != '/')
-            continue;
-        if (src[i + 2] != '@')
-            continue;
-        if (tag != QStringRef(&src, i + 3, tag.length()))
-            continue;
-        if (src[i + 3 + tag.length()] != '>')
-            continue;
-        break;
+void HtmlGenerator::generateSynopsis(const Node *node,
+                                     const Node *relative,
+                                     CodeMarker *marker,
+                                     CodeMarker::SynopsisStyle style)
+{
+    QString marked = marker->markedUpSynopsis(node, relative, style);
+    QRegExp templateTag("(<[^@>]*>)");
+    if (marked.indexOf(templateTag) != -1) {
+        QString contents = protect(marked.mid(templateTag.pos(1),
+                                              templateTag.cap(1).length()));
+        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
+                        contents);
     }
+    marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"), "<i>\\1<sub>\\2</sub></i>");
+    marked.replace("<@param>", "<i>");
+    marked.replace("</@param>", "</i>");
 
-    *contents = QStringRef(&src, j, i - j);
-
-    i += tag.length() + 4;
-
-    *pos = i;
-    if (debug)
-        qDebug() << " tag " << tag << " found: pos now: " << i;
-    return true;
-#undef SKIP_CHAR
-}
+    if (style == CodeMarker::Summary)
+        marked.replace("@name>", "b>");
 
-static void addLink(const QString &linkTarget,
-                    const QStringRef &nestedStuff,
-                    QString *res)
-{
-    if (!linkTarget.isEmpty()) {
-        *res += "<a href=\"";
-        *res += linkTarget;
-        *res += "\">";
-        *res += nestedStuff;
-        *res += "</a>";
+    if (style == CodeMarker::SeparateList) {
+        QRegExp extraRegExp("<@extra>.*</@extra>");
+        extraRegExp.setMinimal(true);
+        marked.replace(extraRegExp, "");
+    } else {
+        marked.replace("<@extra>", "&nbsp;&nbsp;<tt>");
+        marked.replace("</@extra>", "</tt>");
     }
-    else {
-        *res += nestedStuff;
+
+    if (style != CodeMarker::Detailed) {
+        marked.replace("<@type>", "");
+        marked.replace("</@type>", "");
     }
+    out() << highlightedCode(marked, marker, relative);
 }
 
 QString HtmlGenerator::highlightedCode(const QString& markedCode,
@@ -2570,6 +2735,153 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
 
     return html;
 }
+#endif
+
+void HtmlGenerator::generateLink(const Atom *atom, const Node * /* relative */, CodeMarker *marker)
+{
+    static QRegExp camelCase("[A-Z][A-Z][a-z]|[a-z][A-Z0-9]|_");
+
+    if (funcLeftParen.indexIn(atom->string()) != -1 && marker->recognizeLanguage("Cpp")) {
+        // hack for C++: move () outside of link
+        int k = funcLeftParen.pos(1);
+        out() << protect(atom->string().left(k));
+        if (link.isEmpty()) {
+            if (showBrokenLinks)
+                out() << "</i>";
+        } else {
+            out() << "</a>";
+        }
+        inLink = false;
+        out() << protect(atom->string().mid(k));
+    } else if (marker->recognizeLanguage("Java")) {
+	// hack for Java: remove () and use <tt> when appropriate
+        bool func = atom->string().endsWith("()");
+        bool tt = (func || atom->string().contains(camelCase));
+        if (tt)
+            out() << "<tt>";
+        if (func) {
+            out() << protect(atom->string().left(atom->string().length() - 2));
+        } else {
+            out() << protect(atom->string());
+        }
+        out() << "</tt>";
+    } else {
+        out() << protect(atom->string());
+    }
+}
+
+QString HtmlGenerator::cleanRef(const QString& ref)
+{
+    QString clean;
+
+    if (ref.isEmpty())
+        return clean;
+
+    clean.reserve(ref.size() + 20);
+    const QChar c = ref[0];
+    const uint u = c.unicode();
+
+    if ((u >= 'a' && u <= 'z') ||
+         (u >= 'A' && u <= 'Z') ||
+         (u >= '0' && u <= '9')) {
+        clean += c;
+    } else if (u == '~') {
+        clean += "dtor.";
+    } else if (u == '_') {
+        clean += "underscore.";
+    } else {
+        clean += "A";
+    }
+
+    for (int i = 1; i < (int) ref.length(); i++) {
+        const QChar c = ref[i];
+        const uint u = c.unicode();
+        if ((u >= 'a' && u <= 'z') ||
+             (u >= 'A' && u <= 'Z') ||
+             (u >= '0' && u <= '9') || u == '-' ||
+             u == '_' || u == ':' || u == '.') {
+            clean += c;
+        } else if (c.isSpace()) {
+            clean += "-";
+        } else if (u == '!') {
+            clean += "-not";
+        } else if (u == '&') {
+            clean += "-and";
+        } else if (u == '<') {
+            clean += "-lt";
+        } else if (u == '=') {
+            clean += "-eq";
+        } else if (u == '>') {
+            clean += "-gt";
+        } else if (u == '#') {
+            clean += "#";
+        } else {
+            clean += "-";
+            clean += QString::number((int)u, 16);
+        }
+    }
+    return clean;
+}
+
+QString HtmlGenerator::registerRef(const QString& ref)
+{
+    QString clean = HtmlGenerator::cleanRef(ref);
+
+    for (;;) {
+        QString& prevRef = refMap[clean.toLower()];
+        if (prevRef.isEmpty()) {
+            prevRef = ref;
+            break;
+        } else if (prevRef == ref) {
+            break;
+        }
+        clean += "x";
+    }
+    return clean;
+}
+
+QString HtmlGenerator::protect(const QString& string)
+{
+#define APPEND(x) \
+    if (html.isEmpty()) { \
+        html = string; \
+        html.truncate(i); \
+    } \
+    html += (x);
+
+    QString html;
+    int n = string.length();
+
+    for (int i = 0; i < n; ++i) {
+        QChar ch = string.at(i);
+
+        if (ch == QLatin1Char('&')) {
+            APPEND("&amp;");
+        } else if (ch == QLatin1Char('<')) {
+            APPEND("&lt;");
+        } else if (ch == QLatin1Char('>')) {
+            APPEND("&gt;");
+        } else if (ch == QLatin1Char('"')) {
+            APPEND("&quot;");
+        } else if (ch.unicode() > 0x007F
+                   || (ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/'))
+                   || (ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
+            // we escape '*/' and the last dot in 'e.g.' and 'i.e.' for the Javadoc generator
+            APPEND("&#x");
+            html += QString::number(ch.unicode(), 16);
+            html += QLatin1Char(';');
+        } else {
+            if (!html.isEmpty())
+                html += ch;
+        }
+    }
+
+    if (!html.isEmpty())
+        return html;
+    return string;
+
+#undef APPEND
+}
 
 QString HtmlGenerator::fileBase(const Node *node)
 {
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index de64190..ec9532f 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -46,6 +46,8 @@
 #ifndef HTMLGENERATOR_H
 #define HTMLGENERATOR_H
 
+#define QDOC_NAME_ALIGNMENT
+
 #include <qmap.h>
 #include <qregexp.h>
 
@@ -139,17 +141,36 @@ class HtmlGenerator : public PageGenerator
     void generateFunctionIndex(const Node *relative, CodeMarker *marker);
     void generateLegaleseList(const Node *relative, CodeMarker *marker);
     void generateOverviewList(const Node *relative, CodeMarker *marker);
-    void generateSynopsis(const Node *node, 
-                          const Node *relative, 
-                          CodeMarker *marker,
-			  CodeMarker::SynopsisStyle style);
     void generateSectionList(const Section& section, 
                              const Node *relative,
 			     CodeMarker *marker, 
                              CodeMarker::SynopsisStyle style);
+#ifdef QDOC_NAME_ALIGNMENT
+    void generateSynopsis(const Node *node, 
+                          const Node *relative, 
+                          CodeMarker *marker,
+			  CodeMarker::SynopsisStyle style,
+                          bool nameAlignment = false);
+    void generateSectionInheritedList(const Section& section, 
+                                      const Node *relative,
+                                      CodeMarker *marker,
+                                      bool nameAlignment = false);
+    QString highlightedCode(const QString& markedCode, 
+                            CodeMarker *marker, 
+                            const Node *relative,
+                            bool nameAlignment = false);
+#else
+    void generateSynopsis(const Node *node, 
+                          const Node *relative, 
+                          CodeMarker *marker,
+			  CodeMarker::SynopsisStyle style);
     void generateSectionInheritedList(const Section& section, 
                                       const Node *relative,
                                       CodeMarker *marker);
+    QString highlightedCode(const QString& markedCode, 
+                            CodeMarker *marker, 
+                            const Node *relative);
+#endif
     void generateFullName(const Node *apparentNode, 
                           const Node *relative, 
                           CodeMarker *marker,
@@ -159,7 +180,6 @@ class HtmlGenerator : public PageGenerator
     void generateStatus(const Node *node, CodeMarker *marker);
     
     QString registerRef(const QString& ref);
-    QString highlightedCode(const QString& markedCode, CodeMarker *marker, const Node *relative);
     QString fileBase(const Node *node);
 #if 0
     QString fileBase(const Node *node, const SectionIterator& section);
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 6cf7377..8e9eb78 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -1,12 +1,34 @@
+BODY,H1,H2,H3,H4,H5,H6,P,CENTER,TD,TH,UL,DL,DIV {
+  font-family: Arial, Geneva, Helvetica, sans-serif;
+}
+BODY,TD {
+  font-size: 90%;
+}
+H1 {
+  text-align: center;
+  font-size: 160%;
+}
+H2 {
+  font-size: 120%;
+}
+H3 {
+  font-size: 100%;
+}
+
 h3.fn,span.fn
 {
-  margin-left: 1cm;
-  text-indent: -1cm;
+  background-color: #d5e1d5;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #66bc29;
+  font-weight: bold;
+  -moz-border-radius: 8px 8px 8px 8px;
+  padding: 6px 0px 6px 10px;
 }
 
 a:link
 {
-  color: #004faf;
+  color: #0046ad;
   text-decoration: none
 }
 
@@ -40,22 +62,50 @@ a.compat:visited
   text-decoration: none
 }
 
-td.postheader
-{
-  font-family: sans-serif
-}
-
-tr.address
-{
-  font-family: sans-serif
-}
-
 body
 {
   background: #ffffff;
   color: black
 }
 
+table td.memItemLeft {
+  width: 200px;
+  padding: 1px 0px 0px 8px;
+  margin: 4px;
+  border-top-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  border-left-width: 1px;
+  border-top-color: #66bc29;
+  border-right-color: #66bc29;
+  border-bottom-color: #66bc29;
+  border-left-color: #66bc29;
+  border-top-style: solid;
+  border-right-style: none;
+  border-bottom-style: none;
+  border-left-style: none;
+  background-color: #FAFAFA;
+  font-size: 80%;
+}
+table td.memItemRight {
+  padding: 1px 8px 0px 8px;
+  margin: 4px;
+  border-top-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  border-left-width: 1px;
+  border-top-color: #66bc29;
+  border-right-color: #66bc29;
+  border-bottom-color: #66bc29;
+  border-left-color: #66bc29;
+  border-top-style: solid;
+  border-right-style: none;
+  border-bottom-style: none;
+  border-left-style: none;
+  background-color: #FAFAFA;
+  font-size: 80%;
+}
+
 table tr.odd {
   background: #f0f0f0;
   color: black;
diff --git a/tools/qtestlib/chart/benchmark_template.html b/tools/qtestlib/chart/benchmark_template.html
index 11efd92..a7e48be 100644
--- a/tools/qtestlib/chart/benchmark_template.html
+++ b/tools/qtestlib/chart/benchmark_template.html
@@ -108,15 +108,25 @@ function checkform()
     this.createChart();
 }
 
+function createElement(nodeName, name) {
+  var node;
+  try {
+    node = document.createElement("<"+nodeName+" name="+name+">");
+  } catch (e) {
+    node = document.createElement(nodeName);
+    node.name = name;
+  }
+  return node;
+}
+
 function createFormSelector(form, value, text, type)
 {
-  var selector = document.createElement('input');
-  form.appendChild(selector);
+  var selector = createElement('input', 'list');
   selector.type = type;
-  selector.name = 'list';
   selector.defaultChecked = true;
   selector.value = value;
 
+  form.appendChild(selector);
   form.appendChild(document.createTextNode(text));
   form.appendChild(document.createElement("BR"));
 }
diff --git a/tools/qtestlib/chart/reportgenerator.cpp b/tools/qtestlib/chart/reportgenerator.cpp
index bf5bf94..94661ba 100644
--- a/tools/qtestlib/chart/reportgenerator.cpp
+++ b/tools/qtestlib/chart/reportgenerator.cpp
@@ -253,7 +253,7 @@ QByteArray printSeriesLabels(const QString &tableName, const QString &seriesColu
     output += "[";
     
     foreach(const QString &serie, series) {
-        output += "\"" + serie.toLocal8Bit() + "\", ";
+        output += "\"" + serie.toLocal8Bit() + "\",";
     }
     output.chop(1); //remove last comma
     output += "]\n";
@@ -446,7 +446,6 @@ void ReportGenerator::writeReports()
     }
 */
     writeReport("Results", "results.html", false);
-    qDebug() << "Supported browsers: Firefox, Safari, Opera, Qt Demo Browser (IE and KDE 3 Konqueror are not supported)";
 }
 
 QString ReportGenerator::fileName()
diff --git a/tools/tools.pro b/tools/tools.pro
index 0a56cfb..d034dcd 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -22,7 +22,7 @@ mac {
     SUBDIRS += macdeployqt
 }
 
-SUBDIRS += kmap2qmap
+embedded:SUBDIRS += kmap2qmap
 
 contains(QT_CONFIG, dbus):SUBDIRS += qdbus
 !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns