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

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

14 files changed, 203 insertions, 73 deletions

diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp
index 9faafe0..2a41d04 100644
--- a/tools/assistant/lib/qhelpsearchengine.cpp
+++ b/tools/assistant/lib/qhelpsearchengine.cpp
@@ -84,18 +84,17 @@ private:
         , resultWidget(0)
         , helpEngine(helpEngine)
     {
-        hitList.clear();
         indexReader = 0;
         indexWriter = 0;
     }
 
     ~QHelpSearchEnginePrivate()
     {
-        hitList.clear();
         delete indexReader;
         delete indexWriter;
     }
 
+
     int hitsCount() const
     {
         int count = 0;
@@ -107,12 +106,9 @@ private:
 
     QList<QHelpSearchEngine::SearchHit> hits(int start, int end) const
     {
-        QList<QHelpSearchEngine::SearchHit> returnValue;
-        if (indexReader) {
-            for (int i = start; i < end && i < hitsCount(); ++i)
-                returnValue.append(indexReader->hit(i));
-        }
-        return returnValue;
+        return indexReader ?
+                indexReader->hits(start, end) :
+                QList<QHelpSearchEngine::SearchHit>();
     }
 
     void updateIndex(bool reindex = false)
@@ -131,11 +127,9 @@ private:
             connect(indexWriter, SIGNAL(indexingFinished()), this, SLOT(optimizeIndex()));
         }
 
-        if (indexWriter) {
-            indexWriter->cancelIndexing();
-            indexWriter->updateIndex(helpEngine->collectionFile(),
-                indexFilesFolder(), reindex);
-        }
+        indexWriter->cancelIndexing();
+        indexWriter->updateIndex(helpEngine->collectionFile(),
+                                 indexFilesFolder(), reindex);
     }
 
     void cancelIndexing()
@@ -159,11 +153,9 @@ private:
             connect(indexReader, SIGNAL(searchingFinished(int)), this, SIGNAL(searchingFinished(int)));
         }
 
-        if (indexReader) {
-            m_queryList = queryList;
-            indexReader->cancelSearching();
-            indexReader->search(helpEngine->collectionFile(), indexFilesFolder(), queryList);
-        }
+        m_queryList = queryList;
+        indexReader->cancelSearching();
+        indexReader->search(helpEngine->collectionFile(), indexFilesFolder(), queryList);
     }
 
     void cancelSearching()
@@ -204,7 +196,6 @@ private:
     QHelpSearchIndexWriter *indexWriter;
 
     QPointer<QHelpEngineCore> helpEngine;
-    QList<QHelpSearchEngine::SearchHit> hitList;
 
     QList<QHelpSearchQuery> m_queryList;
 };
diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
index 227e558..89d6040 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
@@ -70,7 +70,6 @@ QHelpSearchIndexReader::~QHelpSearchIndexReader()
 {
     mutex.lock();
     this->m_cancel = true;
-    waitCondition.wakeOne();
     mutex.unlock();
 
     wait();
@@ -86,8 +85,8 @@ void QHelpSearchIndexReader::cancelSearching()
 void QHelpSearchIndexReader::search(const QString &collectionFile, const QString &indexFilesFolder,
     const QList<QHelpSearchQuery> &queryList)
 {
-    QMutexLocker lock(&mutex);
-
+    wait();
+    
     this->hitList.clear();
     this->m_cancel = false;
     this->m_query = queryList;
@@ -99,12 +98,18 @@ void QHelpSearchIndexReader::search(const QString &collectionFile, const QString
 
 int QHelpSearchIndexReader::hitsCount() const
 {
+    QMutexLocker lock(&mutex);
     return hitList.count();
 }
 
-QHelpSearchEngine::SearchHit QHelpSearchIndexReader::hit(int index) const
+QList<QHelpSearchEngine::SearchHit> QHelpSearchIndexReader::hits(int start,
+                                                                 int end) const
 {
-    return hitList.at(index);
+    QList<QHelpSearchEngine::SearchHit> hits;
+    QMutexLocker lock(&mutex);
+    for (int i = start; i < end && i < hitList.count(); ++i)
+        hits.append(hitList.at(i));
+    return hits;
 }
 
 void QHelpSearchIndexReader::run()
@@ -135,7 +140,7 @@ void QHelpSearchIndexReader::run()
     if(QCLuceneIndexReader::indexExists(indexPath)) {
         mutex.lock();
         if (m_cancel) {
-            mutex.unlock();
+            mutex.unlock();          
             return;
         }
         mutex.unlock();
@@ -213,7 +218,9 @@ void QHelpSearchIndexReader::run()
 
 #if !defined(QT_NO_EXCEPTIONS)
         } catch(...) {
+            mutex.lock();
             hitList.clear();
+            mutex.unlock();
             emit searchingFinished(0);
         }
 #endif
@@ -416,8 +423,9 @@ void QHelpSearchIndexReader::boostSearchHits(const QHelpEngineCore &engine,
             boostedList.append(it.value());
         } while (it != hitMap.constBegin());
         boostedList += hitList.mid(count, hitList.count());
-
+        mutex.lock();
         hitList = boostedList;
+        mutex.unlock();
     }
 }
 
diff --git a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
index 47af43f..8876d80 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
@@ -85,9 +85,8 @@ public:
     void search(const QString &collectionFile,
         const QString &indexFilesFolder,
         const QList<QHelpSearchQuery> &queryList);
-
     int hitsCount() const;
-    QHelpSearchEngine::SearchHit hit(int index) const;
+    QList<QHelpSearchEngine::SearchHit> hits(int start, int end) const;
 
 signals:
     void searchingStarted();
@@ -105,10 +104,8 @@ private:
         const QList<QHelpSearchQuery> &queryList);
 
 private:
-    QMutex mutex;
+    mutable QMutex mutex;
     QList<QHelpSearchEngine::SearchHit> hitList;
-    QWaitCondition waitCondition;
-
     bool m_cancel;
     QString m_collectionFile;
     QList<QHelpSearchQuery> m_query;
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
index b6e726b..c50f48d 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
@@ -639,7 +639,7 @@ void QHelpSearchIndexWriter::run()
 
     QFileInfo fInfo(indexPath);
     if (fInfo.exists() && !fInfo.isWritable()) {
-        qWarning("Full Text Search, could not create index (missing permissions).");
+        qWarning("Full Text Search, could not create index (missing permissions for '%s').", qPrintable(indexPath));
         return;
     }
 
@@ -720,7 +720,7 @@ void QHelpSearchIndexWriter::run()
         }
 #if !defined(QT_NO_EXCEPTIONS)
     } catch (...) {
-        qWarning("Full Text Search, could not create index writer.");
+        qWarning("Full Text Search, could not create index writer in '%s'.", qPrintable(indexPath));
         return;
     }
 #endif
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 3bca573..250262e 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -347,7 +347,7 @@ void BookmarkWidget::filterChanged()
 
     filterBookmarkModel->setFilterRegExp(regExp);
 
-    QModelIndex index = treeView->indexAt(QPoint(1, 1));
+    const QModelIndex &index = treeView->indexAt(QPoint(1, 1));
     if (index.isValid())
         treeView->setCurrentIndex(index);
 
@@ -445,9 +445,10 @@ void BookmarkWidget::setup(bool showButtons)
     treeView = new TreeView(this);
     vlayout->addWidget(treeView);
 
-    QString system = QLatin1String("win");
 #ifdef Q_OS_MAC
-    system = QLatin1String("mac");
+#   define SYSTEM "mac"
+#else
+#   define SYSTEM "win"
 #endif
 
     if (showButtons) {
@@ -458,8 +459,8 @@ void BookmarkWidget::setup(bool showButtons)
 
         addButton = new QToolButton(this);
         addButton->setText(tr("Add"));
-        addButton->setIcon(QIcon(QString::fromUtf8(
-            ":/trolltech/assistant/images/%1/addtab.png").arg(system)));
+        addButton->setIcon(QIcon(QLatin1String(":/trolltech/assistant/images/"
+            SYSTEM "/addtab.png")));
         addButton->setAutoRaise(true);
         addButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         hlayout->addWidget(addButton);
@@ -467,8 +468,8 @@ void BookmarkWidget::setup(bool showButtons)
 
         removeButton = new QToolButton(this);
         removeButton->setText(tr("Remove"));
-        removeButton->setIcon(QIcon(QString::fromUtf8(
-            ":/trolltech/assistant/images/%1/closetab.png").arg(system)));
+        removeButton->setIcon(QIcon(QLatin1String(":/trolltech/assistant/images/"
+            SYSTEM "/closetab.png")));
         removeButton->setAutoRaise(true);
         removeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
         hlayout->addWidget(removeButton);
@@ -626,6 +627,10 @@ BookmarkManager::BookmarkManager(QHelpEngineCore *_helpEngine)
 
     connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
         SLOT(itemChanged(QStandardItem*)));
+    connect(treeModel, SIGNAL(itemChanged(QStandardItem*)), this,
+        SIGNAL(bookmarksChanged()));
+    connect(treeModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
+        this, SIGNAL(bookmarksChanged()));
 }
 
 BookmarkManager::~BookmarkManager()
@@ -736,6 +741,41 @@ void BookmarkManager::addNewBookmark(const QModelIndex &index,
     else
         treeModel->appendRow(item);
     listModel->appendRow(item->clone());
+    emit bookmarksChanged();
+}
+
+void BookmarkManager::fillBookmarkMenu(QMenu *menu)
+{
+    if (!menu || !treeModel)
+        return;
+
+    map.clear();
+    fillBookmarkMenu(menu, treeModel->invisibleRootItem());
+}
+
+void BookmarkManager::fillBookmarkMenu(QMenu *menu, QStandardItem *root)
+{
+    for (int i = 0; i < root->rowCount(); ++i) {
+        QStandardItem *item = root->child(i);
+        if (item && item->data(Qt::UserRole + 10)
+            .toString() == QLatin1String("Folder")) {
+                QMenu* newMenu = menu->addMenu(folderIcon, item->text());
+                if (item->rowCount() > 0)
+                    fillBookmarkMenu(newMenu, item);
+        } else {
+            map.insert(menu->addAction(item->text()), item->index());
+        }
+    }
+}
+
+QUrl BookmarkManager::urlForAction(QAction* action) const
+{
+    if (map.contains(action)) {
+        const QModelIndex &index = map.value(action);
+        if (QStandardItem* item = treeModel->itemFromIndex(index))
+            return QUrl(item->data(Qt::UserRole + 10).toString());
+    }
+    return QUrl();
 }
 
 void BookmarkManager::itemChanged(QStandardItem *item)
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.h b/tools/assistant/tools/assistant/bookmarkmanager.h
index bf7af41..33db5b6 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.h
+++ b/tools/assistant/tools/assistant/bookmarkmanager.h
@@ -183,6 +183,12 @@ public:
         const QString &url);
     void setupBookmarkModels();
 
+    void fillBookmarkMenu(QMenu *menu);
+    QUrl urlForAction(QAction* action) const;
+
+signals:
+    void bookmarksChanged();
+
 private slots:
     void itemChanged(QStandardItem *item);
 
@@ -191,6 +197,7 @@ private:
     void removeBookmarkFolderItems(QStandardItem *item);
     void readBookmarksRecursive(const QStandardItem *item, QDataStream &stream,
         const qint32 depth) const;
+    void fillBookmarkMenu(QMenu *menu, QStandardItem *root);
 
 private:
     QString oldText;
@@ -200,6 +207,7 @@ private:
     BookmarkModel *listModel;
     QStandardItem *renameItem;
     QHelpEngineCore *helpEngine;
+    QMap<QAction*, QModelIndex> map;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 385f0bb..a384544 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -286,6 +286,10 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
 
 CentralWidget::~CentralWidget()
 {
+#ifndef QT_NO_PRINTER
+    delete printer;
+#endif
+
     QHelpEngineCore engine(collectionFile, 0);
     if (!engine.setupData())
         return;
@@ -357,10 +361,10 @@ void CentralWidget::findNext()
 
 void CentralWidget::nextPage()
 {
-    if(tabWidget->currentIndex() < tabWidget->count() -1)
-        tabWidget->setCurrentIndex(tabWidget->currentIndex() +1);
-    else
-        tabWidget->setCurrentIndex(0);
+    int index = tabWidget->currentIndex() + 1;
+    if (index >= tabWidget->count())
+        index = 0;
+    tabWidget->setCurrentIndex(index);
 }
 
 void CentralWidget::resetZoom()
@@ -376,10 +380,9 @@ void CentralWidget::resetZoom()
 void CentralWidget::previousPage()
 {
     int index = tabWidget->currentIndex() -1;
-    if(index >= 0)
-        tabWidget->setCurrentIndex(index);
-    else
-        tabWidget->setCurrentIndex(tabWidget->count() -1);
+    if (index < 0)
+        index = tabWidget->count() -1;
+    tabWidget->setCurrentIndex(index);
 }
 
 void CentralWidget::findPrevious()
@@ -400,7 +403,8 @@ void CentralWidget::closeTab()
 void CentralWidget::setSource(const QUrl &url)
 {
     HelpViewer *viewer = currentHelpViewer();
-    HelpViewer *lastViewer = qobject_cast<HelpViewer*>(tabWidget->widget(lastTabPage));
+    HelpViewer *lastViewer =
+        qobject_cast<HelpViewer*>(tabWidget->widget(lastTabPage));
 
     if (!viewer && !lastViewer) {
         viewer = new HelpViewer(helpEngine, this);
@@ -427,8 +431,11 @@ void CentralWidget::setLastShownPages()
         QString::SkipEmptyParts);
 
     const int pageCount = lastShownPageList.count();
-    if (pageCount == 0 && usesDefaultCollection) {
-        setSource(QUrl(QLatin1String("help")));
+    if (pageCount == 0) {
+        if (usesDefaultCollection)
+            setSource(QUrl(QLatin1String("help")));
+        else
+            setSource(QUrl(QLatin1String("about:blank")));
         return;
     }
 
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 5b3e731..0340297 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -137,7 +137,14 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
     if (initHelpDB()) {
         setupFilterToolbar();
         setupAddressToolbar();
+
         m_bookmarkManager->setupBookmarkModels();
+        m_bookmarkMenu->addSeparator();
+        m_bookmarkManager->fillBookmarkMenu(m_bookmarkMenu);
+        connect(m_bookmarkMenu, SIGNAL(triggered(QAction*)), this,
+            SLOT(showBookmark(QAction*)));
+        connect(m_bookmarkManager, SIGNAL(bookmarksChanged()), this,
+            SLOT(updateBookmarkMenu()));
 
         setWindowTitle(m_helpEngine->customValue(QLatin1String("WindowTitle"),
             defWindowTitle).toString());
@@ -370,6 +377,29 @@ void MainWindow::checkInitState()
     }
 }
 
+void MainWindow::updateBookmarkMenu()
+{
+    if (m_bookmarkManager) {
+        m_bookmarkMenu->removeAction(m_bookmarkMenuAction);
+        
+        m_bookmarkMenu->clear();
+        
+        m_bookmarkMenu->addAction(m_bookmarkMenuAction);
+        m_bookmarkMenu->addSeparator();
+        
+        m_bookmarkManager->fillBookmarkMenu(m_bookmarkMenu);
+    }
+}
+
+void MainWindow::showBookmark(QAction *action)
+{
+    if (m_bookmarkManager) {
+        const QUrl &url = m_bookmarkManager->urlForAction(action);
+        if (url.isValid())
+            m_centralWidget->setSource(url);
+    }
+}
+
 void MainWindow::insertLastPages()
 {
     if (m_cmdLine->url().isValid())
@@ -495,9 +525,10 @@ void MainWindow::setupActions()
     tmp->setShortcuts(QList<QKeySequence>() << QKeySequence(tr("Ctrl+Alt+Left"))
         << QKeySequence(Qt::CTRL + Qt::Key_PageUp));
 
-    menu = menuBar()->addMenu(tr("&Bookmarks"));
-    tmp = menu->addAction(tr("Add Bookmark..."), this, SLOT(addBookmark()));
-    tmp->setShortcut(tr("CTRL+D"));
+    m_bookmarkMenu = menuBar()->addMenu(tr("&Bookmarks"));
+    m_bookmarkMenuAction = m_bookmarkMenu->addAction(tr("Add Bookmark..."),
+        this, SLOT(addBookmark()));
+    m_bookmarkMenuAction->setShortcut(tr("CTRL+D"));
 
     menu = menuBar()->addMenu(tr("&Help"));
     m_aboutAction = menu->addAction(tr("About..."), this, SLOT(showAboutDialog()));
diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h
index 9ab3185..f7df724 100644
--- a/tools/assistant/tools/assistant/mainwindow.h
+++ b/tools/assistant/tools/assistant/mainwindow.h
@@ -119,6 +119,9 @@ private slots:
     void qtDocumentationInstalled(bool newDocsInstalled);
     void checkInitState();
 
+    void updateBookmarkMenu();
+    void showBookmark(QAction *action);
+
 private:
     bool initHelpDB();
     void setupActions();
@@ -157,6 +160,8 @@ private:
 
     QMenu *m_viewMenu;
     QMenu *m_toolBarMenu;
+    QMenu *m_bookmarkMenu;
+    QAction *m_bookmarkMenuAction;
 
     CmdLineParser *m_cmdLine;
 
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 2aec504..5586e3b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -917,6 +917,11 @@ void Configure::parseCmdLine()
             if(i==argCount)
                 break;
             qmakeDefines += "QT_NAMESPACE="+configCmdLine.at(i);
+        } else if( configCmdLine.at(i) == "-qtlibinfix" ) {
+            ++i;
+            if(i==argCount)
+                break;
+            dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i);
         } else if( configCmdLine.at(i) == "-D" ) {
             ++i;
             if (i==argCount)
@@ -1521,8 +1526,8 @@ bool Configure::displayHelp()
                     "[-no-mmx] [-3dnow] [-no-3dnow] [-sse] [-no-sse] [-sse2] [-no-sse2]\n"
                     "[-no-iwmmxt] [-iwmmxt] [-direct3d] [-openssl] [-openssl-linked]\n"
                     "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n"
-                    "[-qtnamespace <namespace>] [-no-phonon] [-phonon]\n"
-                    "[-no-phonon-backend] [-phonon-backend]\n"
+                    "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
+                    "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
                     "[-no-webkit] [-webkit]\n"
                     "[-no-scripttools] [-scripttools]\n"
                     "[-graphicssystem raster|opengl]\n\n", 0, 7);
@@ -1613,7 +1618,8 @@ bool Configure::displayHelp()
         desc(                   "",                     "See the README file for a list of supported operating systems and compilers.\n", false, ' ');
 
 #if !defined(EVAL)
-        desc(                   "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}\n");
+        desc(                   "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}");
+        desc(                   "-qtlibinfix <infix>",  "Renames all Qt* libs to Qt*<infix>\n");
         desc(                   "-D <define>",          "Add an explicit define to the preprocessor.");
         desc(                   "-I <includepath>",     "Add an explicit include path.");
         desc(                   "-L <librarypath>",     "Add an explicit library path.");
@@ -1622,7 +1628,7 @@ bool Configure::displayHelp()
         desc(                   "-graphicssystem <sys>",   "Specify which graphicssystem should be used.\n"
                                 "Available values for <sys>:");
         desc("GRAPHICS_SYSTEM", "raster", "", "  raster - Software rasterizer", ' ');
-        desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL accelleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL acceleration, experimental!", ' ');
 
 
         desc(                   "-help, -h, -?",        "Display this information.\n");
@@ -2687,12 +2693,14 @@ void Configure::generateCachefile()
             configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl;
 
         if(!dictionary["QMAKE_RPATHDIR"].isEmpty())
-            configStream<<"QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"] <<endl;
+            configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl;
 
-		if(!dictionary["ARM_FPU_TYPE"].isEmpty())
-		{
-			configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
-		}
+        if (!dictionary["QT_LIBINFIX"].isEmpty())
+            configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
+
+        if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
+            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
+        }
 
         configStream.flush();
         configFile.close();
diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp
index 108ea1d..67fe651 100644
--- a/tools/linguist/linguist/messageeditor.cpp
+++ b/tools/linguist/linguist/messageeditor.cpp
@@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE
 // functionality is provided within Qt (see task 196275).
 static const char * language_strings[] =
 {
+    QT_TRANSLATE_NOOP("MessageEditor", "Russian"),
     QT_TRANSLATE_NOOP("MessageEditor", "German"),
     QT_TRANSLATE_NOOP("MessageEditor", "Japanese"),
     QT_TRANSLATE_NOOP("MessageEditor", "French"),
diff --git a/tools/linguist/phrasebooks/russian.qph b/tools/linguist/phrasebooks/russian.qph
index 629c60b..69af041 100644
--- a/tools/linguist/phrasebooks/russian.qph
+++ b/tools/linguist/phrasebooks/russian.qph
@@ -10,7 +10,7 @@
 </phrase>
 <phrase>
     <source>accessibility</source>
-    <target>удобство</target>
+    <target>специальные возможности</target>
 </phrase>
 <phrase>
     <source>action handle</source>
@@ -345,8 +345,8 @@
     <target>активная зона</target>
 </phrase>
 <phrase>
-    <source>icon</source>
-    <target>пиктограмма</target>
+    <source>Icon</source>
+    <target>Значок</target>
 </phrase>
 <phrase>
     <source>inactive</source>
@@ -402,7 +402,7 @@
 </phrase>
 <phrase>
     <source>list view</source>
-    <target>древовидный список</target>
+    <target>список</target>
 </phrase>
 <phrase>
     <source>manual link</source>
@@ -901,10 +901,6 @@
     <target>панель инструментов</target>
 </phrase>
 <phrase>
-    <source>tooltip</source>
-    <target>всплывающая подсказка</target>
-</phrase>
-<phrase>
     <source>tree view control</source>
     <target>древовидный список</target>
 </phrase>
@@ -1054,10 +1050,46 @@
 </phrase>
 <phrase>
     <source>Case Sensitive</source>
-    <target>Регистрозависимо</target>
+    <target>Учитывать регистр</target>
 </phrase>
 <phrase>
     <source>Whole words</source>
-    <target>Слова полностью</target>
+    <target>Слова целиком</target>
+</phrase>
+<phrase>
+    <source>Find Next</source>
+    <target>Найти следующее</target>
+</phrase>
+<phrase>
+    <source>Find Previous</source>
+    <target>Найти предыдущее</target>
+</phrase>
+<phrase>
+    <source>Case Sensitive</source>
+    <target>Учитывать регистр символов</target>
+</phrase>
+<phrase>
+    <source>Whole words only</source>
+    <target>Только слова целиком</target>
+</phrase>
+<phrase>
+    <source>Subwindow</source>
+    <target>Дочернее окно</target>
+</phrase>
+<phrase>
+    <source>Next</source>
+    <target>Далее</target>
+</phrase>
+<phrase>
+    <source>tree view</source>
+    <target>древовидный список</target>
+</phrase>
+<phrase>
+    <source>ToolTip</source>
+    <target>Подсказка</target>
+</phrase>
+<phrase>
+    <source>Checkable</source>
+    <target>Переключаемое</target>
 </phrase>
 </QPH>
diff --git a/tools/qtconfig/translations/translations.pro b/tools/qtconfig/translations/translations.pro
index fbbdb2bba2..1f9f572 100644
--- a/tools/qtconfig/translations/translations.pro
+++ b/tools/qtconfig/translations/translations.pro
@@ -8,6 +8,7 @@ HEADERS        += ../colorbutton.h ../previewframe.h ../previewwidget.h ../mainw
 FORMS        = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
 
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts
diff --git a/tools/qvfb/translations/translations.pro b/tools/qvfb/translations/translations.pro
index 736a72c..f667bb8 100644
--- a/tools/qvfb/translations/translations.pro
+++ b/tools/qvfb/translations/translations.pro
@@ -27,6 +27,7 @@ SOURCES =  ../qvfb.cpp \
            ../../shared/deviceskin/deviceskin.cpp
 
 TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qvfb_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_CN.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_TW.ts