4 files changed, 60 insertions, 16 deletions
diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
index 1a66141ea1..e60d41f5ed 100644
--- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp
+++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
@@ -196,10 +196,10 @@ void tst_QMovie::jumpToFrame()
 
 void tst_QMovie::changeMovieFile()
 {
-    QMovie movie("animations/comicsecard.gif");
+    QMovie movie(QFINDTESTDATA("animations/comicsecard.gif"));
     movie.start();
     movie.stop();
-    movie.setFileName("animations/trolltech.gif");
+    movie.setFileName(QFINDTESTDATA("animations/trolltech.gif"));
     QVERIFY(movie.currentFrameNumber() == -1);
 }
 
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index 7664706b93..0c009ec155 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -54,6 +54,7 @@ private slots:
     void allWindows();
     void topLevelWindows();
     void abortQuitOnShow();
+    void changeFocusWindow();
 };
 
 class DummyWindow : public QWindow
@@ -195,5 +196,49 @@ void tst_QGuiApplication::abortQuitOnShow()
     QCOMPARE(app.exec(), 1);
 }
 
+
+class FocusChangeWindow: public QWindow
+{
+protected:
+    virtual bool event(QEvent *ev)
+    {
+        if (ev->type() == QEvent::FocusAboutToChange)
+            windowDuringFocusAboutToChange = qGuiApp->focusWindow();
+        return QWindow::event(ev);
+    }
+
+    virtual void focusOutEvent(QFocusEvent *)
+    {
+        windowDuringFocusOut = qGuiApp->focusWindow();
+    }
+
+public:
+    FocusChangeWindow() : QWindow(), windowDuringFocusAboutToChange(0), windowDuringFocusOut(0) {}
+
+    QWindow *windowDuringFocusAboutToChange;
+    QWindow *windowDuringFocusOut;
+};
+
+void tst_QGuiApplication::changeFocusWindow()
+{
+    int argc = 0;
+    QGuiApplication app(argc, 0);
+
+    // focus is changed between FocusAboutToChange and FocusChanged
+    FocusChangeWindow window1, window2;
+    window1.show();
+    window2.show();
+    QTest::qWaitForWindowShown(&window1);
+    QTest::qWaitForWindowShown(&window2);
+    window1.requestActivateWindow();
+    QTRY_COMPARE(app.focusWindow(), &window1);
+
+    window2.requestActivateWindow();
+    QTRY_COMPARE(app.focusWindow(), &window2);
+    QCOMPARE(window1.windowDuringFocusAboutToChange, &window1);
+    QCOMPARE(window1.windowDuringFocusOut, &window2);
+}
+
+
 QTEST_APPLESS_MAIN(tst_QGuiApplication)
 #include "tst_qguiapplication.moc"
diff --git a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
index bc364e37f1..3810546146 100644
--- a/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
+++ b/tests/auto/gui/kernel/qinputmethod/tst_qinputmethod.cpp
@@ -110,7 +110,7 @@ public:
     virtual ~tst_qinputmethod() {}
 private slots:
     void initTestCase();
-    void visible();
+    void isVisible();
     void animating();
     void keyboarRectangle();
     void inputItem();
@@ -133,20 +133,20 @@ void tst_qinputmethod::initTestCase()
     inputMethodPrivate->testContext = &m_platformInputContext;
 }
 
-void tst_qinputmethod::visible()
+void tst_qinputmethod::isVisible()
 {
-    QCOMPARE(qApp->inputMethod()->visible(), false);
+    QCOMPARE(qApp->inputMethod()->isVisible(), false);
     qApp->inputMethod()->show();
-    QCOMPARE(qApp->inputMethod()->visible(), true);
+    QCOMPARE(qApp->inputMethod()->isVisible(), true);
 
     qApp->inputMethod()->hide();
-    QCOMPARE(qApp->inputMethod()->visible(), false);
+    QCOMPARE(qApp->inputMethod()->isVisible(), false);
 
     qApp->inputMethod()->setVisible(true);
-    QCOMPARE(qApp->inputMethod()->visible(), true);
+    QCOMPARE(qApp->inputMethod()->isVisible(), true);
 
     qApp->inputMethod()->setVisible(false);
-    QCOMPARE(qApp->inputMethod()->visible(), false);
+    QCOMPARE(qApp->inputMethod()->isVisible(), false);
 }
 
 void tst_qinputmethod::animating()
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index ead4c8e71a..1cedfa5c01 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -630,13 +630,12 @@ void tst_QFont::defaultFamily_data()
     QTest::addColumn<QFont::StyleHint>("styleHint");
     QTest::addColumn<QString>("defaultFamily");
 
-    QTest::newRow("serif") << QFont::Times << "Times";
-    QTest::newRow("courier") << QFont::Courier << "Courier";
-    QTest::newRow("monospace") << QFont::Monospace << "Courier New";
-    QTest::newRow("cursive") << QFont::Cursive << "Comic Sans MS";
-    QTest::newRow("fantasy") << QFont::Fantasy << "Impact";
-    QTest::newRow("old english") << QFont::OldEnglish<< "Old English";
-    QTest::newRow("sans-serif") << QFont::Helvetica << "Helvetica";
+    QTest::newRow("serif") << QFont::Times << "serif";
+    QTest::newRow("monospace") << QFont::Monospace << "monospace";
+    QTest::newRow("sans-serif") << QFont::SansSerif << "sans-serif";
+    QTest::newRow("cursive") << QFont::Cursive << "cursive";
+    QTest::newRow("fantasy") << QFont::Fantasy << "fantasy";
+    QTest::newRow("old english") << QFont::OldEnglish << "Old English";
 }
 
 void tst_QFont::defaultFamily()