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

Conflicts:
	src/gui/inputmethod/qximinputcontext_x11.cpp

4 files changed, 5 insertions, 3 deletions

diff --git a/tools/linguist/linguist/formpreviewview.cpp b/tools/linguist/linguist/formpreviewview.cpp
index 990414b..184f01b 100644
--- a/tools/linguist/linguist/formpreviewview.cpp
+++ b/tools/linguist/linguist/formpreviewview.cpp
@@ -473,7 +473,7 @@ void FormPreviewView::setSourceContext(int model, MessageItem *messageItem)
     }
 
     QDir dir = QFileInfo(m_dataModel->srcFileName(model)).dir();
-    QString fileName = dir.absoluteFilePath(messageItem->fileName());
+    QString fileName = QDir::cleanPath(dir.absoluteFilePath(messageItem->fileName()));
     if (m_lastFormName != fileName) {
         delete m_form;
         m_form = 0;
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 6ee0dd8..84200d4 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1535,7 +1535,7 @@ void MainWindow::selectedMessageChanged(const QModelIndex &sortedIndex, const QM
             } else {
                 m_sourceAndFormView->setCurrentWidget(m_sourceCodeView);
                 QDir dir = QFileInfo(m_dataModel->srcFileName(model)).dir();
-                QString fileName = dir.absoluteFilePath(m->fileName());
+                QString fileName = QDir::cleanPath(dir.absoluteFilePath(m->fileName()));
                 m_sourceCodeView->setSourceContext(fileName, m->lineNumber());
             }
             m_errorsView->setEnabled(true);
diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp
index e858bbb..3fc91e3 100644
--- a/tools/linguist/linguist/messageeditor.cpp
+++ b/tools/linguist/linguist/messageeditor.cpp
@@ -786,6 +786,7 @@ void MessageEditor::selectAll()
 
 void MessageEditor::emitTranslationChanged()
 {
+    static_cast<FormWidget *>(sender())->getEditor()->setFocus(); // DND proofness
     updateBeginFromSource();
     updateUndoRedo();
     emit translationChanged(translations(m_currentModel));
@@ -793,6 +794,7 @@ void MessageEditor::emitTranslationChanged()
 
 void MessageEditor::emitTranslatorCommentChanged()
 {
+    static_cast<FormWidget *>(sender())->getEditor()->setFocus(); // DND proofness
     updateUndoRedo();
     emit translatorCommentChanged(m_editors[m_currentModel].transCommentText->getTranslation());
 }
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index 563c72d..300f6e8 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -243,7 +243,7 @@ bool PhraseBook::load(const QString &fileName, bool *langGuessed)
     // don't click on these!
     reader.setFeature(QLatin1String("http://xml.org/sax/features/namespaces"), false);
     reader.setFeature(QLatin1String("http://xml.org/sax/features/namespace-prefixes"), true);
-    reader.setFeature(QLatin1String("http://qtsoftware.com/xml/features/report-whitespace"
+    reader.setFeature(QLatin1String("http://trolltech.com/xml/features/report-whitespace"
                                     "-only-CharData"), false);
     QphHandler *hand = new QphHandler(this);
     reader.setContentHandler(hand);