Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix stack overwrite in QDBusDemarshaller
  Qt Linguist: Fix crashes
  fixed error generating wrong introspection string in header output file

5 files changed, 22 insertions, 10 deletions

diff --git a/tools/linguist/linguist/messageeditor.cpp b/tools/linguist/linguist/messageeditor.cpp
index 87c2f4a..2888290 100644
--- a/tools/linguist/linguist/messageeditor.cpp
+++ b/tools/linguist/linguist/messageeditor.cpp
@@ -262,7 +262,6 @@ void MessageEditor::addPluralForm(int model, const QString &label, bool writable
 {
     FormMultiWidget *transEditor = new FormMultiWidget(label);
     connect(transEditor, SIGNAL(editorCreated(QTextEdit*)), SLOT(editorCreated(QTextEdit*)));
-    connect(transEditor, SIGNAL(editorDeleted(QTextEdit*)), SLOT(editorDeleted(QTextEdit*)));
     transEditor->setEditingEnabled(writable);
     transEditor->setHideWhenEmpty(!writable);
     if (!m_editors[model].transTexts.isEmpty())
@@ -299,9 +298,9 @@ void MessageEditor::editorCreated(QTextEdit *te)
     }
 }
 
-void MessageEditor::editorDeleted(QTextEdit *te)
+void MessageEditor::editorDestroyed()
 {
-    if (m_selectionHolder == te)
+    if (m_selectionHolder == sender())
         resetSelection();
 }
 
@@ -352,9 +351,13 @@ static void clearSelection(QTextEdit *t)
 void MessageEditor::selectionChanged(QTextEdit *te)
 {
     if (te != m_selectionHolder) {
-        if (m_selectionHolder)
+        if (m_selectionHolder) {
             clearSelection(m_selectionHolder);
+            disconnect(this, SLOT(editorDestroyed()));
+        }
         m_selectionHolder = (te->textCursor().hasSelection() ? te : 0);
+        if (FormatTextEdit *fte = qobject_cast<FormatTextEdit*>(m_selectionHolder))
+            connect(fte, SIGNAL(editorDestroyed()), SLOT(editorDestroyed()));
         updateCanCutCopy();
     }
 }
@@ -371,6 +374,7 @@ void MessageEditor::resetSelection()
 {
     if (m_selectionHolder) {
         clearSelection(m_selectionHolder);
+        disconnect(this, SLOT(editorDestroyed()));
         m_selectionHolder = 0;
         updateCanCutCopy();
     }
diff --git a/tools/linguist/linguist/messageeditor.h b/tools/linguist/linguist/messageeditor.h
index 21b3405..0fbf658 100644
--- a/tools/linguist/linguist/messageeditor.h
+++ b/tools/linguist/linguist/messageeditor.h
@@ -114,7 +114,7 @@ public slots:
 
 private slots:
     void editorCreated(QTextEdit *);
-    void editorDeleted(QTextEdit *);
+    void editorDestroyed();
     void selectionChanged(QTextEdit *);
     void resetHoverSelection();
     void emitTranslationChanged(QTextEdit *);
diff --git a/tools/linguist/linguist/messageeditorwidgets.cpp b/tools/linguist/linguist/messageeditorwidgets.cpp
index 29df673..042ef3d 100644
--- a/tools/linguist/linguist/messageeditorwidgets.cpp
+++ b/tools/linguist/linguist/messageeditorwidgets.cpp
@@ -130,6 +130,11 @@ FormatTextEdit::FormatTextEdit(QWidget *parent)
     m_highlighter = new MessageHighlighter(this);
 }
 
+FormatTextEdit::~FormatTextEdit()
+{
+    emit editorDestroyed();
+}
+
 void FormatTextEdit::setEditable(bool editable)
 {
     // save default frame style
@@ -362,11 +367,9 @@ void FormMultiWidget::setTranslation(const QString &text, bool userAction)
     QStringList texts = text.split(QChar(Translator::BinaryVariantSeparator), QString::KeepEmptyParts);
 
     while (m_editors.count() > texts.count()) {
-        FormatTextEdit *editor = m_editors.takeLast();
-        emit editorDeleted(editor);
         delete m_minusButtons.takeLast();
         delete m_plusButtons.takeLast();
-        delete editor;
+        delete m_editors.takeLast();
     }
     while (m_editors.count() < texts.count())
         addEditor(m_editors.count());
diff --git a/tools/linguist/linguist/messageeditorwidgets.h b/tools/linguist/linguist/messageeditorwidgets.h
index 1f6f1f5..c6d9201 100644
--- a/tools/linguist/linguist/messageeditorwidgets.h
+++ b/tools/linguist/linguist/messageeditorwidgets.h
@@ -91,8 +91,12 @@ class FormatTextEdit : public ExpandingTextEdit
     Q_OBJECT
 public:
     FormatTextEdit(QWidget *parent = 0);
+    ~FormatTextEdit();
     void setEditable(bool editable);
 
+signals:
+    void editorDestroyed();
+
 public slots:
     void setPlainText(const QString & text, bool userAction);
 
@@ -150,7 +154,6 @@ public:
 
 signals:
     void editorCreated(QTextEdit *);
-    void editorDeleted(QTextEdit *);
     void textChanged(QTextEdit *);
     void selectionChanged(QTextEdit *);
     void cursorPositionChanged();
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index bc617a9..9c49183 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -466,11 +466,13 @@ static QString stringify(const QString &data)
     int i;
     for (i = 0; i < data.length(); ++i) {
         retval += QLatin1Char('\"');
-        for ( ; i < data.length() && data[i] != QLatin1Char('\n'); ++i)
+        for ( ; i < data.length() && data[i] != QLatin1Char('\n') && data[i] != QLatin1Char('\r'); ++i)
             if (data[i] == QLatin1Char('\"'))
                 retval += QLatin1String("\\\"");
             else
                 retval += data[i];
+        if (data[i] == QLatin1Char('\r') && data[i+1] == QLatin1Char('\n'))
+            i++;
         retval += QLatin1String("\\n\"\n");
     }
     return retval;