Merge branch '4.5' into 4.6

Conflicts:
	src/corelib/global/qglobal.h
	src/plugins/qpluginbase.pri
	src/qbase.pri
	tests/auto/qabstractitemview/tst_qabstractitemview.cpp
	tests/auto/qcssparser/qcssparser.pro
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

2 files changed, 37 insertions, 2 deletions

diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index ce1281fd39..674064fc83 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -3,7 +3,6 @@ SOURCES += tst_qcssparser.cpp
 QT += xml
 
 requires(contains(QT_CONFIG,private_tests))
-
 !symbian: {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
@@ -11,5 +10,8 @@ requires(contains(QT_CONFIG,private_tests))
 wince*|symbian: {
    addFiles.sources = testdata
    addFiles.path = .
-   DEPLOYMENT += addFiles
+   timesFont.sources = C:/Windows/Fonts/times.ttf
+   timesFont.path = .
+   DEPLOYMENT += addFiles timesFont
 }
+
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index c7f50d4059..150f131f02 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -40,6 +40,9 @@
 ****************************************************************************/
 #include <QtTest/QtTest>
 #include <QtXml/QtXml>
+#if defined(Q_OS_WINCE)
+#include <QtGui/QFontDatabase>
+#endif
 
 //TESTED_CLASS=QCss
 //TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h
@@ -49,6 +52,11 @@
 class tst_QCssParser : public QObject
 {
     Q_OBJECT
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
 private slots:
     void scanner_data();
     void scanner();
@@ -91,8 +99,33 @@ private slots:
     void extractBorder();
     void noTextDecoration();
     void quotedAndUnquotedIdentifiers();
+
+private:
+#if defined(Q_OS_WINCE)
+    int m_timesFontId;
+#endif
 };
 
+void tst_QCssParser::initTestCase()
+{
+#if defined(Q_OS_WINCE)
+    QFontDatabase fontDB;
+    m_timesFontId = -1;
+    if (!fontDB.families().contains("Times New Roman")) {
+        m_timesFontId = QFontDatabase::addApplicationFont("times.ttf");
+        QVERIFY(m_timesFontId != -1);
+    }
+#endif
+}
+
+void tst_QCssParser::cleanupTestCase()
+{
+#if defined(Q_OS_WINCE)
+    if (m_timesFontId != -1)
+        QFontDatabase::removeApplicationFont(m_timesFontId);
+#endif
+}
+
 void tst_QCssParser::scanner_data()
 {
     QTest::addColumn<QString>("input");