Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (123 commits)
  Added missing tests to tests/auto/*.pro
  Compile with DirectFB version >= 1.2.0 && < 1.2.9
  QDirectFBPaintEngine optimization
  Add some warnings when using DISABLE/WARN in DFB
  Fix build with Mesa 7.8's EGL implementatioon
  Reset the byte order in the iconv codec after using it.
  fix "using namespace" recursion crash
  Fix for QTBUG-6659 Parent window accepts pointer events wrongly
  If no IAP defined force IAP dialog
  Fixed key mappings on X11
  QDom: prevent infinite loop when cloning a DTD
  Compile fix for Windows Mobile and OpenGLES2
  QPrintPreviewDialog number of pages is partially blocked from view in OSX
  QS60Style ignores widget palette when drawing highlighted widget text
  Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes.
  Fixed crash at application exit when QProcess was used in Symbian
  QMessageBox is not stretched to screen width if the content is narrow
  Wrong dirty region after row selection in right-to-left mode in QTableView
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
  Tab to space fixes to qdilaog.cpp
  ...

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp
index 76903e5..0f6cdaa 100644
--- a/tests/auto/qdom/tst_qdom.cpp
+++ b/tests/auto/qdom/tst_qdom.cpp
@@ -131,6 +131,7 @@ private slots:
     void setContentWhitespace_data() const;
 
     void taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() const;
+    void cloneDTD_QTBUG8398() const;
 
     void cleanupTestCase() const;
 
@@ -1908,5 +1909,29 @@ void tst_QDom::taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() co
     QVERIFY(true);
 }
 
+void tst_QDom::cloneDTD_QTBUG8398() const
+{
+    QString dtd("<?xml version='1.0' encoding='UTF-8'?>\n"
+                   "<!DOCTYPE first [\n"
+                   "<!ENTITY secondFile SYSTEM 'second.xml'>\n"
+                   "<!ENTITY thirdFile SYSTEM 'third.xml'>\n"
+                   "]>\n"
+                   "<first/>\n");
+    QDomDocument domDocument;
+    QVERIFY(domDocument.setContent(dtd));
+    QDomDocument domDocument2 = domDocument.cloneNode(true).toDocument();
+
+    // for some reason, our DOM implementation reverts the order of entities
+    QString expected("<?xml version='1.0' encoding='UTF-8'?>\n"
+                   "<!DOCTYPE first [\n"
+                   "<!ENTITY thirdFile SYSTEM 'third.xml'>\n"
+                   "<!ENTITY secondFile SYSTEM 'second.xml'>\n"
+                   "]>\n"
+                   "<first/>\n");
+    QString output;
+    QTextStream stream(&output);
+    domDocument2.save(stream, 0);
+    QCOMPARE(output, expected);
+}
 QTEST_MAIN(tst_QDom)
 #include "tst_qdom.moc"