Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	tests/auto/qpainter/tst_qpainter.cpp
	translations/qt_ru.ts

12 files changed, 209 insertions, 142 deletions

diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index fbd9923..3bca573 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -63,7 +63,7 @@
 QT_BEGIN_NAMESPACE
 
 BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
-                               const QString &url, QWidget *parent)
+        const QString &url, QWidget *parent)
     : QDialog(parent)
     , m_url(url)
     , m_title(title)
@@ -95,21 +95,21 @@ BookmarkDialog::BookmarkDialog(BookmarkManager *manager, const QString &title,
     connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(addAccepted()));
     connect(ui.newFolderButton, SIGNAL(clicked()), this, SLOT(addNewFolder()));
     connect(ui.toolButton, SIGNAL(clicked()), this, SLOT(toolButtonClicked()));
-    connect(ui.bookmarkEdit, SIGNAL(textChanged(const QString&)), this,
-        SLOT(textChanged(const QString&)));
+    connect(ui.bookmarkEdit, SIGNAL(textChanged(QString)), this,
+        SLOT(textChanged(QString)));
 
-    connect(bookmarkManager->treeBookmarkModel(), SIGNAL(itemChanged(QStandardItem*)),
+    connect(bookmarkManager->treeBookmarkModel(),
+        SIGNAL(itemChanged(QStandardItem*)),
         this, SLOT(itemChanged(QStandardItem*)));
 
-    connect(ui.bookmarkFolders, SIGNAL(currentIndexChanged(const QString&)), this,
-        SLOT(selectBookmarkFolder(const QString&)));
+    connect(ui.bookmarkFolders, SIGNAL(currentIndexChanged(QString)), this,
+        SLOT(selectBookmarkFolder(QString)));
 
-    connect(ui.treeView, SIGNAL(customContextMenuRequested(const QPoint&)), this,
-        SLOT(customContextMenuRequested(const QPoint&)));
+    connect(ui.treeView, SIGNAL(customContextMenuRequested(QPoint)), this,
+        SLOT(customContextMenuRequested(QPoint)));
 
-    connect(ui.treeView->selectionModel(),
-        SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)),
-        this, SLOT(currentChanged(const QModelIndex&, const QModelIndex&)));
+    connect(ui.treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,
+        QModelIndex)), this, SLOT(currentChanged(QModelIndex)));
 }
 
 BookmarkDialog::~BookmarkDialog()
@@ -118,8 +118,8 @@ BookmarkDialog::~BookmarkDialog()
 
 void BookmarkDialog::addAccepted()
 {
-    const QItemSelection selection = ui.treeView->selectionModel()->selection();
-    const QModelIndexList list = selection.indexes();
+    QItemSelectionModel *model = ui.treeView->selectionModel();
+    const QModelIndexList &list = model->selection().indexes();
 
     QModelIndex index;
     if (!list.isEmpty())
@@ -131,8 +131,8 @@ void BookmarkDialog::addAccepted()
 
 void BookmarkDialog::addNewFolder()
 {
-    const QItemSelection selection = ui.treeView->selectionModel()->selection();
-    const QModelIndexList list = selection.indexes();
+    QItemSelectionModel *model = ui.treeView->selectionModel();
+    const QModelIndexList &list = model->selection().indexes();
 
     QModelIndex index;
     if (!list.isEmpty())
@@ -143,13 +143,12 @@ void BookmarkDialog::addNewFolder()
     if (newFolder.isValid()) {
         ui.treeView->expand(index);
         const QModelIndex &index = proxyModel->mapFromSource(newFolder);
-        ui.treeView->selectionModel()->setCurrentIndex(index,
-            QItemSelectionModel::ClearAndSelect);
+        model->setCurrentIndex(index, QItemSelectionModel::ClearAndSelect);
 
         ui.bookmarkFolders->clear();
         ui.bookmarkFolders->addItems(bookmarkManager->bookmarkFolders());
 
-        const QString name = index.data().toString();
+        const QString &name = index.data().toString();
         ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
     }
     ui.treeView->setFocus();
@@ -183,14 +182,14 @@ void BookmarkDialog::itemChanged(QStandardItem *item)
         ui.bookmarkFolders->addItems(bookmarkManager->bookmarkFolders());
 
         QString name = tr("Bookmarks");
-        const QModelIndex& index = ui.treeView->currentIndex();
+        const QModelIndex &index = ui.treeView->currentIndex();
         if (index.isValid())
             name = index.data().toString();
         ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
     }
 }
 
-void BookmarkDialog::textChanged(const QString& string)
+void BookmarkDialog::textChanged(const QString &string)
 {
     ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!string.isEmpty());
 }
@@ -209,9 +208,12 @@ void BookmarkDialog::selectBookmarkFolder(const QString &folderName)
     QList<QStandardItem*> list = model->findItems(folderName,
         Qt::MatchCaseSensitive | Qt::MatchRecursive, 0);
     if (!list.isEmpty()) {
-        QModelIndex index = model->indexFromItem(list.at(0));
-        ui.treeView->selectionModel()->setCurrentIndex(
-            proxyModel->mapFromSource(index), QItemSelectionModel::ClearAndSelect);
+        const QModelIndex &index = model->indexFromItem(list.at(0));
+        QItemSelectionModel *model = ui.treeView->selectionModel();
+        if (model) {
+            model->setCurrentIndex(proxyModel->mapFromSource(index),
+                QItemSelectionModel::ClearAndSelect);
+        }
     }
 }
 
@@ -226,13 +228,13 @@ void BookmarkDialog::customContextMenuRequested(const QPoint &point)
     QAction *removeItem = menu.addAction(tr("Delete Folder"));
     QAction *renameItem = menu.addAction(tr("Rename Folder"));
 
-    QAction *picked_action = menu.exec(ui.treeView->mapToGlobal(point));
-    if (!picked_action)
+    QAction *picked = menu.exec(ui.treeView->mapToGlobal(point));
+    if (!picked)
         return;
 
-    if (picked_action == removeItem) {
-        bookmarkManager->removeBookmarkItem(ui.treeView,
-            proxyModel->mapToSource(index));
+    const QModelIndex &proxyIndex = proxyModel->mapToSource(index);
+    if (picked == removeItem) {
+        bookmarkManager->removeBookmarkItem(ui.treeView, proxyIndex);
         ui.bookmarkFolders->clear();
         ui.bookmarkFolders->addItems(bookmarkManager->bookmarkFolders());
 
@@ -242,10 +244,9 @@ void BookmarkDialog::customContextMenuRequested(const QPoint &point)
             name = index.data().toString();
         ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
     }
-    else if (picked_action == renameItem) {
-        QStandardItem *item = bookmarkManager->treeBookmarkModel()->
-            itemFromIndex(proxyModel->mapToSource(index));
-        if (item) {
+    else if (picked == renameItem) {
+        BookmarkModel *model = bookmarkManager->treeBookmarkModel();
+        if (QStandardItem *item = model->itemFromIndex(proxyIndex)) {
             item->setEditable(true);
             ui.treeView->edit(index);
             item->setEditable(false);
@@ -253,19 +254,12 @@ void BookmarkDialog::customContextMenuRequested(const QPoint &point)
     }
 }
 
-void BookmarkDialog::currentChanged(const QModelIndex& current,
-                                    const QModelIndex& previous)
+void BookmarkDialog::currentChanged(const QModelIndex &current)
 {
-    Q_UNUSED(previous)
-
-    if (!current.isValid()) {
-        ui.bookmarkFolders->setCurrentIndex(
-            ui.bookmarkFolders->findText(tr("Bookmarks")));
-        return;
-    }
-
-    ui.bookmarkFolders->setCurrentIndex(
-        ui.bookmarkFolders->findText(current.data().toString()));
+    QString text = tr("Bookmarks");
+    if (current.isValid())
+        text = current.data().toString();
+    ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(text));
 }
 
 bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
@@ -276,7 +270,7 @@ bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
         QModelIndex index = ui.treeView->currentIndex();
         switch (ke->key()) {
             case Qt::Key_F2: {
-                const QModelIndex& source = proxyModel->mapToSource(index);
+                const QModelIndex &source = proxyModel->mapToSource(index);
                 QStandardItem *item =
                     bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
                 if (item) {
@@ -307,10 +301,11 @@ bool BookmarkDialog::eventFilter(QObject *object, QEvent *e)
 }
 
 
+// #pragma mark -- BookmarkWidget
 
 
 BookmarkWidget::BookmarkWidget(BookmarkManager *manager, QWidget *parent,
-                               bool showButtons)
+        bool showButtons)
     : QWidget(parent)
     , addButton(0)
     , removeButton(0)
@@ -326,7 +321,7 @@ BookmarkWidget::~BookmarkWidget()
 
 void BookmarkWidget::removeClicked()
 {
-    const QModelIndex& index = treeView->currentIndex();
+    const QModelIndex &index = treeView->currentIndex();
     if (searchField->text().isEmpty()) {
         bookmarkManager->removeBookmarkItem(treeView,
             filterBookmarkModel->mapToSource(index));
@@ -360,10 +355,11 @@ void BookmarkWidget::filterChanged()
         expandItems();
 }
 
-void BookmarkWidget::expand(const QModelIndex& index)
+void BookmarkWidget::expand(const QModelIndex &index)
 {
-    const QModelIndex& source = filterBookmarkModel->mapToSource(index);
-    QStandardItem *item = bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
+    const QModelIndex &source = filterBookmarkModel->mapToSource(index);
+    QStandardItem *item =
+        bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
     if (item)
         item->setData(treeView->isExpanded(index), Qt::UserRole + 11);
 }
@@ -404,22 +400,22 @@ void BookmarkWidget::customContextMenuRequested(const QPoint &point)
         }
     }
 
-    QAction *picked_action = menu.exec(treeView->mapToGlobal(point));
-    if (!picked_action)
+    QAction *pickedAction = menu.exec(treeView->mapToGlobal(point));
+    if (!pickedAction)
         return;
 
-    if (picked_action == showItem) {
+    if (pickedAction == showItem) {
         emit requestShowLink(data);
     }
-    else if (picked_action == showItemNewTab) {
+    else if (pickedAction == showItemNewTab) {
         CentralWidget::instance()->setSourceInNewTab(data);
     }
-    else if (picked_action == removeItem) {
+    else if (pickedAction == removeItem) {
         bookmarkManager->removeBookmarkItem(treeView,
             filterBookmarkModel->mapToSource(index));
     }
-    else if (picked_action == renameItem) {
-        const QModelIndex& source = filterBookmarkModel->mapToSource(index);
+    else if (pickedAction == renameItem) {
+        const QModelIndex &source = filterBookmarkModel->mapToSource(index);
         QStandardItem *item =
             bookmarkManager->treeBookmarkModel()->itemFromIndex(source);
         if (item) {
@@ -443,7 +439,7 @@ void BookmarkWidget::setup(bool showButtons)
 
     searchField = new QLineEdit(this);
     vlayout->addWidget(searchField);
-    connect(searchField, SIGNAL(textChanged(const QString &)), this,
+    connect(searchField, SIGNAL(textChanged(QString)), this,
         SLOT(filterChanged()));
 
     treeView = new TreeView(this);
@@ -490,17 +486,14 @@ void BookmarkWidget::setup(bool showButtons)
     treeView->viewport()->installEventFilter(this);
     treeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
-    connect(treeView, SIGNAL(expanded(const QModelIndex&)), this,
-        SLOT(expand(const QModelIndex&)));
-
-    connect(treeView, SIGNAL(collapsed(const QModelIndex&)), this,
-        SLOT(expand(const QModelIndex&)));
-
-    connect(treeView, SIGNAL(activated(const QModelIndex&)), this,
-        SLOT(activated(const QModelIndex&)));
-
-    connect(treeView, SIGNAL(customContextMenuRequested(const QPoint&)),
-        this, SLOT(customContextMenuRequested(const QPoint&)));
+    connect(treeView, SIGNAL(expanded(QModelIndex)), this,
+        SLOT(expand(QModelIndex)));
+    connect(treeView, SIGNAL(collapsed(QModelIndex)), this,
+        SLOT(expand(QModelIndex)));
+    connect(treeView, SIGNAL(activated(QModelIndex)), this,
+        SLOT(activated(QModelIndex)));
+    connect(treeView, SIGNAL(customContextMenuRequested(QPoint)),
+        this, SLOT(customContextMenuRequested(QPoint)));
 
     filterBookmarkModel->setFilterKeyColumn(0);
     filterBookmarkModel->setDynamicSortFilter(true);
@@ -514,8 +507,8 @@ void BookmarkWidget::expandItems()
     QStandardItemModel *model = bookmarkManager->treeBookmarkModel();
     QList<QStandardItem*>list = model->findItems(QLatin1String("*"),
         Qt::MatchWildcard | Qt::MatchRecursive, 0);
-    foreach (const QStandardItem* item, list) {
-        const QModelIndex& index = model->indexFromItem(item);
+    foreach (const QStandardItem *item, list) {
+        const QModelIndex &index = model->indexFromItem(item);
         treeView->setExpanded(filterBookmarkModel->mapFromSource(index),
             item->data(Qt::UserRole + 11).toBool());
     }
@@ -541,17 +534,17 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
         if (e->type() == QEvent::KeyPress) {
             QKeyEvent *ke = static_cast<QKeyEvent*>(e);
             if (index.isValid() && searchField->text().isEmpty()) {
+                const QModelIndex &src = filterBookmarkModel->mapToSource(index);
                 if (ke->key() == Qt::Key_F2) {
-                    QStandardItem *item =  bookmarkManager->treeBookmarkModel()
-                        ->itemFromIndex(filterBookmarkModel->mapToSource(index));
+                    QStandardItem *item =
+                        bookmarkManager->treeBookmarkModel()->itemFromIndex(src);
                     if (item) {
                         item->setEditable(true);
                         treeView->edit(index);
                         item->setEditable(false);
                     }
                 } else if (ke->key() == Qt::Key_Delete) {
-                    bookmarkManager->removeBookmarkItem(treeView,
-                        filterBookmarkModel->mapToSource(index));
+                    bookmarkManager->removeBookmarkItem(treeView, src);
                 }
             }
 
@@ -559,7 +552,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
                 default: break;
                 case Qt::Key_Up: {
                 case Qt::Key_Down:
-                    treeView->subclassKeyPressEvent(ke);    
+                    treeView->subclassKeyPressEvent(ke);
                 }   break;
 
                 case Qt::Key_Enter: {
@@ -593,9 +586,10 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e)
 }
 
 
+// #pragma mark -- BookmarkModel
 
 
-BookmarkModel::BookmarkModel(int rows, int columns, QObject * parent)
+BookmarkModel::BookmarkModel(int rows, int columns, QObject *parent)
     : QStandardItemModel(rows, columns, parent)
 {
 }
@@ -612,23 +606,23 @@ Qt::DropActions BookmarkModel::supportedDropActions() const
 Qt::ItemFlags BookmarkModel::flags(const QModelIndex &index) const
 {
     Qt::ItemFlags defaultFlags = QStandardItemModel::flags(index);
-    if (index.data(Qt::UserRole + 10).toString() == QLatin1String("Folder"))
+    if ((!index.isValid()) // can only happen for the invisible root item
+        || index.data(Qt::UserRole + 10).toString() == QLatin1String("Folder"))
         return (Qt::ItemIsDropEnabled | defaultFlags) &~ Qt::ItemIsDragEnabled;
 
     return (Qt::ItemIsDragEnabled | defaultFlags) &~ Qt::ItemIsDropEnabled;
 }
 
 
+// #pragma mark -- BookmarkManager
 
 
-BookmarkManager::BookmarkManager(QHelpEngineCore* _helpEngine)
+BookmarkManager::BookmarkManager(QHelpEngineCore *_helpEngine)
     : treeModel(new BookmarkModel(0, 1, this))
     , listModel(new BookmarkModel(0, 1, this))
     , helpEngine(_helpEngine)
 {
     folderIcon = QApplication::style()->standardIcon(QStyle::SP_DirClosedIcon);
-    treeModel->setHeaderData(0, Qt::Horizontal, QObject::tr("Bookmark"));
-    listModel->setHeaderData(0, Qt::Horizontal, QObject::tr("Bookmark"));
 
     connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
         SLOT(itemChanged(QStandardItem*)));
@@ -652,22 +646,10 @@ BookmarkModel* BookmarkManager::listBookmarkModel()
 
 void BookmarkManager::saveBookmarks()
 {
-    qint32 depth = 0;
     QByteArray bookmarks;
     QDataStream stream(&bookmarks, QIODevice::WriteOnly);
-    QStandardItem *root = treeModel->invisibleRootItem();
-
-    for (int i = 0; i < root->rowCount(); ++i) {
-        const QStandardItem *item = root->child(i);
-        stream << depth; // root
-        stream << item->data(Qt::DisplayRole).toString();
-        stream << item->data(Qt::UserRole + 10).toString();
-        stream << item->data(Qt::UserRole + 11).toBool();
 
-        if (item->rowCount() > 0) {
-            readBookmarksRecursive(item, stream, (depth +1));
-        }
-    }
+    readBookmarksRecursive(treeModel->invisibleRootItem(), stream, 0);
     helpEngine->setCustomValue(QLatin1String("Bookmarks"), bookmarks);
 }
 
@@ -687,7 +669,7 @@ QStringList BookmarkManager::bookmarkFolders() const
     return folders;
 }
 
-QModelIndex BookmarkManager::addNewFolder(const QModelIndex& index)
+QModelIndex BookmarkManager::addNewFolder(const QModelIndex &index)
 {
     QStandardItem *item = new QStandardItem(uniqueFolderName());
     item->setEditable(false);
@@ -703,16 +685,17 @@ QModelIndex BookmarkManager::addNewFolder(const QModelIndex& index)
     return treeModel->indexFromItem(item);
 }
 
-void BookmarkManager::removeBookmarkItem(QTreeView *treeView, const QModelIndex& index)
+void BookmarkManager::removeBookmarkItem(QTreeView *treeView,
+    const QModelIndex &index)
 {
     QStandardItem *item = treeModel->itemFromIndex(index);
     if (item) {
         QString data = index.data(Qt::UserRole + 10).toString();
         if (data == QLatin1String("Folder") && item->rowCount() > 0) {
             int value = QMessageBox::question(treeView, tr("Remove"),
-                        tr("You are going to delete a Folder, this will also<br>"
-                        "remove it's content. Are you sure to continue?"),
-                        QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
+                tr("You are going to delete a Folder, this will also<br>"
+                "remove it's content. Are you sure to continue?"),
+                QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
 
             if (value == QMessageBox::Cancel)
                 return;
@@ -733,28 +716,26 @@ void BookmarkManager::removeBookmarkItem(QTreeView *treeView, const QModelIndex&
     }
 }
 
-void BookmarkManager::showBookmarkDialog(QWidget* parent, const QString &name,
-                                         const QString &url)
+void BookmarkManager::showBookmarkDialog(QWidget *parent, const QString &name,
+    const QString &url)
 {
     BookmarkDialog dialog(this, name, url, parent);
     dialog.exec();
 }
 
-void BookmarkManager::addNewBookmark(const QModelIndex& index,
-                                     const QString &name, const QString &url)
+void BookmarkManager::addNewBookmark(const QModelIndex &index,
+    const QString &name, const QString &url)
 {
     QStandardItem *item = new QStandardItem(name);
     item->setEditable(false);
     item->setData(false, Qt::UserRole + 11);
     item->setData(url, Qt::UserRole + 10);
 
-    if (index.isValid()) {
+    if (index.isValid())
         treeModel->itemFromIndex(index)->appendRow(item);
-        listModel->appendRow(item->clone());
-    } else {
+    else
         treeModel->appendRow(item);
-        listModel->appendRow(item->clone());
-    }
+    listModel->appendRow(item->clone());
 }
 
 void BookmarkManager::itemChanged(QStandardItem *item)
@@ -785,7 +766,8 @@ void BookmarkManager::setupBookmarkModels()
     QList<int> lastDepths;
     QList<QStandardItem*> parents;
 
-    QByteArray ba = helpEngine->customValue(QLatin1String("Bookmarks")).toByteArray();
+    QByteArray ba =
+        helpEngine->customValue(QLatin1String("Bookmarks")).toByteArray();
     QDataStream stream(ba);
     while (!stream.atEnd()) {
         stream >> depth >> name >> type >> expanded;
@@ -855,8 +837,7 @@ void BookmarkManager::removeBookmarkFolderItems(QStandardItem *item)
 }
 
 void BookmarkManager::readBookmarksRecursive(const QStandardItem *item,
-                                             QDataStream &stream,
-                                             const qint32 depth) const
+    QDataStream &stream, const qint32 depth) const
 {
     for (int j = 0; j < item->rowCount(); ++j) {
         const QStandardItem *child = item->child(j);
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.h b/tools/assistant/tools/assistant/bookmarkmanager.h
index 29da5f3..bf7af41 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.h
+++ b/tools/assistant/tools/assistant/bookmarkmanager.h
@@ -74,7 +74,7 @@ class BookmarkDialog : public QDialog
     Q_OBJECT
 
 public:
-    BookmarkDialog(BookmarkManager *manager, const QString &title, 
+    BookmarkDialog(BookmarkManager *manager, const QString &title,
         const QString &url, QWidget *parent = 0);
     ~BookmarkDialog();
 
@@ -86,8 +86,8 @@ private slots:
     void textChanged(const QString& string);
     void selectBookmarkFolder(const QString &folderName);
     void customContextMenuRequested(const QPoint &point);
-    void currentChanged(const QModelIndex& current, const QModelIndex& previous);
-    
+    void currentChanged(const QModelIndex& current);
+
 private:
     bool eventFilter(QObject *object, QEvent *e);
 
@@ -177,14 +177,16 @@ public:
     QStringList bookmarkFolders() const;
     QModelIndex addNewFolder(const QModelIndex& index);
     void removeBookmarkItem(QTreeView *treeView, const QModelIndex& index);
-    void showBookmarkDialog(QWidget* parent, const QString &name, const QString &url);
-    void addNewBookmark(const QModelIndex& index, const QString &name, const QString &url);
+    void showBookmarkDialog(QWidget* parent, const QString &name,
+        const QString &url);
+    void addNewBookmark(const QModelIndex& index, const QString &name,
+        const QString &url);
     void setupBookmarkModels();
 
 private slots:
     void itemChanged(QStandardItem *item);
 
-private:    
+private:
     QString uniqueFolderName() const;
     void removeBookmarkFolderItems(QStandardItem *item);
     void readBookmarksRecursive(const QStandardItem *item, QDataStream &stream,
@@ -193,7 +195,7 @@ private:
 private:
     QString oldText;
     QIcon folderIcon;
-    
+
     BookmarkModel *treeModel;
     BookmarkModel *listModel;
     QStandardItem *renameItem;
diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index e6208a6..9f4d7d8 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -42,6 +42,7 @@ HEADERS += ../lib/qhelpcollectionhandler_p.h \
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
index 8572123..4b836e6 100644
--- a/tools/assistant/translations/translations.pro
+++ b/tools/assistant/translations/translations.pro
@@ -43,6 +43,7 @@ HEADERS += ../tools/assistant/aboutdialog.h \
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro
index e3edca4..c6f3e81 100644
--- a/tools/assistant/translations/translations_adp.pro
+++ b/tools/assistant/translations/translations_adp.pro
@@ -34,6 +34,7 @@ HEADERS += ../compat/helpwindow.h \
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index dcc955b..e8fb282 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3087,7 +3087,6 @@ void Configure::buildHostTools()
         << "src/tools/moc"
         << "src/tools/rcc"
         << "src/tools/uic"
-        << "tools/linguist/lrelease"
         << "tools/checksdk";
 
     if (dictionary[ "CETEST" ] == "yes")
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index 234b0b1..890b252 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -101,6 +101,7 @@ RESOURCES += linguist.qrc
 
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \
              $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \
diff --git a/tools/linguist/phrasebooks/russian.qph b/tools/linguist/phrasebooks/russian.qph
index 0b06cea..629c60b 100644
--- a/tools/linguist/phrasebooks/russian.qph
+++ b/tools/linguist/phrasebooks/russian.qph
@@ -1,4 +1,5 @@
-<!DOCTYPE QPH><QPH language="ru">
+<!DOCTYPE QPH>
+<QPH language="ru">
 <phrase>
     <source>About</source>
     <target>О программе</target>
@@ -68,10 +69,6 @@
     <target>авто-прокрутка</target>
 </phrase>
 <phrase>
-    <source>Back</source>
-    <target>Назад</target>
-</phrase>
-<phrase>
     <source>boxed edit</source>
     <target>окно редактирования</target>
 </phrase>
@@ -117,11 +114,11 @@
 </phrase>
 <phrase>
     <source>Close button</source>
-    <target>кнопка закрытия</target>
+    <target>Кнопка закрытия</target>
 </phrase>
 <phrase>
     <source>collapse</source>
-    <target>крах</target>
+    <target>свернуть</target>
 </phrase>
 <phrase>
     <source>column heading</source>
@@ -257,7 +254,7 @@
 </phrase>
 <phrase>
     <source>expand</source>
-    <target>расширять</target>
+    <target>развернуть</target>
 </phrase>
 <phrase>
     <source>Explore</source>
@@ -285,15 +282,15 @@
 </phrase>
 <phrase>
     <source>Find Next</source>
-    <target>Продолжить поиск</target>
+    <target>Найти далее</target>
 </phrase>
 <phrase>
     <source>Find What</source>
-    <target>Поиск</target>
+    <target>Искать</target>
 </phrase>
 <phrase>
     <source>folder</source>
-    <target>каталог</target>
+    <target>папка</target>
 </phrase>
 <phrase>
     <source>font</source>
@@ -385,7 +382,7 @@
 </phrase>
 <phrase>
     <source>landscape</source>
-    <target>альбом</target>
+    <target>альбомная</target>
 </phrase>
 <phrase>
     <source>link</source>
@@ -513,7 +510,7 @@
 </phrase>
 <phrase>
     <source>OK</source>
-    <target>OK</target>
+    <target>Готово</target>
 </phrase>
 <phrase>
     <source>OLE</source>
@@ -525,7 +522,7 @@
 </phrase>
 <phrase>
     <source>OLE embedded object</source>
-    <target>внедренный OLE-объект</target>
+    <target>внедрённый OLE-объект</target>
 </phrase>
 <phrase>
     <source>OLE linked object</source>
@@ -533,7 +530,7 @@
 </phrase>
 <phrase>
     <source>OLE nondefault drag and drop</source>
-    <target>предопределенный OLE-механизм</target>
+    <target>предопределённый OLE-механизм</target>
 </phrase>
 <phrase>
     <source>Open</source>
@@ -557,7 +554,7 @@
 </phrase>
 <phrase>
     <source>Page Setup</source>
-    <target>шаг установки</target>
+    <target>Параметры страницы</target>
 </phrase>
 <phrase>
     <source>palette window</source>
@@ -625,11 +622,11 @@
 </phrase>
 <phrase>
     <source>portrait</source>
-    <target>портрет</target>
+    <target>книжная</target>
 </phrase>
 <phrase>
     <source>press</source>
-    <target>нажимать</target>
+    <target>нажать</target>
 </phrase>
 <phrase>
     <source>primary container</source>
@@ -757,7 +754,7 @@
 </phrase>
 <phrase>
     <source>secondary window</source>
-    <target>подчиненное окно</target>
+    <target>подчинённое окно</target>
 </phrase>
 <phrase>
     <source>select</source>
@@ -765,7 +762,7 @@
 </phrase>
 <phrase>
     <source>Select All</source>
-    <target>Выделить все</target>
+    <target>Выделить всё</target>
 </phrase>
 <phrase>
     <source>selection</source>
@@ -861,11 +858,11 @@
 </phrase>
 <phrase>
     <source>status bar</source>
-    <target>статусная строка</target>
+    <target>строка состояния</target>
 </phrase>
 <phrase>
     <source>Stop</source>
-    <target>Стоп</target>
+    <target>Остановить</target>
 </phrase>
 <phrase>
     <source>tab control</source>
@@ -897,7 +894,7 @@
 </phrase>
 <phrase>
     <source>toggle key</source>
-    <target>кнопка-выключатель</target>
+    <target>кнопка-переключатель</target>
 </phrase>
 <phrase>
     <source>toolbar</source>
@@ -979,4 +976,88 @@
     <source>Yes</source>
     <target>Да</target>
 </phrase>
+<phrase>
+    <source>No</source>
+    <target>Нет</target>
+</phrase>
+<phrase>
+    <source>Options</source>
+    <target>Параметры</target>
+</phrase>
+<phrase>
+    <source>directory</source>
+    <target>каталог</target>
+</phrase>
+<phrase>
+    <source>Finish</source>
+    <target>Завершить</target>
+</phrase>
+<phrase>
+    <source>Continue</source>
+    <target>Продолжить</target>
+</phrase>
+<phrase>
+    <source>advanced</source>
+    <target>расширенный</target>
+</phrase>
+<phrase>
+    <source>layout</source>
+    <target>компоновка</target>
+</phrase>
+<phrase>
+    <source>layout</source>
+    <target>компоновщик</target>
+</phrase>
+<phrase>
+    <source>plugin</source>
+    <target>модуль</target>
+</phrase>
+<phrase>
+    <source>script</source>
+    <target>сценарий</target>
+</phrase>
+<phrase>
+    <source>spacer</source>
+    <target>разделитель</target>
+</phrase>
+<phrase>
+    <source>tabbar</source>
+    <target>панель вкладок</target>
+</phrase>
+<phrase>
+    <source>whitespace</source>
+    <target>символ пробела</target>
+</phrase>
+<phrase>
+    <source>Forward</source>
+    <target>Вперёд</target>
+</phrase>
+<phrase>
+    <source>Back</source>
+    <target>Назад</target>
+</phrase>
+<phrase>
+    <source>Search wrapped</source>
+    <target>Поиск с начала</target>
+</phrase>
+<phrase>
+    <source>OK</source>
+    <target>Выбрать</target>
+</phrase>
+<phrase>
+    <source>OK</source>
+    <target>Закрыть</target>
+</phrase>
+<phrase>
+    <source>Match case</source>
+    <target>С учётом регистра</target>
+</phrase>
+<phrase>
+    <source>Case Sensitive</source>
+    <target>Регистрозависимо</target>
+</phrase>
+<phrase>
+    <source>Whole words</source>
+    <target>Слова полностью</target>
+</phrase>
 </QPH>
diff --git a/tools/porting/src/qt3headers0.resource b/tools/porting/src/qt3headers0.resource
index 13be468..8e24385 100644
--- a/tools/porting/src/qt3headers0.resource
+++ b/tools/porting/src/qt3headers0.resource
diff --git a/tools/porting/src/qt3headers1.resource b/tools/porting/src/qt3headers1.resource
index e06d270..8da4b9a 100644
--- a/tools/porting/src/qt3headers1.resource
+++ b/tools/porting/src/qt3headers1.resource
diff --git a/tools/porting/src/qt3headers2.resource b/tools/porting/src/qt3headers2.resource
index e44c81d..62bdb8e 100644
--- a/tools/porting/src/qt3headers2.resource
+++ b/tools/porting/src/qt3headers2.resource
diff --git a/tools/porting/src/qt3headers3.resource b/tools/porting/src/qt3headers3.resource
index 6d259f2..6a096e8 100644
--- a/tools/porting/src/qt3headers3.resource
+++ b/tools/porting/src/qt3headers3.resource