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

4 files changed, 175 insertions, 5 deletions

diff --git a/dist/changes-4.5.4 b/dist/changes-4.5.4
new file mode 100644
index 0000000..abaf4f0
--- /dev/null
+++ b/dist/changes-4.5.4
@@ -0,0 +1,123 @@
+Qt 4.5.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.5.0.  For more details,
+refer to the online documentation included in this distribution. The
+documentation is also available online:
+
+  http://doc.trolltech.com/4.5
+
+The Qt version 4.5 series is binary compatible with the 4.4.x series.
+Applications compiled for 4.4 will continue to run with 4.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Task Tracker:
+
+  http://www.qtsoftware.com/developer/task-tracker
+
+Each of these identifiers can be entered in the task tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+- Documentation and Examples
+
+Third party components
+----------------------
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                          Database Drivers                                *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Linux/X11
+----------------
+
+
+Qt for Windows
+--------------
+
+
+Qt for Mac OS X
+---------------
+
+
+Qt for Embedded Linux
+---------------------
+
+
+Qt for Windows CE
+-----------------
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+- Build System
+
+- Assistant
+
+
+- Designer
+
+
+- Linguist
+  - Linguist GUI
+
+  - lupdate
+
+  - lrelease
+
+
+- rcc
+
+
+- moc
+
+
+- uic
+
+
+- uic3
+
+
+- qmake
+
+
+- configure
+
+
+- qtconfig
+
+
+- qt3to4
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                   Important Behavior Changes                             *
+****************************************************************************
+
diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
index be2d882..4e385d5 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
@@ -184,6 +184,10 @@ public:
     virtual ~tst_QAbstractItemView();
     void basic_tests(TestView *view);
 
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+
 private slots:
     void getSetCheck();
     void emptyModels_data();
@@ -320,6 +324,17 @@ tst_QAbstractItemView::~tst_QAbstractItemView()
 {
 }
 
+void tst_QAbstractItemView::initTestCase()
+{
+#ifdef Q_OS_WINCE_WM
+    qApp->setAutoMaximizeThreshold(-1);
+#endif
+}
+
+void tst_QAbstractItemView::cleanupTestCase()
+{
+}
+
 void tst_QAbstractItemView::emptyModels_data()
 {
     QTest::addColumn<QString>("viewType");
@@ -1198,13 +1213,10 @@ void tst_QAbstractItemView::task250754_fontChange()
     QFont font = tree.font();
     font.setPointSize(5);
     tree.setFont(font);
-    QTest::qWait(30);
-
     QTRY_VERIFY(!tree.verticalScrollBar()->isVisible());
 
     font.setPointSize(45);
     tree.setFont(font);
-    QTest::qWait(30);
     //now with the huge items, the scrollbar must be visible
     QTRY_VERIFY(tree.verticalScrollBar()->isVisible());
 
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index ce1281f..674064f 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 c7f50d4..150f131 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");