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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Optimize plugin loading on ELF platforms
  Fix compiler warning in qtextformat.h
  Add gdb-index section to debug binaries.
  Clean up and clarify Mac font engine code
  Implemented suffix and prefix strings for the numbering in ordered lists as supported by ODF. Works also with HTML import/export by using Qt CSS properties extensions.

12 files changed, 144 insertions, 0 deletions

diff --git a/tests/auto/qpluginloader/elftest/.gitattributes b/tests/auto/qpluginloader/elftest/.gitattributes
new file mode 100644
index 0000000..891192c
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/.gitattributes
@@ -0,0 +1,10 @@
+corrupt1.elf64.so   set  -crlf -diff
+corrupt2.elf64.so  set  -crlf -diff
+corrupt3.elf64.so  set  -crlf -diff
+debugobj.so  set  -crlf -diff
+garbage1.so  set  -crlf -diff
+garbage2.so  set  -crlf -diff
+garbage3.so  set  -crlf -diff
+garbage4.so  set  -crlf -diff
+garbage5.so set  -crlf -diff
+
diff --git a/tests/auto/qpluginloader/elftest/corrupt1.elf64.so b/tests/auto/qpluginloader/elftest/corrupt1.elf64.so
new file mode 100755
index 0000000..12ce736
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/corrupt1.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt2.elf64.so b/tests/auto/qpluginloader/elftest/corrupt2.elf64.so
new file mode 100755
index 0000000..11fdc2c
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/corrupt2.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt3.elf64.so b/tests/auto/qpluginloader/elftest/corrupt3.elf64.so
new file mode 100755
index 0000000..94a2bc3
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/corrupt3.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/debugobj.so b/tests/auto/qpluginloader/elftest/debugobj.so
new file mode 100644
index 0000000..f0ee056
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/debugobj.so
diff --git a/tests/auto/qpluginloader/elftest/garbage1.so b/tests/auto/qpluginloader/elftest/garbage1.so
new file mode 100644
index 0000000..0c74530
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/garbage1.so
@@ -0,0 +1,4 @@
+p��������cdL+����&��&��e���=���
+�o�ÒʎI��ٝ�mg�]!�Z
+L'�)t�
+�N��(e��P)Y8�G �6�-y�������"��Z���k�4�?�^�n����5$���Y=��#y
\ No newline at end of file
diff --git a/tests/auto/qpluginloader/elftest/garbage2.so b/tests/auto/qpluginloader/elftest/garbage2.so
new file mode 100644
index 0000000..c06338e
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/garbage2.so
@@ -0,0 +1 @@
+��v.�Y���tK�W3
\ No newline at end of file
diff --git a/tests/auto/qpluginloader/elftest/garbage3.so b/tests/auto/qpluginloader/elftest/garbage3.so
new file mode 100644
index 0000000..a24c523
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/garbage3.so
@@ -0,0 +1 @@
+���Ȃ�T-�����ڥ	���쾜�i�8�_�x����I��׮�x�=��4@��[����B�KS$�
\ No newline at end of file
diff --git a/tests/auto/qpluginloader/elftest/garbage4.so b/tests/auto/qpluginloader/elftest/garbage4.so
new file mode 100644
index 0000000..4f45cf5
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/garbage4.so
@@ -0,0 +1 @@
+�!�\~�U�u��:9�����T�+91�Q�E��ǚx�ng5��zh�����^t�����'��mm*ˈdXH;vw+�G�����
�9L�0!
\ No newline at end of file
diff --git a/tests/auto/qpluginloader/elftest/garbage5.so b/tests/auto/qpluginloader/elftest/garbage5.so
new file mode 100644
index 0000000..f8c0a1d
--- /dev/null
+++ b/tests/auto/qpluginloader/elftest/garbage5.so
@@ -0,0 +1,2 @@
+����Q�
+�-�9�
\ No newline at end of file
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp
index 1e382b8..46fce5e 100644
--- a/tests/auto/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp
@@ -123,6 +123,9 @@ private slots:
     void loadHints();
     void deleteinstanceOnUnload();
     void checkingStubsFromDifferentDrives();
+    void loadDebugObj();
+    void loadCorruptElf();
+    void loadGarbage();
 };
 
 tst_QPluginLoader::tst_QPluginLoader()
@@ -350,5 +353,54 @@ void tst_QPluginLoader::checkingStubsFromDifferentDrives()
 #endif//Q_OS_SYMBIAN
 }
 
+void tst_QPluginLoader::loadDebugObj()
+{
+#if defined (__ELF__)
+    QVERIFY(QFile::exists(SRCDIR "elftest/debugobj.so"));
+    QPluginLoader lib1(SRCDIR "elftest/debugobj.so");
+    QCOMPARE(lib1.load(), false);
+#endif
+}
+
+void tst_QPluginLoader::loadCorruptElf()
+{
+#if defined (__ELF__)
+if (sizeof(void*) == 8) {
+    QVERIFY(QFile::exists(SRCDIR "elftest/corrupt1.elf64.so"));
+
+    QPluginLoader lib1(SRCDIR "elftest/corrupt1.elf64.so");
+    QCOMPARE(lib1.load(), false);
+    QVERIFY(lib1.errorString().contains("not an ELF object"));
+
+    QPluginLoader lib2(SRCDIR "elftest/corrupt2.elf64.so");
+    QCOMPARE(lib2.load(), false);
+    QVERIFY(lib2.errorString().contains("invalid"));
+
+    QPluginLoader lib3(SRCDIR "elftest/corrupt3.elf64.so");
+    QCOMPARE(lib3.load(), false);
+    QVERIFY(lib3.errorString().contains("invalid"));
+} else if (sizeof(void*) == 4) {
+    QPluginLoader libW(SRCDIR "elftest/corrupt3.elf64.so");
+    QCOMPARE(libW.load(), false);
+    QVERIFY(libW.errorString().contains("architecture"));
+} else {
+    QFAIL("Please port QElfParser to this platform or blacklist this test.");
+}
+#endif
+}
+
+void tst_QPluginLoader::loadGarbage()
+{
+#if defined (Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
+    for (int i=0; i<5; i++) {
+        QPluginLoader lib(QString(SRCDIR "elftest/garbage%1.so").arg(i));
+        QCOMPARE(lib.load(), false);
+#ifdef SHOW_ERRORS
+        qDebug() << lib.errorString();
+#endif
+    }
+#endif
+}
+
 QTEST_APPLESS_MAIN(tst_QPluginLoader)
 #include "tst_qpluginloader.moc"
diff --git a/tests/auto/qtextlist/tst_qtextlist.cpp b/tests/auto/qtextlist/tst_qtextlist.cpp
index 3e92836..8ad0898 100644
--- a/tests/auto/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/qtextlist/tst_qtextlist.cpp
@@ -67,6 +67,9 @@ private slots:
     void item();
     void autoNumbering();
     void autoNumberingRTL();
+    void autoNumberingPrefixAndSuffix();
+    void autoNumberingPrefixAndSuffixRTL();
+    void autoNumberingPrefixAndSuffixHtmlExportImport();
     void romanNumbering();
     void romanNumberingLimit();
     void formatChange();
@@ -128,6 +131,76 @@ void tst_QTextList::autoNumbering()
     QVERIFY(cursor.currentList()->itemText(cursor.block()) == "ab.");
 }
 
+void tst_QTextList::autoNumberingPrefixAndSuffix()
+{
+    QTextListFormat fmt;
+    fmt.setStyle(QTextListFormat::ListLowerAlpha);
+    fmt.setNumberPrefix("-");
+    fmt.setNumberSuffix(")");
+    QTextList *list = cursor.createList(fmt);
+    QVERIFY(list);
+
+    for (int i = 0; i < 27; ++i)
+        cursor.insertBlock();
+
+    QVERIFY(list->count() == 28);
+
+    QVERIFY(cursor.currentList());
+    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 27);
+    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "-ab)");
+}
+
+void tst_QTextList::autoNumberingPrefixAndSuffixRTL()
+{
+    QTextBlockFormat bfmt;
+    bfmt.setLayoutDirection(Qt::RightToLeft);
+    cursor.setBlockFormat(bfmt);
+
+    QTextListFormat fmt;
+    fmt.setStyle(QTextListFormat::ListUpperAlpha);
+    fmt.setNumberPrefix("-");
+    fmt.setNumberSuffix("*");
+    QTextList *list = cursor.createList(fmt);
+    QVERIFY(list);
+
+    cursor.insertBlock();
+
+    QVERIFY(list->count() == 2);
+
+    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "*B-");
+}
+
+void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
+{
+    QTextListFormat fmt;
+    fmt.setStyle(QTextListFormat::ListLowerAlpha);
+    fmt.setNumberPrefix("\"");
+    fmt.setNumberSuffix("#");
+    fmt.setIndent(10);
+    // FIXME: Would like to test "'" but there's a problem in the css parser (Scanner::preprocess
+    // is called before the values are being parsed), so the quoting does not work.
+    QTextList *list = cursor.createList(fmt);
+    QVERIFY(list);
+
+    for (int i = 0; i < 27; ++i)
+        cursor.insertBlock();
+
+    QVERIFY(list->count() == 28);
+
+    QString htmlExport = doc->toHtml();
+    QTextDocument importDoc;
+    importDoc.setHtml(htmlExport);
+
+    QTextCursor importCursor(&importDoc);
+    for (int i = 0; i < 27; ++i)
+        importCursor.movePosition(QTextCursor::NextBlock);
+
+    QVERIFY(importCursor.currentList());
+    QVERIFY(importCursor.currentList()->itemNumber(importCursor.block()) == 27);
+    QVERIFY(importCursor.currentList()->itemText(importCursor.block()) == "\"ab#");
+    QVERIFY(importCursor.currentList()->format().indent() == 10);
+}
+
 void tst_QTextList::autoNumberingRTL()
 {
     QTextBlockFormat bfmt;