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

Conflicts:
	configure.exe
	src/corelib/kernel/qmetaobject.cpp
	tools/qdoc3/generator.cpp
	tools/qdoc3/test/qt-cpp-ignore.qdocconf
	tools/qdoc3/test/qt-inc.qdocconf

51 files changed, 916 insertions, 257 deletions

diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp
index 8947a36..55b4ea7 100644
--- a/tools/assistant/lib/qhelpprojectdata.cpp
+++ b/tools/assistant/lib/qhelpprojectdata.cpp
@@ -41,6 +41,7 @@
 
 #include "qhelpprojectdata_p.h"
 
+#include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QStack>
 #include <QtCore/QMap>
@@ -73,6 +74,7 @@ private:
     void readKeywords();
     void readFiles();
     void raiseUnknownTokenError();
+    void addMatchingFiles(const QString &pattern);
 };
 
 void QHelpProjectDataPrivate::raiseUnknownTokenError()
@@ -161,7 +163,7 @@ void QHelpProjectDataPrivate::readFilterSection()
         readNext();
         if (isStartElement()) {
             if (name() == QLatin1String("filterAttribute"))
-                filterSectionList.last().addFilterAttribute(readElementText());				
+                filterSectionList.last().addFilterAttribute(readElementText());
             else if (name() == QLatin1String("toc"))
                 readTOC();
             else if (name() == QLatin1String("keywords"))
@@ -244,7 +246,7 @@ void QHelpProjectDataPrivate::readFiles()
         readNext();
         if (isStartElement()) {
             if (name() == QLatin1String("file"))
-                filterSectionList.last().addFile(readElementText());
+                addMatchingFiles(readElementText());
             else
                 raiseUnknownTokenError();
         } else if (isEndElement()) {
@@ -258,7 +260,21 @@ void QHelpProjectDataPrivate::readFiles()
     }
 }
 
-
+// Expand file pattern and add matches into list. If the pattern does not match
+// any files, insert the pattern itself so the QHelpGenerator will emit a
+// meaningful warning later.
+void QHelpProjectDataPrivate::addMatchingFiles(const QString &pattern)
+{
+    QFileInfo fileInfo(rootPath + '/' + pattern);
+    const QStringList &matches =
+            fileInfo.dir().entryList(QStringList(fileInfo.fileName()));
+    for (QStringList::ConstIterator it = matches.constBegin();
+         it != matches.constEnd();
+         ++it)
+        filterSectionList.last().addFile(QFileInfo(pattern).dir().path() + '/' + *it);
+    if (matches.empty())
+        filterSectionList.last().addFile(pattern);
+}
 
 /*!
     \internal
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 8860601..617ac4d 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 9a8b4bc..2a41b92 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1140,6 +1140,10 @@ void Configure::parseCmdLine()
 
     useUnixSeparators = (dictionary["QMAKESPEC"] == "win32-g++");
 
+    // Allow tests for private classes to be compiled against internal builds
+    if (dictionary["BUILDDEV"] == "yes")
+        qtConfig += "private_tests";
+
 
 #if !defined(EVAL)
     for( QStringList::Iterator dis = disabledModules.begin(); dis != disabledModules.end(); ++dis ) {
@@ -1526,7 +1530,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");
@@ -2004,7 +2008,6 @@ bool Configure::verifyConfiguration()
      no-gif gif
      dll staticlib
 
-     internal
      nocrosscompiler
      GNUmake
      largefile
diff --git a/tools/designer/data/generate_shared.xsl b/tools/designer/data/generate_shared.xsl
index f7859cd..ec95fe2 100644
--- a/tools/designer/data/generate_shared.xsl
+++ b/tools/designer/data/generate_shared.xsl
@@ -6,8 +6,8 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 <!-- Hack to make names camel case
-     All names in ui files are lowercase, while the element names are
-     capital case. To make the ui files conforming to the xsd file + keep
+     All names in UI files are lowercase, while the element names are
+     capital case. To make the UI files conforming to the XSD file + keep
      the DOM interface we rename them here -->
     <xsl:template name="camel-case">
         <xsl:param name="text"/>
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index de4b57b..ac03909 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -631,13 +631,13 @@ static bool readUiAttributes(QIODevice *dev, QString *errorMessage,
                     *language = attributes.value(languageAttribute).toString();
                 return true;
             } else {
-                *errorMessage = QCoreApplication::translate("Designer", "Invalid ui file: The root element <ui> is missing.");
+                *errorMessage = QCoreApplication::translate("Designer", "Invalid UI file: The root element <ui> is missing.");
                 return false;
 
             }
         }
     }
-    *errorMessage = QCoreApplication::translate("Designer", "An error has occurred while reading the ui file at line %1, column %2: %3")
+    *errorMessage = QCoreApplication::translate("Designer", "An error has occurred while reading the UI file at line %1, column %2: %3")
                     .arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString());
     return false;
 }
@@ -756,7 +756,7 @@ void QDesignerResource::setSaveRelative(bool relative)
 QWidget *QDesignerResource::create(DomUI *ui, QWidget *parentWidget)
 {
     // Load extra info extension. This is used by Jambi for preventing
-    // C++ ui files from being loaded
+    // C++ UI files from being loaded
     if (QDesignerExtraInfoExtension *extra = qt_extension<QDesignerExtraInfoExtension*>(core()->extensionManager(), core())) {
         if (!extra->loadUiExtraInfo(ui)) {
             const QString errorMessage = QApplication::translate("Designer", "This file cannot be read because the extra info extension failed to load.");
diff --git a/tools/designer/src/designer/mainwindow.cpp b/tools/designer/src/designer/mainwindow.cpp
index b72a790..a3ca234 100644
--- a/tools/designer/src/designer/mainwindow.cpp
+++ b/tools/designer/src/designer/mainwindow.cpp
@@ -155,7 +155,7 @@ DockedMdiArea::DockedMdiArea(const QString &extension, QWidget *parent) :
 
 QStringList DockedMdiArea::uiFiles(const QMimeData *d) const
 {
-    // Extract dropped ui files from Mime data.
+    // Extract dropped UI files from Mime data.
     QStringList rc;
     if (!d->hasFormat(QLatin1String(uriListMimeFormatC)))
         return rc;
diff --git a/tools/designer/src/designer/qdesigner_workbench.cpp b/tools/designer/src/designer/qdesigner_workbench.cpp
index 923687a2..04cd105 100644
--- a/tools/designer/src/designer/qdesigner_workbench.cpp
+++ b/tools/designer/src/designer/qdesigner_workbench.cpp
@@ -462,8 +462,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
     // make sure that the widgetbox is visible if it is different from neutral.
     QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow();
     Q_ASSERT(widgetBoxWrapper);
-    if (!widgetBoxWrapper->action()->isChecked())
-        widgetBoxWrapper->action()->trigger();
+    const bool needWidgetBoxWrapperVisible = widgetBoxWrapper->action()->isChecked();
 
     switchToNeutralMode();
     const QPoint desktopOffset = desktopGeometry().topLeft();
@@ -502,7 +501,7 @@ void QDesignerWorkbench::switchToTopLevelMode()
         found_visible_window |= tw->isVisible();
     }
 
-    if (!widgetBoxWrapper->action()->isChecked())
+    if (needWidgetBoxWrapperVisible)
         widgetBoxWrapper->action()->trigger();
 
     if (!m_toolWindows.isEmpty() && !found_visible_window)
@@ -960,7 +959,7 @@ QDesignerFormWindow * QDesignerWorkbench::loadForm(const QString &fileName,
         removeFormWindow(formWindow);
         formWindowManager->removeFormWindow(editor);
         m_core->metaDataBase()->remove(editor);
-        *errorMessage = tr("The file <b>%1</b> is not a valid Designer ui file.").arg(file.fileName());
+        *errorMessage = tr("The file <b>%1</b> is not a valid Designer UI file.").arg(file.fileName());
         return 0;
     }
     *uic3Converted = editor->fileName().isEmpty();
diff --git a/tools/designer/src/lib/sdk/abstractformwindow.cpp b/tools/designer/src/lib/sdk/abstractformwindow.cpp
index 89c1015..313b324 100644
--- a/tools/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/tools/designer/src/lib/sdk/abstractformwindow.cpp
@@ -247,7 +247,7 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
 /*!
     \fn virtual QString QDesignerFormWindowInterface::fileName() const
 
-    Returns the file name of the .ui file that describes the form
+    Returns the file name of the UI file that describes the form
     currently being shown.
 
     \sa setFileName()
@@ -399,11 +399,11 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
     \fn virtual QStringList QDesignerFormWindowInterface::includeHints() const
 
     Returns a list of the header files that will be included in the
-    form window's associated \c .ui file.
+    form window's associated UI file.
 
     Header files may be local, i.e. relative to the project's
-    directory,\c "mywidget.h", or global, i.e. part of Qt or the
-    compilers standard libraries:\c <QtGui/QWidget>.
+    directory, \c "mywidget.h", or global, i.e. part of Qt or the
+    compilers standard libraries: \c <QtGui/QWidget>.
 
     \sa setIncludeHints()
 */
@@ -412,11 +412,11 @@ QDesignerFormWindowInterface *QDesignerFormWindowInterface::findFormWindow(QObje
     \fn virtual void QDesignerFormWindowInterface::setIncludeHints(const QStringList &includeHints)
 
     Sets the header files that will be included in the form window's
-    associated \c .ui file to the specified \a includeHints.
+    associated UI file to the specified \a includeHints.
 
     Header files may be local, i.e. relative to the project's
-    directory,\c "mywidget.h", or global, i.e. part of Qt or the
-    compilers standard libraries:\c <QtGui/QWidget>.
+    directory, \c "mywidget.h", or global, i.e. part of Qt or the
+    compilers standard libraries: \c <QtGui/QWidget>.
 
     \sa includeHints()
 */
diff --git a/tools/designer/src/lib/sdk/script.cpp b/tools/designer/src/lib/sdk/script.cpp
index 90b4c73..2eda3d1 100644
--- a/tools/designer/src/lib/sdk/script.cpp
+++ b/tools/designer/src/lib/sdk/script.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
     \since 4.3
 
     On saving the form, the extension is queried for a script snippet
-    to be associated with the widget while saving the \c .ui file.
+    to be associated with the widget while saving the UI file.
     This script is then run after creating the widget by \l uic or
     QUiLoader.
 
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     for which an editor is provided by the QDesignerTaskMenuExtension.
 
     While saving the form, the state is serialized as a QVariantMap of
-    \QD-supported properties, which is stored in the \c .ui file. This is
+    \QD-supported properties, which is stored in the UI file. This is
     handled by data() and setData().
 
     For item view contents, there might be for example a key that determines
@@ -97,7 +97,7 @@ QDesignerScriptExtension::~QDesignerScriptExtension()
     \fn virtual QVariantMap QDesignerScriptExtension::data() const
 
     Returns a map of variants describing the internal state to be
-    stored in the  \c .ui file.
+    stored in the UI file.
 */
 
 /*!
diff --git a/tools/designer/src/lib/uilib/abstractformbuilder.cpp b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
index 65ea375..05e05c1 100644
--- a/tools/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/tools/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -135,7 +135,7 @@ public:
     QAbstractFormBuilder provides a standard interface and a default
     implementation for constructing forms from user interface
     files. It is not intended to be instantiated directly. Use the
-    QFormBuilder class to create user interfaces from \c{.ui} files at
+    QFormBuilder class to create user interfaces from UI files at
     run-time. For example:
 
     \snippet doc/src/snippets/code/tools_designer_src_lib_uilib_abstractformbuilder.cpp 0
@@ -145,10 +145,10 @@ public:
     functions:
 
     \list
-    \o load() handles reading of \c{.ui} format files from arbitrary
+    \o load() handles reading of UI format files from arbitrary
        QIODevices, and construction of widgets from the XML data
        that they contain.
-    \o save() handles saving of widget details in \c{.ui} format to
+    \o save() handles saving of widget details in UI format to
        arbitrary QIODevices.
     \o workingDirectory() and setWorkingDirectory() control the
        directory in which forms are held. The form builder looks for
@@ -208,13 +208,13 @@ QWidget *QAbstractFormBuilder::load(QIODevice *dev, QWidget *parentWidget)
         }
     }
     if (reader.hasError()) {
-        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "An error has occurred while reading the ui file at line %1, column %2: %3")
+        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "An error has occurred while reading the UI file at line %1, column %2: %3")
                                 .arg(reader.lineNumber()).arg(reader.columnNumber())
                                 .arg(reader.errorString()));
         return 0;
     }
     if (!initialized) {
-        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid ui file: The root element <ui> is missing."));
+        uiLibWarning(QCoreApplication::translate("QAbstractFormBuilder", "Invalid UI file: The root element <ui> is missing."));
         return 0;
     }
 
@@ -657,7 +657,7 @@ void QAbstractFormBuilder::layoutInfo(DomLayout *ui_layout, QObject *parent, int
         spac = p->elementNumber();
 
 #ifdef Q_OS_MAC
-    // here we recognize ui file < 4.3 (no we don't store margin property)
+    // here we recognize UI file < 4.3 (no we don't store margin property)
     if (mar != INT_MIN) {
         const int defaultMargin = parent->inherits("QLayoutWidget") ? 0 : 9;
         if (mar == defaultMargin)
@@ -1202,7 +1202,7 @@ QActionGroup *QAbstractFormBuilder::createActionGroup(QObject *parent, const QSt
     \fn void QAbstractFormBuilder::save(QIODevice *device, QWidget *widget)
 
     Saves an XML representation of the given \a widget to the
-    specified \a device in the standard \c{.ui} file format.
+    specified \a device in the standard UI file format.
 
     \sa load()*/
 void QAbstractFormBuilder::save(QIODevice *dev, QWidget *widget)
diff --git a/tools/designer/src/lib/uilib/formbuilder.cpp b/tools/designer/src/lib/uilib/formbuilder.cpp
index 043991e..f737311 100644
--- a/tools/designer/src/lib/uilib/formbuilder.cpp
+++ b/tools/designer/src/lib/uilib/formbuilder.cpp
@@ -57,12 +57,12 @@ namespace QFormInternal {
     \class QFormBuilder
 
     \brief The QFormBuilder class is used to dynamically construct
-    user interfaces from .ui files at run-time.
+    user interfaces from UI files at run-time.
 
     \inmodule QtDesigner
 
     The QFormBuilder class provides a mechanism for dynamically
-    creating user interfaces at run-time, based on \c{.ui} files
+    creating user interfaces at run-time, based on UI files
     created with \QD. For example:
 
     \snippet doc/src/snippets/code/tools_designer_src_lib_uilib_formbuilder.cpp 0
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 5387c2d..1c7d1cc 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -574,20 +574,20 @@ void QUiLoaderPrivate::setupWidgetMap() const
 
     \brief The QUiLoader class enables standalone applications to
     dynamically create user interfaces at run-time using the
-    information stored in .ui files or specified in plugin paths.
+    information stored in UI files or specified in plugin paths.
 
     In addition, you can customize or create your own user interface by
     deriving your own loader class.
 
     If you have a custom component or an application that embeds \QD, you can
     also use the QFormBuilder class provided by the QtDesigner module to create
-    user interfaces from \c{.ui} files.
+    user interfaces from UI files.
 
     The QUiLoader class provides a collection of functions allowing you to
-    create widgets based on the information stored in \c .ui files (created
+    create widgets based on the information stored in UI files (created
     with \QD) or available in the specified plugin paths. The specified plugin
     paths can be retrieved using the pluginPaths() function. Similarly, the
-    contents of a \c{.ui} file  can be retrieved using the load() function. For
+    contents of a UI file can be retrieved using the load() function. For
     example:
 
     \snippet doc/src/snippets/quiloader/mywidget.cpp 0
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index 534bc11..4bed02f 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -81,10 +81,10 @@ static int usage(const QStringList &args)
         "    --output-format <outformat>\n"
         "           Specify output format. See -if.\n\n"
         "    --input-codec <codec>\n"
-        "           Specify encoding for .qm input files. Default is 'Latin1'.\n"
+        "           Specify encoding for QM input files. Default is 'Latin1'.\n"
         "           UTF-8 is always tried as well, corresponding to the trUtf8() function.\n\n"
         "    --drop-tags <regexp>\n"
-        "           Drop named extra tags when writing 'ts' or 'xlf' files.\n"
+        "           Drop named extra tags when writing TS or XLIFF files.\n"
         "           May be specified repeatedly.\n\n"
         "    --drop-translations\n"
         "           Drop existing translations and reset the status to 'unfinished'.\n"
@@ -101,10 +101,10 @@ static int usage(const QStringList &args)
         "    --no-finished\n"
         "           Drop finished messages.\n\n"
         "    --locations {absolute|relative|none}\n"
-        "           Override how source code references are saved in ts files.\n"
+        "           Override how source code references are saved in TS files.\n"
         "           Default is absolute.\n\n"
         "    --no-ui-lines\n"
-        "           Drop line numbers from references to .ui files.\n\n"
+        "           Drop line numbers from references to UI files.\n\n"
         "    --verbose\n"
         "           be a bit more verbose\n\n"
         "Long options can be specified with only one leading dash, too.\n\n"
diff --git a/tools/linguist/linguist/mainwindow.ui b/tools/linguist/linguist/mainwindow.ui
index 4f66f31..613241b 100644
--- a/tools/linguist/linguist/mainwindow.ui
+++ b/tools/linguist/linguist/mainwindow.ui
@@ -747,7 +747,7 @@
     <string>Release As...</string>
    </property>
    <property name="whatsThis">
-    <string>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the .ts file.</string>
+    <string>Create a Qt message file suitable for released applications from the current message file. The filename will automatically be determined from the name of the TS file.</string>
    </property>
   </action>
   <action name="actionFile">
diff --git a/tools/linguist/lrelease/lrelease.1 b/tools/linguist/lrelease/lrelease.1
index 9e77504..8dd14b2 100644
--- a/tools/linguist/lrelease/lrelease.1
+++ b/tools/linguist/lrelease/lrelease.1
@@ -51,10 +51,10 @@ This page documents the
 tool for the Qt GUI toolkit.
 .B Lrelease
 reads a qmake/tmake project file (.pro file) and converts the
-translation files (.ts files) specified in it into Qt message files
-(.qm files) used by the application to translate.
+translation files (TS files) specified in it into Qt message files
+(QM files) used by the application to translate.
 .PP
-The .qm file format is a compact binary format that provides
+The QM file format is a compact binary format that provides
 extremely fast lookups for translations and that is used by Qt.
 .SH OPTIONS
 .TP
@@ -62,7 +62,7 @@ extremely fast lookups for translations and that is used by Qt.
 Display the usage and exit.
 .TP
 .I "-compress"
-Compress the .qm files.
+Compress the QM files.
 .TP
 .I "-nounfinished"
 Do not include unfinished translations.
@@ -72,7 +72,7 @@ If the translated text is the same as
 the source text, do not include the message.
 .TP
 .I "-silent"
-Don't explain what is being done.
+Do not explain what is being done.
 .TP
 .I "-version"
 Display the version of
@@ -105,7 +105,7 @@ generated from gnomovision_dk.ts, gnomovision_fi.ts,
 gnomovision_no.ts and gnomovision_se.ts, respectively.
 .PP
 .B Lrelease
-can also be invoked with a list of .ts files to convert:
+can also be invoked with a list of TS files to convert:
 .PP
 .in +4
 .nf
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 86b7866..aeed1f2 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -66,19 +66,21 @@ static void printUsage()
         "    lrelease [options] project-file\n"
         "    lrelease [options] ts-files [-qm qm-file]\n\n"
         "lrelease is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to convert XML based translations files in the .ts\n"
-        "format into the 'compiled' .qm format used by QTranslator objects.\n\n"
+        "stand-alone tool to convert XML-based translations files in the TS\n"
+        "format into the 'compiled' QM format used by QTranslator objects.\n\n"
         "Options:\n"
         "    -help  Display this information and exit\n"
+        "    -idbased\n"
+        "           Use IDs instead of source strings for message keying\n"
         "    -compress\n"
-        "           Compress the .qm files\n"
+        "           Compress the QM files\n"
         "    -nounfinished\n"
         "           Do not include unfinished translations\n"
         "    -removeidentical\n"
         "           If the translated text is the same as\n"
         "           the source text, do not include the message\n"
         "    -silent\n"
-        "           Don't explain what is being done\n"
+        "           Do not explain what is being done\n"
         "    -version\n"
         "           Display the version of lrelease and exit\n"
     ));
@@ -99,7 +101,7 @@ static bool loadTsFile(Translator &tor, const QString &tsFileName, bool /* verbo
 
 static bool releaseTranslator(Translator &tor, const QString &qmFileName,
     bool verbose, bool ignoreUnfinished,
-    bool removeIdentical, TranslatorSaveMode mode)
+    bool removeIdentical, bool idBased, TranslatorSaveMode mode)
 {
     Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, verbose);
 
@@ -121,6 +123,7 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName,
     ConversionData cd;
     cd.m_verbose = verbose;
     cd.m_ignoreUnfinished = ignoreUnfinished;
+    cd.m_idBased = idBased;
     cd.m_saveMode = mode;
     bool ok = tor.release(&file, cd);
     file.close();
@@ -136,7 +139,7 @@ static bool releaseTranslator(Translator &tor, const QString &qmFileName,
 }
 
 static bool releaseTsFile(const QString& tsFileName, bool verbose,
-    bool ignoreUnfinished, bool removeIdentical, TranslatorSaveMode mode)
+    bool ignoreUnfinished, bool removeIdentical, bool idBased, TranslatorSaveMode mode)
 {
     Translator tor;
     if (!loadTsFile(tor, tsFileName, verbose))
@@ -151,7 +154,7 @@ static bool releaseTsFile(const QString& tsFileName, bool verbose,
     }
     qmFileName += QLatin1String(".qm");
 
-    return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, mode);
+    return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, idBased, mode);
 }
 
 int main(int argc, char **argv)
@@ -164,6 +167,7 @@ int main(int argc, char **argv)
 
     bool verbose = true; // the default is true starting with Qt 4.2
     bool ignoreUnfinished = false;
+    bool idBased = false;
     // the default mode is SaveEverything starting with Qt 4.2
     TranslatorSaveMode mode = SaveEverything;
     bool removeIdentical = false;
@@ -175,6 +179,9 @@ int main(int argc, char **argv)
         if (args[i] == QLatin1String("-compress")) {
             mode = SaveStripped;
             continue;
+        } else if (args[i] == QLatin1String("-idbased")) {
+            idBased = true;
+            continue;
         } else if (args[i] == QLatin1String("-nocompress")) {
             mode = SaveEverything;
             continue;
@@ -232,18 +239,18 @@ int main(int argc, char **argv)
                              qPrintable(args[i]));
                 } else {
                     foreach (const QString &trans, translations)
-                        if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, mode))
+                        if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, idBased, mode))
                             return 1;
                 }
             } else {
                 qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
-                    "You might want to consider using .ts files as input instead of a project file.\n"
+                    "You might want to consider using TS files as input instead of a project file.\n"
                     "Try the following syntax:\n"
                     "    lrelease [options] ts-files [-qm qm-file]\n");
             }
         } else {
             if (outputFile.isEmpty()) {
-                if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, mode))
+                if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, idBased, mode))
                     return 1;
             } else {
                 if (!loadTsFile(tor, args[i], verbose))
@@ -254,7 +261,7 @@ int main(int argc, char **argv)
 
     if (!outputFile.isEmpty())
         return releaseTranslator(tor, outputFile, verbose, ignoreUnfinished,
-                                 removeIdentical, mode) ? 0 : 1;
+                                 removeIdentical, idBased, mode) ? 0 : 1;
 
     return 0;
 }
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 09148e7..58e094b 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -58,10 +58,6 @@ QT_BEGIN_NAMESPACE
 
 static const char MagicComment[] = "TRANSLATOR ";
 
-static const int yyIdentMaxLen = 128;
-static const int yyCommentMaxLen = 65536;
-static const int yyStringMaxLen = 65536;
-
 #define STRINGIFY_INTERNAL(x) #x
 #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
 #define STRING(s) static QString str##s(QLatin1String(STRINGIFY(s)))
@@ -180,7 +176,8 @@ private:
     QString transcode(const QString &str, bool utf8);
     void recordMessage(
         int line, const QString &context, const QString &text, const QString &comment,
-        const QString &extracomment,  bool utf8, bool plural);
+        const QString &extracomment, const QString &msgid, const TranslatorMessage::ExtraData &extra,
+        bool utf8, bool plural);
 
     void processInclude(const QString &file, ConversionData &cd,
                         QSet<QString> &inclusions);
@@ -202,7 +199,7 @@ private:
 
     enum {
         Tok_Eof, Tok_class, Tok_friend, Tok_namespace, Tok_using, Tok_return,
-        Tok_tr = 10, Tok_trUtf8, Tok_translate, Tok_translateUtf8,
+        Tok_tr = 10, Tok_trUtf8, Tok_translate, Tok_translateUtf8, Tok_trid,
         Tok_Q_OBJECT = 20, Tok_Q_DECLARE_TR_FUNCTIONS,
         Tok_Ident, Tok_Comment, Tok_String, Tok_Arrow, Tok_Colon, Tok_ColonColon,
         Tok_Equals,
@@ -556,6 +553,8 @@ uint CppParser::getToken()
                     return Tok_Q_DECLARE_TR_FUNCTIONS;
                 if (yyIdent == QLatin1String("QT_TR_NOOP"))
                     return Tok_tr;
+                if (yyIdent == QLatin1String("QT_TRID_NOOP"))
+                    return Tok_trid;
                 if (yyIdent == QLatin1String("QT_TRANSLATE_NOOP"))
                     return Tok_translate;
                 if (yyIdent == QLatin1String("QT_TRANSLATE_NOOP3"))
@@ -591,6 +590,10 @@ uint CppParser::getToken()
                 if (yyIdent == QLatin1String("namespace"))
                     return Tok_namespace;
                 break;
+            case 'q':
+                if (yyIdent == QLatin1String("qtTrId"))
+                    return Tok_trid;
+                break;
             case 'r':
                 if (yyIdent == QLatin1String("return"))
                     return Tok_return;
@@ -667,14 +670,9 @@ uint CppParser::getToken()
                         yyCh = getChar();
                         if (yyCh == EOF || yyCh == '\n')
                             break;
-                        if (yyString.size() < yyStringMaxLen) {
-                            yyString.append(QLatin1Char('\\'));
-                            yyString.append(yyCh);
-                        }
-                    } else {
-                        if (yyString.size() < yyStringMaxLen)
-                            yyString.append(yyCh);
+                        yyString.append(QLatin1Char('\\'));
                     }
+                    yyString.append(yyCh);
                     yyCh = getChar();
                 }
 
@@ -1299,13 +1297,16 @@ QString CppParser::transcode(const QString &str, bool utf8)
 
 void CppParser::recordMessage(
     int line, const QString &context, const QString &text, const QString &comment,
-    const QString &extracomment,  bool utf8, bool plural)
+    const QString &extracomment, const QString &msgid, const TranslatorMessage::ExtraData &extra,
+    bool utf8, bool plural)
 {
     TranslatorMessage msg(
         transcode(context, utf8), transcode(text, utf8), transcode(comment, utf8), QString(),
         yyFileName, line, QStringList(),
         TranslatorMessage::Unfinished, plural);
     msg.setExtraComment(transcode(extracomment.simplified(), utf8));
+    msg.setId(msgid);
+    msg.setExtras(extra);
     if ((utf8 || yyForceUtf8) && !yyCodecIsUtf8 && msg.needs8Bit())
         msg.setUtf8(true);
     results->tor->append(msg);
@@ -1332,6 +1333,9 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
     QString text;
     QString comment;
     QString extracomment;
+    QString msgid;
+    QString sourcetext;
+    TranslatorMessage::ExtraData extra;
     QString prefix;
 #ifdef DIAGNOSE_RETRANSLATABILITY
     QString functionName;
@@ -1517,6 +1521,9 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
         case Tok_trUtf8:
             if (!results->tor)
                 goto case_default;
+            if (!sourcetext.isEmpty())
+                qWarning("%s:%d: //%% cannot be used with tr() / QT_TR_NOOP(). Ignoring\n",
+                         qPrintable(yyFileName), yyLineNo);
             utf8 = (yyTok == Tok_trUtf8);
             line = yyLineNo;
             yyTok = getToken();
@@ -1604,14 +1611,19 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
                     prefix.clear();
                 }
 
-                recordMessage(line, context, text, comment, extracomment, utf8, plural);
+                recordMessage(line, context, text, comment, extracomment, msgid, extra, utf8, plural);
             }
             extracomment.clear();
+            msgid.clear();
+            extra.clear();
             break;
         case Tok_translateUtf8:
         case Tok_translate:
             if (!results->tor)
                 goto case_default;
+            if (!sourcetext.isEmpty())
+                qWarning("%s:%d: //%% cannot be used with translate() / QT_TRANSLATE_NOOP(). Ignoring\n",
+                         qPrintable(yyFileName), yyLineNo);
             utf8 = (yyTok == Tok_translateUtf8);
             line = yyLineNo;
             yyTok = getToken();
@@ -1655,9 +1667,32 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
                         break;
                     }
                 }
-                recordMessage(line, context, text, comment, extracomment, utf8, plural);
+                recordMessage(line, context, text, comment, extracomment, msgid, extra, utf8, plural);
             }
             extracomment.clear();
+            msgid.clear();
+            extra.clear();
+            break;
+        case Tok_trid:
+            if (!results->tor)
+                goto case_default;
+            if (!sourcetext.isEmpty()) {
+                if (!msgid.isEmpty())
+                    qWarning("%s:%d: //= cannot be used with qtTrId() / QT_TRID_NOOP(). Ignoring\n",
+                             qPrintable(yyFileName), yyLineNo);
+                //utf8 = false; // Maybe use //%% or something like that
+                line = yyLineNo;
+                yyTok = getToken();
+                if (match(Tok_LeftParen) && matchString(&msgid) && !msgid.isEmpty()) {
+                    bool plural = match(Tok_Comma);
+                    recordMessage(line, QString(), sourcetext, QString(), extracomment,
+                                  msgid, extra, false, plural);
+                }
+                sourcetext.clear();
+            }
+            extracomment.clear();
+            msgid.clear();
+            extra.clear();
             break;
         case Tok_Q_DECLARE_TR_FUNCTIONS:
         case Tok_Q_OBJECT:
@@ -1679,6 +1714,49 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
             if (yyComment.startsWith(QLatin1Char(':'))) {
                 yyComment.remove(0, 1);
                 extracomment.append(yyComment);
+            } else if (yyComment.startsWith(QLatin1Char('='))) {
+                yyComment.remove(0, 1);
+                msgid = yyComment.simplified();
+            } else if (yyComment.startsWith(QLatin1Char('~'))) {
+                yyComment.remove(0, 1);
+                yyComment = yyComment.trimmed();
+                int k = yyComment.indexOf(QLatin1Char(' '));
+                if (k > -1)
+                    extra.insert(yyComment.left(k), yyComment.mid(k + 1).trimmed());
+            } else if (yyComment.startsWith(QLatin1Char('%'))) {
+                int p = 1, c;
+                forever {
+                    if (p >= yyComment.length())
+                        break;
+                    c = yyComment.unicode()[p++].unicode();
+                    if (isspace(c))
+                        continue;
+                    if (c != '"') {
+                        qWarning("%s:%d: Unexpected character in meta string\n",
+                                 qPrintable(yyFileName), yyLineNo);
+                        break;
+                    }
+                    forever {
+                        if (p >= yyComment.length()) {
+                          whoops:
+                            qWarning("%s:%d: Unterminated meta string\n",
+                                     qPrintable(yyFileName), yyLineNo);
+                            break;
+                        }
+                        c = yyComment.unicode()[p++].unicode();
+                        if (c == '"')
+                            break;
+                        if (c == '\\') {
+                            if (p >= yyComment.length())
+                                goto whoops;
+                            c = yyComment.unicode()[p++].unicode();
+                            if (c == '\n')
+                                goto whoops;
+                            sourcetext.append(QLatin1Char('\\'));
+                        }
+                        sourcetext.append(c);
+                    }
+                }
             } else {
                 comment = yyComment.simplified();
                 if (comment.startsWith(QLatin1String(MagicComment))) {
@@ -1689,7 +1767,11 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
                     } else {
                         context = comment.left(k);
                         comment.remove(0, k + 1);
-                        recordMessage(yyLineNo, context, QString(), comment, extracomment, false, false);
+                        recordMessage(yyLineNo, context, QString(), comment, extracomment,
+                                      QString(), TranslatorMessage::ExtraData(), false, false);
+                        extracomment.clear();
+                        results->tor->setExtras(extra);
+                        extra.clear();
                     }
                 }
             }
@@ -1739,6 +1821,8 @@ void CppParser::parseInternal(ConversionData &cd, QSet<QString> &inclusions)
             prospectiveContext.clear();
             prefix.clear();
             extracomment.clear();
+            msgid.clear();
+            extra.clear();
             yyTokColonSeen = false;
             yyTok = getToken();
             break;
diff --git a/tools/linguist/lupdate/lupdate.1 b/tools/linguist/lupdate/lupdate.1
index 68958b9..b37e7b3 100644
--- a/tools/linguist/lupdate/lupdate.1
+++ b/tools/linguist/lupdate/lupdate.1
@@ -52,12 +52,12 @@ tool for the Qt GUI toolkit.
 .B Lupdate
 reads a qmake/tmake project file (.pro file), finds the translatable
 strings in the specified source, header and interface files, and
-updates the translation files (.ts files) specified in it. The
+updates the translation files (TS files) specified in it. The
 translation files are given to the translator who uses
 .B Qt Linguist
 to read the files and insert the translations.
 .PP
-The .ts file format is a simple human-readable XML format that can be
+The TS file format is a simple human-readable XML format that can be
 used with version control systems if required.
 .PP
 .SH OPTIONS
@@ -74,7 +74,7 @@ Default: 'ui,c,c++,cc,cpp,cxx,ch,h,h++,hh,hpp,hxx'.
 Display the usage and exit.
 .TP
 .I "-locations {absolute|relative|none}"
-Specify/override how source code references are saved in ts files.
+Specify/override how source code references are saved in TS files.
 Default is absolute.
 .TP
 .I "-no-obsolete"
@@ -84,7 +84,7 @@ Drop all obsolete strings.
 Do not recursively scan the following directories.
 .TP
 .I "-no-sort"
-Do not sort contexts in .ts files.
+Do not sort contexts in TS files.
 .TP
 .I "-pluralonly"
 Only include plural form messages.
@@ -97,7 +97,7 @@ file syntax but different file suffix
 Recursively scan the following directories.
 .TP
 .I "-silent"
-Don't explain what is being done.
+Do not explain what is being done.
 .TP
 .I "-source-language <language>[_<region>]"
 Specify/override the language of the source strings. Defaults to
@@ -139,8 +139,8 @@ translations will be reused as far as possible, and translated
 strings that have vanished from the source files are marked obsolete.
 .PP
 .B lupdate
-can also be invoked with a list of C++ source files, .ui files
-and .ts files:
+can also be invoked with a list of C++ source files, UI files
+and TS files:
 .PP
 .in +4
 .nf
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 1f0112d..85cf430 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -103,7 +103,7 @@ static void printUsage()
         "    -silent\n"
         "           Do not explain what is being done.\n"
         "    -no-sort\n"
-        "           Do not sort contexts in .ts files.\n"
+        "           Do not sort contexts in TS files.\n"
         "    -no-recursive\n"
         "           Do not recursively scan the following directories.\n"
         "    -recursive\n"
@@ -112,10 +112,10 @@ static void printUsage()
         "           Additional location to look for include files.\n"
         "           May be specified multiple times.\n"
         "    -locations {absolute|relative|none}\n"
-        "           Specify/override how source code references are saved in ts files.\n"
+        "           Specify/override how source code references are saved in TS files.\n"
         "           Default is absolute.\n"
         "    -no-ui-lines\n"
-        "           Do not record line numbers in references to .ui files.\n"
+        "           Do not record line numbers in references to UI files.\n"
         "    -disable-heuristic {sametext|similartext|number}\n"
         "           Disable the named merge heuristic. Can be specified multiple times.\n"
         "    -pro <filename>\n"
@@ -182,9 +182,10 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil
         if (options & Verbose)
             printOut(QObject::tr("Updating '%1'...\n").arg(fn));
 
+        UpdateOptions theseOptions = options;
         if (tor.locationsType() == Translator::NoLocations) // Could be set from file
-            options |= NoLocations;
-        Translator out = merge(tor, fetchedTor, options, err);
+            theseOptions |= NoLocations;
+        Translator out = merge(tor, fetchedTor, theseOptions, err);
         if (!codecForTr.isEmpty())
             out.setCodecName(codecForTr);
 
diff --git a/tools/linguist/phrasebooks/french.qph b/tools/linguist/phrasebooks/french.qph
index f244013..d38da5a 100644
--- a/tools/linguist/phrasebooks/french.qph
+++ b/tools/linguist/phrasebooks/french.qph
@@ -1,4 +1,5 @@
-<!DOCTYPE QPH><QPH language="fr">
+<!DOCTYPE QPH>
+<QPH language="fr">
 <phrase>
     <source>About</source>
     <target>A propos</target>
@@ -1101,4 +1102,228 @@
     <source>Yes</source>
     <target>Oui</target>
 </phrase>
+<phrase>
+    <source>Split</source>
+    <target>Scinder</target>
+</phrase>
+<phrase>
+    <source>&amp;Edit</source>
+    <target>&amp;Édition</target>
+</phrase>
+<phrase>
+    <source>&amp;Redo</source>
+    <target>Re&amp;faire</target>
+</phrase>
+<phrase>
+    <source>debugger</source>
+    <target>débogueur</target>
+</phrase>
+<phrase>
+    <source>Start Debugger</source>
+    <target>Lancer le débogueur</target>
+</phrase>
+<phrase>
+    <source>Executable:</source>
+    <target>Exécutable:</target>
+</phrase>
+<phrase>
+    <source>Filter:</source>
+    <target>Filtre:</target>
+</phrase>
+<phrase>
+    <source>Clear</source>
+    <target>Effacer</target>
+</phrase>
+<phrase>
+    <source>Host and port:</source>
+    <target>Hôte et port:</target>
+</phrase>
+<phrase>
+    <source>Architecture:</source>
+    <target>Architecture:</target>
+</phrase>
+<phrase>
+    <source>Server start script:</source>
+    <target>Script de démarrage du serveur:</target>
+</phrase>
+<phrase>
+    <source>&amp;Undo</source>
+    <target>Annu&amp;ler</target>
+</phrase>
+<phrase>
+    <source>Add Bookmark</source>
+    <target>Ajouter un signet</target>
+</phrase>
+<phrase>
+    <source>Bookmark:</source>
+    <target>Signet:</target>
+</phrase>
+<phrase>
+    <source>Add in Folder:</source>
+    <target>Ajouter dans le dossier:</target>
+</phrase>
+<phrase>
+    <source>+</source>
+    <target>+</target>
+</phrase>
+<phrase>
+    <source>New Folder</source>
+    <target>Nouveau dossier</target>
+</phrase>
+<phrase>
+    <source>Bookmarks</source>
+    <target>Signets</target>
+</phrase>
+<phrase>
+    <source>Rename Folder</source>
+    <target>Renommer le dossier</target>
+</phrase>
+<phrase>
+    <source>Bookmark</source>
+    <target>Signet</target>
+</phrase>
+<phrase>
+    <source>Remove</source>
+    <target>Retirer</target>
+</phrase>
+<phrase>
+    <source>Delete Folder</source>
+    <target>Supprimer le dossier</target>
+</phrase>
+<phrase>
+    <source>Add</source>
+    <target>Ajouter</target>
+</phrase>
+<phrase>
+    <source>Move Up</source>
+    <target>Vers le Haut</target>
+</phrase>
+<phrase>
+    <source>Move Down</source>
+    <target>Vers le Bas</target>
+</phrase>
+<phrase>
+    <source>Show Bookmark</source>
+    <target>Afficher le signet</target>
+</phrase>
+<phrase>
+    <source>Show Bookmark in New Tab</source>
+    <target>Afficher le signet dans un nouvel onglet</target>
+</phrase>
+<phrase>
+    <source>Delete Bookmark</source>
+    <target>Supprimer le signet</target>
+</phrase>
+<phrase>
+    <source>Rename Bookmark</source>
+    <target>Renommer le signet</target>
+</phrase>
+<phrase>
+    <source>Previous Bookmark</source>
+    <target>Signet précédent</target>
+</phrase>
+<phrase>
+    <source>Next Bookmark</source>
+    <target>Signet suivant</target>
+</phrase>
+<phrase>
+    <source>Condition:</source>
+    <target>Condition:</target>
+</phrase>
+<phrase>
+    <source>Working Directory:</source>
+    <target>Répertoire de travail:</target>
+</phrase>
+<phrase>
+    <source>Environment</source>
+    <target>Environnement</target>
+</phrase>
+<phrase>
+    <source>Arguments</source>
+    <target>Arguments</target>
+</phrase>
+<phrase>
+    <source>Build directory:</source>
+    <target>Répertoire de compilation:</target>
+</phrase>
+<phrase>
+    <source>Path:</source>
+    <target>Chemin:</target>
+</phrase>
+<phrase>
+    <source>General</source>
+    <target>Général</target>
+</phrase>
+<phrase>
+    <source>Username:</source>
+    <target>Nom d&apos;utilisateur:</target>
+</phrase>
+<phrase>
+    <source>User interface</source>
+    <target>Interface utilisateur</target>
+</phrase>
+<phrase>
+    <source>Open Link</source>
+    <target>Ouvrir le lien</target>
+</phrase>
+<phrase>
+    <source> [read only]</source>
+    <target> [lecture seule]</target>
+</phrase>
+<phrase>
+    <source> [directory]</source>
+    <target> [répertoire]</target>
+</phrase>
+<phrase>
+    <source>Close All</source>
+    <target>Fermer tout</target>
+</phrase>
+<phrase>
+    <source>Failed!</source>
+    <target>Échec!</target>
+</phrase>
+<phrase>
+    <source>Proceed</source>
+    <target>Continuer</target>
+</phrase>
+<phrase>
+    <source>Make writable</source>
+    <target>Rendre inscriptible</target>
+</phrase>
+<phrase>
+    <source>Qt Creator</source>
+    <target>Qt Creator</target>
+</phrase>
+<phrase>
+    <source>&amp;File</source>
+    <target>&amp;Fichier</target>
+</phrase>
+<phrase>
+    <source>Activate %1</source>
+    <target>Activer %1</target>
+</phrase>
+<phrase>
+    <source>New Project</source>
+    <target>Nouveau projet</target>
+</phrase>
+<phrase>
+    <source>Close %1</source>
+    <target>Fermer %1</target>
+</phrase>
+<phrase>
+    <source>*</source>
+    <target>*</target>
+</phrase>
+<phrase>
+    <source>&amp;Change</source>
+    <target>&amp;Modifier</target>
+</phrase>
+<phrase>
+    <source>Close Other Editors</source>
+    <target>Fermer les autres éditeurs</target>
+</phrase>
+<phrase>
+    <source>Close All Except %1</source>
+    <target>Fermer tout sauf %1</target>
+</phrase>
 </QPH>
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/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp
index ec61cb6..9523fde 100644
--- a/tools/linguist/shared/qm.cpp
+++ b/tools/linguist/shared/qm.cpp
@@ -173,6 +173,7 @@ public:
     bool save(QIODevice *iod);
 
     void insert(const TranslatorMessage &msg, bool forceComment);
+    void insertIdBased(const TranslatorMessage &message);
 
     void squeeze(TranslatorSaveMode mode);
 
@@ -244,7 +245,7 @@ void Releaser::writeMessage(const ByteTranslatorMessage &msg, QDataStream &strea
     if (mode == SaveEverything)
         prefix = HashContextSourceTextComment;
 
-    // lrelease produces "wrong" .qm files for QByteArrays that are .isNull().
+    // lrelease produces "wrong" QM files for QByteArrays that are .isNull().
     switch (prefix) {
     default:
     case HashContextSourceTextComment:
@@ -436,6 +437,16 @@ void Releaser::insert(const TranslatorMessage &message, bool forceComment)
         insertInternal(message, forceComment, false);
 }
 
+void Releaser::insertIdBased(const TranslatorMessage &message)
+{
+    QStringList tlns = message.translations();
+    for (int i = 0; i < tlns.size(); ++i)
+        if (tlns.at(i).isEmpty())
+            tlns[i] = message.sourceText();
+    ByteTranslatorMessage bmsg("", originalBytes(message.id(), false), "", tlns);
+    m_messages.insert(bmsg, 0);
+}
+
 void Releaser::setNumerusRules(const QByteArray &rules)
 {
     m_numerusRules = rules;
@@ -689,11 +700,17 @@ static bool saveQM(const Translator &translator, QIODevice &dev, ConversionData
     int finished = 0;
     int unfinished = 0;
     int untranslated = 0;
+    int missingIds = 0;
+    int droppedData = 0;
 
     for (int i = 0; i != translator.messageCount(); ++i) {
         const TranslatorMessage &msg = translator.message(i);
         TranslatorMessage::Type typ = msg.type();
         if (typ != TranslatorMessage::Obsolete) {
+            if (cd.m_idBased && msg.id().isEmpty()) {
+                ++missingIds;
+                continue;
+            }
             if (typ == TranslatorMessage::Unfinished) {
                 if (msg.translation().isEmpty()) {
                     ++untranslated;
@@ -706,19 +723,34 @@ static bool saveQM(const Translator &translator, QIODevice &dev, ConversionData
             } else {
                 ++finished;
             }
-            // Drop the comment in (context, sourceText, comment),
-            // unless the context is empty,
-            // unless (context, sourceText, "") already exists or
-            // unless we already dropped the comment of (context,
-            // sourceText, comment0).
-            bool forceComment =
-                    msg.comment().isEmpty()
-                    || msg.context().isEmpty()
-                    || translator.contains(msg.context(), msg.sourceText(), QString());
-            releaser.insert(msg, forceComment);
+            if (cd.m_idBased) {
+                if (!msg.context().isEmpty() || !msg.comment().isEmpty())
+                    ++droppedData;
+                releaser.insertIdBased(msg);
+            } else {
+                // Drop the comment in (context, sourceText, comment),
+                // unless the context is empty,
+                // unless (context, sourceText, "") already exists or
+                // unless we already dropped the comment of (context,
+                // sourceText, comment0).
+                bool forceComment =
+                        msg.comment().isEmpty()
+                        || msg.context().isEmpty()
+                        || translator.contains(msg.context(), msg.sourceText(), QString());
+                releaser.insert(msg, forceComment);
+            }
         }
     }
 
+    if (missingIds)
+        cd.appendError(QCoreApplication::translate("LRelease",
+            "Dropped %n message(s) which had no ID.", 0,
+            QCoreApplication::CodecForTr, missingIds));
+    if (droppedData)
+        cd.appendError(QCoreApplication::translate("LRelease",
+            "Excess context/disambiguation dropped from %n message(s).", 0,
+            QCoreApplication::CodecForTr, droppedData));
+
     releaser.squeeze(cd.m_saveMode);
     bool saved = releaser.save(&dev);
     if (saved && cd.isVerbose()) {
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h
index ac824f3..fb17fd1 100644
--- a/tools/linguist/shared/translator.h
+++ b/tools/linguist/shared/translator.h
@@ -65,6 +65,7 @@ public:
         m_ignoreUnfinished(false),
         m_sortContexts(false),
         m_noUiLines(false),
+        m_idBased(false),
         m_saveMode(SaveEverything)
     {}
 
@@ -97,6 +98,7 @@ public:
     bool m_ignoreUnfinished;
     bool m_sortContexts;
     bool m_noUiLines;
+    bool m_idBased;
     TranslatorSaveMode m_saveMode;
 };
 
diff --git a/tools/linguist/shared/ts.dtd b/tools/linguist/shared/ts.dtd
index ab77f64..4d2cdeb 100644
--- a/tools/linguist/shared/ts.dtd
+++ b/tools/linguist/shared/ts.dtd
@@ -34,7 +34,7 @@
           version CDATA #IMPLIED
           sourcelanguage CDATA #IMPLIED
           language CDATA #IMPLIED>
-<!-- The encoding to use in the .qm file by default. Default is ISO-8859-1. -->
+<!-- The encoding to use in the QM file by default. Default is ISO-8859-1. -->
 <!ELEMENT defaultcodec (#PCDATA) >
 <!ELEMENT context (name?, comment?, (context|message)+) >
 <!ATTLIST context
@@ -54,7 +54,7 @@
 <!ELEMENT message (location*, source?, oldsource?, comment?, oldcomment?, extracomment?, translatorcomment?, translation?, userdata?, extra-**) >
 <!--
  ! If utf8 is true, the defaultcodec is overridden and the message is encoded
- ! in UTF-8 in the .qm file.
+ ! in UTF-8 in the QM file.
   -->
 <!ATTLIST message
           id CDATA #IMPLIED
@@ -70,7 +70,7 @@
  ! is omitted, the "current" one is used. For the 1st location in a message,
  ! "current" is the filename used for the 1st location of the previous message.
  ! For subsequent locations, it is the filename used for the previous location.
- ! A single .ts file has either all absolute or all relative locations.
+ ! A single TS file has either all absolute or all relative locations.
   -->
 <!ATTLIST location 
           filename CDATA #IMPLIED
@@ -106,7 +106,7 @@
 <!--
  ! The translation variants have a priority between 1 ("highest") and 9 ("lowest")
  ! Typically longer translations get a higher priority.
- ! If omitted, the order of appearance of the variants in the .ts files is used.
+ ! If omitted, the order of appearance of the variants in the TS files is used.
   -->
 <!ATTLIST lengthvariant
           priority (1|2|3|4|5|6|7|8|9) #IMPLIED>
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index 5d1ac32..b8b9338 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -613,18 +613,15 @@ static void writeProxy(const QString &filename, const QDBusIntrospection::Interf
 
             // getter:
             if (property.access != QDBusIntrospection::Property::Write) {
-                hs << "    inline " << type << " " << getter << "() const" << endl;
-                if (type != "QVariant")
-                    hs << "    { return qvariant_cast< " << type << " >(internalPropGet(\""
-                       << property.name << "\")); }" << endl;
-                else
-                    hs << "    { return internalPropGet(\"" << property.name << "\"); }" << endl;
+                hs << "    inline " << type << " " << getter << "() const" << endl
+                    << "    { return qvariant_cast< " << type << " >(property(\""
+                    << property.name << "\")); }" << endl;
             }
 
             // setter:
             if (property.access != QDBusIntrospection::Property::Read) {
                 hs << "    inline void " << setter << "(" << constRefArg(type) << "value)" << endl
-                   << "    { internalPropSet(\"" << property.name
+                   << "    { setProperty(\"" << property.name
                    << "\", qVariantFromValue(value)); }" << endl;
             }
 
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 222b9a1..d5aca0e 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -1677,10 +1677,13 @@ void DocParser::startSection(Doc::SectioningUnit unit, int cmd)
     leavePara();
 
     if (currentSectioningUnit == Doc::Book) {
+#if 0
+        // mws didn't think this was necessary.
 	if (unit > Doc::Section1)
 	    location().warning(tr("Unexpected '\\%1' without '\\%2'")
 				.arg(cmdName(cmd))
 				.arg(cmdName(CMD_SECTION1)));
+#endif        
 	currentSectioningUnit = (Doc::SectioningUnit) (unit - 1);
 	priv->constructExtra();
 	priv->extra->sectioningUnit = currentSectioningUnit;
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index b59c06d..e92f53b 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -68,12 +68,12 @@ QStringList Generator::imageDirs;
 QString Generator::outDir;
 QString Generator::project;
 
-static Text stockLink(const QString &target)
+static void singularPlural(Text& text, const NodeList& nodes)
 {
-    return Text() << Atom(Atom::Link, target)
-                  << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
-                  << target
-                  << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
+    if (nodes.count() == 1)
+        text << " is";
+    else
+        text << " are";
 }
 
 Generator::Generator()
@@ -825,79 +825,138 @@ void Generator::generateThreadSafeness(const Node *node, CodeMarker *marker)
 {
     Text text;
     Text theStockLink;
-    Node::ThreadSafeness parent = node->parent()->inheritedThreadSafeness();
+    Node::ThreadSafeness threadSafeness = node->threadSafeness();
+
+    Text rlink;
+    rlink << Atom(Atom::Link,"reentrant")
+          << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+          << "reentrant"
+          << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
 
-    switch (node->threadSafeness()) {
+    Text tlink;
+    tlink << Atom(Atom::Link,"thread-safe")
+          << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
+          << "thread-safe"
+          << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
+
+    switch (threadSafeness) {
     case Node::UnspecifiedSafeness:
         break;
     case Node::NonReentrant:
         text << Atom::ParaLeft
-             << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
              << "Warning:"
-             << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD)
              << " This "
              << typeString(node)
              << " is not "
-             << stockLink("reentrant")
+             << rlink
              << "."
              << Atom::ParaRight;
         break;
     case Node::Reentrant:
     case Node::ThreadSafe:
         text << Atom::ParaLeft
-             << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD);
-        if (parent == Node::ThreadSafe) {
-            text << "Warning:";
-        }
-        else {
-            text << "Note:";
-        }
-        text << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD) << " ";
-
-        if (node->threadSafeness() == Node::ThreadSafe)
-            theStockLink = stockLink("thread-safe");
-        else
-            theStockLink = stockLink("reentrant");
+             << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD)
+             << "Note:"
+             << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD)
+             << " ";
 
         if (node->isInnerNode()) {
-            const InnerNode *innerNode = static_cast<const InnerNode *>(node);
-            text << "All the functions in this "
+            const InnerNode* innerNode = static_cast<const InnerNode*>(node);
+            text << "All functions in this "
                  << typeString(node)
-                 << " are "
-                 << theStockLink;
-
-            NodeList except;
+                 << " are ";
+            if (threadSafeness == Node::ThreadSafe)
+                text << tlink;
+            else
+                text << rlink;
+
+            bool exceptions = false;
+            NodeList reentrant;
+            NodeList threadsafe;
+            NodeList nonreentrant;
             NodeList::ConstIterator c = innerNode->childNodes().begin();
             while (c != innerNode->childNodes().end()) {
-                if ((*c)->threadSafeness() != Node::UnspecifiedSafeness)
-                    except.append(*c);
+                switch ((*c)->threadSafeness()) {
+                case Node::Reentrant:
+                    reentrant.append(*c);
+                    if (threadSafeness == Node::ThreadSafe)
+                        exceptions = true;
+                    break;
+                case Node::ThreadSafe:
+                    threadsafe.append(*c);
+                    if (threadSafeness == Node::Reentrant)
+                        exceptions = true;
+                    break;
+                case Node::NonReentrant:
+                    nonreentrant.append(*c);
+                    exceptions = true;
+                    break;
+                default:
+                    break;
+                }
                 ++c;
             }
-            if (except.isEmpty()) {
+            if (!exceptions) 
                 text << ".";
+            else if (threadSafeness == Node::Reentrant) {
+                if (nonreentrant.isEmpty()) {
+                    if (!threadsafe.isEmpty()) {
+                        text << ", but ";
+                        appendFullNames(text,threadsafe,innerNode,marker);
+                        singularPlural(text,threadsafe);
+                        text << " also " << tlink << ".";
+                    }
+                    else
+                        text << ".";
+                }
+                else {
+                    text << ", except for ";
+                    appendFullNames(text,nonreentrant,innerNode,marker);
+                    text << ", which";
+                    singularPlural(text,nonreentrant);
+                    text << " nonreentrant.";
+                    if (!threadsafe.isEmpty()) {
+                        text << " ";
+                        appendFullNames(text,threadsafe,innerNode,marker);
+                        singularPlural(text,threadsafe);
+                        text << " " << tlink << ".";
+                    }
+                }
             }
-            else {
-                text << ", except ";
-
-                NodeList::ConstIterator e = except.begin();
-                int index = 0;
-                while (e != except.end()) {
-                    appendFullName(text, *e, innerNode, marker);
-                    text << separator(index++, except.count());
-                    ++e;
+            else { // thread-safe
+                if (!nonreentrant.isEmpty() || !reentrant.isEmpty()) {
+                    text << ", except for ";
+                    if (!reentrant.isEmpty()) {
+                        appendFullNames(text,reentrant,innerNode,marker);
+                        text << ", which";
+                        singularPlural(text,reentrant);
+                        text << " only " << rlink;
+                        if (!nonreentrant.isEmpty())
+                            text << ", and ";
+                    }
+                    if (!nonreentrant.isEmpty()) {
+                        appendFullNames(text,nonreentrant,innerNode,marker);
+                        text << ", which";
+                        singularPlural(text,nonreentrant);
+                        text << " nonreentrant.";
+                    }
+                    text << ".";
                 }
             }
         }
         else {
-            text << "This "
-                 << typeString(node)
-                 << " is "
-                 << theStockLink
-                 << ".";
+            text << "This " << typeString(node) << " is ";
+            if (threadSafeness == Node::ThreadSafe)
+                text << tlink;
+            else
+                text << rlink;
+            text << ".";
         }
         text << Atom::ParaRight;
     }
-    generateText(text, node, marker);
+    generateText(text,node,marker);
 }
 
 void Generator::generateSince(const Node *node, CodeMarker *marker)
@@ -1035,6 +1094,20 @@ void Generator::appendFullName(Text& text,
          << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
 }
 
+void Generator::appendFullNames(Text& text,
+                                const NodeList& nodes,
+                                const Node* relative,
+                                CodeMarker* marker)
+{
+    NodeList::ConstIterator n = nodes.begin();
+    int index = 0;
+    while (n != nodes.end()) {
+        appendFullName(text,*n,relative,marker);
+        text << comma(index++,nodes.count());
+        ++n;
+    }
+}
+
 void Generator::appendSortedNames(Text& text,
                                   const ClassNode *classe,
                                   const QList<RelatedClass> &classes,
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 6d42b2e..8e3c57e 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -157,6 +157,10 @@ class Generator
                         const Node *apparentNode,
                         const QString& fullName,
                         const Node *actualNode);
+    void appendFullNames(Text& text,
+                         const NodeList& nodes,
+                         const Node* relative,
+                         CodeMarker* marker);
     void appendSortedNames(Text& text, 
                            const ClassNode *classe,
                            const QList<RelatedClass> &classes,
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 5a98275..6425765 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -128,7 +128,7 @@ static void printHelp()
                               "    -D<name>      "
                               "Define <name> as a macro while parsing sources\n"
                               "    -slow         "
-                              "Turn on features that slow down qdoc"
+                              "Turn on features that slow down qdoc\n"
                               "    -showinternal "
                               "Include stuff marked internal") );
 }
diff --git a/tools/qdoc3/separator.cpp b/tools/qdoc3/separator.cpp
index 8f27f90..60674be 100644
--- a/tools/qdoc3/separator.cpp
+++ b/tools/qdoc3/separator.cpp
@@ -48,22 +48,30 @@
 
 QT_BEGIN_NAMESPACE
 
-QString separator( int index, int count )
+QString separator(int index, int count)
 {
-    if ( index == count - 1 )
-	return tr( ".", "terminator" );
+    if (index == count - 1)
+	return tr(".", "terminator");
+    if (count == 2)
+	return tr(" and ", "separator when N = 2");
+    if (index == 0)
+        return tr(", ", "first separator when N > 2");
+    if (index < count - 2)
+        return tr(", ", "general separator when N > 2");
+    return tr(", and ", "last separator when N > 2");
+}
 
-    if ( count == 2 ) {
-	return tr( " and ", "separator when N = 2" );
-    } else {
-	if ( index == 0 ) {
-	    return tr( ", ", "first separator when N > 2" );
-	} else if ( index < count - 2 ) {
-	    return tr( ", ", "general separator when N > 2" );
-	} else {
-	    return tr( ", and ", "last separator when N > 2" );
-	}
-    }
+QString comma(int index, int count)
+{
+    if (index == count - 1)
+    	return QString("");
+    if (count == 2)
+	return tr(" and ", "separator when N = 2");
+    if (index == 0) 
+        return tr(", ", "first separator when N > 2");
+    if (index < count - 2) 
+        return tr(", ", "general separator when N > 2");
+    return tr(", and ", "last separator when N > 2");
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/separator.h b/tools/qdoc3/separator.h
index 70ba624..2336d94 100644
--- a/tools/qdoc3/separator.h
+++ b/tools/qdoc3/separator.h
@@ -51,6 +51,7 @@
 QT_BEGIN_NAMESPACE
 
 QString separator( int index, int count );
+QString comma( int index, int count );
 
 QT_END_NAMESPACE
 
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
index c0f8677..5be9fa5 100644
--- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf
+++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
@@ -69,7 +69,8 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           QT_END_INCLUDE_NAMESPACE \
                           PHONON_EXPORT \
                           Q_DECLARATIVE_EXPORT \
-			  Q_GADGET
+			  Q_GADGET \
+			  QWEBKIT_EXPORT
 Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
                           Q_DECLARE_METATYPE \
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 88d4fcf..bba8e39 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -101,7 +101,8 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           Q_XML_EXPORT \
                           QDBUS_EXPORT \
                           Q_DECLARATIVE_EXPORT \
-			  Q_GADGET
+			  Q_GADGET \
+			  QWEBKIT_EXPORT
 Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
                           Q_DECLARE_METATYPE \
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 45f6a45..36cbd89 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -55,7 +55,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( QWidget * parent,
                                               const char * name, bool modal, Qt::WindowFlags f )
     : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0)
 {
-    // work around buggy ui file
+    // work around buggy UI file
     comboEffect->setEnabled(false);
     buttonEffect->setEnabled(false);
     onToggleBuildEffects(true);
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/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
index e8ca8f2..1080477 100644
--- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp
+++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp
@@ -113,6 +113,8 @@ bool ActiveSyncConnection::copyFileToDevice(const QString &localSource, const QS
                 CeCloseHandle(deviceHandle);
                 return true;
             }
+        } else {
+            qWarning("Could not open %s: %s", qPrintable(localSource), qPrintable(file.errorString()));
         }
         return false;
     }
@@ -120,7 +122,7 @@ bool ActiveSyncConnection::copyFileToDevice(const QString &localSource, const QS
     deleteFile(deviceDest);
     HANDLE deviceHandle = CeCreateFile(deviceDest.utf16(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
     if (deviceHandle == INVALID_HANDLE_VALUE) {
-        debugOutput(QString::fromLatin1("  Could not create target file"), 2);
+        qWarning("Could not create %s: %s", qPrintable(deviceDest), strwinerror(CeGetLastError()).constData());
         return false;
     }
 
@@ -144,7 +146,7 @@ bool ActiveSyncConnection::copyFileToDevice(const QString &localSource, const QS
         if (toWrite == 0)
             break;
         if (!CeWriteFile(deviceHandle, data.data() , toWrite, &written, NULL)) {
-            debugOutput(QString::fromLatin1("  Could not write File"), 2);
+            qWarning("Could not write to %s: %s", qPrintable(deviceDest), strwinerror(CeGetLastError()).constData());
             return false;
         }
         currentPos += written;
@@ -380,12 +382,17 @@ bool ActiveSyncConnection::execute(QString program, QString arguments, int timeo
         BYTE* output;
         IRAPIStream *stream;
         int returned = 0;
+        DWORD error = 0;
         HRESULT res = CeRapiInvoke(dllLocation.utf16(), functionName.utf16(), 0, 0, &outputSize, &output, &stream, 0);
         if (S_OK != res) {
-            if (S_OK != CeGetLastError())
-                debugOutput(QString::fromLatin1("Error: Could not invoke method on QtRemote"),1);
-            else
-                debugOutput(QString::fromLatin1("Error: QtRemote return unexpectedly with error Code %1").arg(res), 1);
+            DWORD ce_error = CeGetLastError();
+            if (S_OK != ce_error) {
+                qWarning("Error invoking %s on %s: %s", qPrintable(functionName),
+                    qPrintable(dllLocation), strwinerror(ce_error).constData());
+            } else {
+                qWarning("Error: %s on %s unexpectedly returned %d", qPrintable(functionName),
+                    qPrintable(dllLocation), res);
+            }
         } else {
             DWORD written;
             int strSize = program.length();
@@ -414,9 +421,18 @@ bool ActiveSyncConnection::execute(QString program, QString arguments, int timeo
             if (S_OK != stream->Read(&returned, sizeof(returned), &written)) {
                 qWarning("   Could not access return value of process");
             }
-            result = true;
-        }
+            if (S_OK != stream->Read(&error, sizeof(error), &written)) {
+                qWarning("   Could not access error code");
+            }
 
+            if (error) {
+                qWarning("Error on target: %s", strwinerror(error).constData());
+                result = false;
+            }
+            else {
+                result = true;
+            }
+        }
 
         if (returnValue)
             *returnValue = returned;
diff --git a/tools/qtestlib/wince/cetest/deployment.cpp b/tools/qtestlib/wince/cetest/deployment.cpp
index fec2735..68f0197 100644
--- a/tools/qtestlib/wince/cetest/deployment.cpp
+++ b/tools/qtestlib/wince/cetest/deployment.cpp
@@ -125,13 +125,37 @@ void DeploymentHandler::initQtDeploy(QMakeProject *project, DeploymentList &depl
     if (!project->values("QMAKE_QT_DLL").isEmpty() && !project->values("QMAKE_LIBDIR").isEmpty()) {
         QStringList libs = project->values("LIBS");
         QStringList qtLibs;
+        QStringList libPaths;
         foreach (QString item, libs) {
-            if (item.startsWith("-lQt")) {
-                qtLibs += project->values("QMAKE_LIBDIR").at(0) + QDir::separator() + item.mid(2) + QLatin1String("4.dll");
+
+            if (item.startsWith("-L")) {
+                // -L -> a directory containing DLLs
+                libPaths << item.mid(2);
+                continue;
+            }
+
+            QStringList libCandidates;
+
+            if (item.startsWith("-l")) {
+                // -l -> a library located within one of the standard library paths
+                QString lib = item.mid(2);
+
+                // Check if it's a Qt library first, then check in all paths given with -L.
+                // Note Qt libraries get a `4' appended to them, others don't.
+                libCandidates << project->values("QMAKE_LIBDIR").at(0) + QDir::separator() + lib + QLatin1String("4.dll");
+                foreach (QString const& libPath, libPaths) {
+                    libCandidates << libPath + QDir::separator() + lib + QLatin1String(".dll");
+                }
             } else {
-                QFileInfo info(item);
-                if (info.exists() && info.isAbsolute() && info.fileName().startsWith(QLatin1String("Qt")))
-                    qtLibs += info.dir().absoluteFilePath(info.fileName().replace(QLatin1String(".lib"), QLatin1String(".dll")));
+                libCandidates << item.replace(".lib",".dll");
+            }
+
+            foreach (QString const& file, libCandidates) {
+                QFileInfo info(file);
+                if (info.exists()) {
+                    qtLibs += info.dir().absoluteFilePath(info.fileName());
+                    break;
+                }
             }
         }
         for (QStringList::ConstIterator it = qtLibs.constBegin(); it != qtLibs.constEnd(); ++it) {
diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp
index ba3ef8d..782f6d9 100644
--- a/tools/qtestlib/wince/cetest/main.cpp
+++ b/tools/qtestlib/wince/cetest/main.cpp
@@ -320,6 +320,7 @@ int main(int argc, char **argv)
     cout << endl << "Remote Launch:" << qPrintable(TestConfiguration::remoteExecutable) << " " << qPrintable(launchArguments.join(" ")) << endl;
     if (!connection.execute(TestConfiguration::remoteExecutable, launchArguments.join(" "), timeout)) {
         cout << "Error: Could not execute target file" << endl;
+        return -1;
     }
 
 
diff --git a/tools/qtestlib/wince/cetest/remoteconnection.cpp b/tools/qtestlib/wince/cetest/remoteconnection.cpp
index 547b211..3d0c3f3 100644
--- a/tools/qtestlib/wince/cetest/remoteconnection.cpp
+++ b/tools/qtestlib/wince/cetest/remoteconnection.cpp
@@ -41,6 +41,38 @@
 
 #include "remoteconnection.h"
 
+QByteArray strwinerror(DWORD errorcode)
+{
+    QByteArray out(512, 0);
+
+    DWORD ok = FormatMessageA(
+        FORMAT_MESSAGE_FROM_SYSTEM,
+        0,
+        errorcode,
+        0,
+        out.data(),
+        out.size(),
+        0
+    );
+
+    if (!ok) {
+        qsnprintf(out.data(), out.size(),
+            "(error %d; additionally, error %d while looking up error string)",
+            (int)errorcode, (int)GetLastError());
+    }
+    else {
+        out.resize(qstrlen(out.constData()));
+        if (out.endsWith("\r\n"))
+            out.chop(2);
+
+        /* Append error number to error message for good measure */
+        out.append(" (0x");
+        out.append(QByteArray::number(uint(errorcode), 16).rightJustified(8, '0'));
+        out.append(")");
+    }
+    return out;
+}
+
 AbstractRemoteConnection::AbstractRemoteConnection()
 {
 }
diff --git a/tools/qtestlib/wince/cetest/remoteconnection.h b/tools/qtestlib/wince/cetest/remoteconnection.h
index 9c3e63d..f517009 100644
--- a/tools/qtestlib/wince/cetest/remoteconnection.h
+++ b/tools/qtestlib/wince/cetest/remoteconnection.h
@@ -79,4 +79,6 @@ public:
     virtual bool execute(QString program, QString arguments = QString(), int timeout = -1, int *returnValue = NULL) = 0;
 };
 
+QByteArray strwinerror(DWORD);
+
 #endif
diff --git a/tools/qtestlib/wince/remotelib/commands.cpp b/tools/qtestlib/wince/remotelib/commands.cpp
index 3aed2d6..f2176dd 100644
--- a/tools/qtestlib/wince/remotelib/commands.cpp
+++ b/tools/qtestlib/wince/remotelib/commands.cpp
@@ -56,6 +56,7 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
     wchar_t* arguments = 0;
     int timeout = -1;
     int returnValue = -2;
+    DWORD error = 0;
 
     if (S_OK != stream->Read(&appLength, sizeof(appLength), &bytesRead))
         CLEAN_FAIL(-2);
@@ -74,11 +75,13 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
     if (S_OK != stream->Read(&timeout, sizeof(timeout), &bytesRead))
         CLEAN_FAIL(-2);
 
-    bool result = qRemoteExecute(appName, arguments, &returnValue, timeout);
+    bool result = qRemoteExecute(appName, arguments, &returnValue, &error, timeout);
 
     if (timeout != 0) {
         if (S_OK != stream->Write(&returnValue, sizeof(returnValue), &bytesRead))
             CLEAN_FAIL(-4);
+        if (S_OK != stream->Write(&error, sizeof(error), &bytesRead))
+            CLEAN_FAIL(-5);
     }
     delete appName;
     delete arguments;
@@ -90,13 +93,16 @@ int qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
 }
 
 
-bool qRemoteExecute(const wchar_t* program, const wchar_t* arguments, int *returnValue, int timeout)
+bool qRemoteExecute(const wchar_t* program, const wchar_t* arguments, int *returnValue, DWORD* error, int timeout)
 {
+    *error = 0;
+
     if (!program)
         return false;
 
     PROCESS_INFORMATION pid;
     if (!CreateProcess(program, arguments, NULL, NULL, false, 0, NULL, NULL, NULL, &pid)) {
+        *error = GetLastError();
         wprintf(L"Could not launch: %s\n", program);
         return false;
     }
diff --git a/tools/qtestlib/wince/remotelib/commands.h b/tools/qtestlib/wince/remotelib/commands.h
index 9f0b2e3..5275f2c 100644
--- a/tools/qtestlib/wince/remotelib/commands.h
+++ b/tools/qtestlib/wince/remotelib/commands.h
@@ -45,7 +45,7 @@
 
 extern "C" {
     int __declspec(dllexport) qRemoteLaunch(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream*);
-    bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , int timeout = -1);
+    bool __declspec(dllexport) qRemoteExecute(const wchar_t* program, const wchar_t* arguments = NULL, int *returnValue = NULL , DWORD* error = NULL, int timeout = -1);
 }
 
 #endif
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