Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

13 files changed, 107 insertions, 455 deletions

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 52f333b..1e7708c 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -577,7 +577,7 @@
 #include <QtGui/qpixmapcache.h>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qevent.h>
-#include <QInputContext>
+#include <QtGui/qinputcontext.h>
 
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicswidget_p.h>
@@ -8995,7 +8995,42 @@ bool QGraphicsTextItem::sceneEvent(QEvent *event)
             return true;
         }
     }
-    return QGraphicsItem::sceneEvent(event);
+    bool result = QGraphicsItem::sceneEvent(event);
+
+    // Ensure input context is updated.
+    switch (event->type()) {
+    case QEvent::ContextMenu:
+    case QEvent::FocusIn:
+    case QEvent::FocusOut:
+    case QEvent::GraphicsSceneDragEnter:
+    case QEvent::GraphicsSceneDragLeave:
+    case QEvent::GraphicsSceneDragMove:
+    case QEvent::GraphicsSceneDrop:
+    case QEvent::GraphicsSceneHoverEnter:
+    case QEvent::GraphicsSceneHoverLeave:
+    case QEvent::GraphicsSceneHoverMove:
+    case QEvent::GraphicsSceneMouseDoubleClick:
+    case QEvent::GraphicsSceneMousePress:
+    case QEvent::GraphicsSceneMouseMove:
+    case QEvent::GraphicsSceneMouseRelease:
+    case QEvent::KeyPress:
+    case QEvent::KeyRelease:
+        // Reset the focus widget's input context, regardless
+        // of how this item gained or lost focus.
+        if (QWidget *fw = qApp->focusWidget()) {
+            if (QInputContext *qic = fw->inputContext()) {
+                if (event->type() == QEvent::FocusIn || event->type() == QEvent::FocusOut)
+                    qic->reset();
+                else
+                    qic->update();
+            }
+        }
+        break;
+    default:
+        break;
+    }
+
+    return result;
 }
 
 /*!
@@ -9021,11 +9056,6 @@ void QGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
     }
 
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9039,11 +9069,6 @@ void QGraphicsTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     }
 
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9072,14 +9097,7 @@ void QGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         QGraphicsItem::mouseReleaseEvent(event);
     }
     dd->clickCausedFocus = 0;
-
     dd->sendControlEvent(event);
-
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9098,11 +9116,6 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
     }
 
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9111,11 +9124,6 @@ void QGraphicsTextItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9124,18 +9132,6 @@ void QGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
-    QList<QGraphicsView *> views = scene()->views();
-    for (int i = 0; i < views.size(); ++i) {
-        QGraphicsView *view = views.at(i);
-        Q_ASSERT(view->viewport());
-        if(view->viewport()->hasFocus()) {
-            QInputContext *qic = view->viewport()->inputContext();
-            if(qic){
-               qic->update();
-            }
-            break;
-        }
-    }
 }
 
 /*!
@@ -9144,18 +9140,6 @@ void QGraphicsTextItem::keyPressEvent(QKeyEvent *event)
 void QGraphicsTextItem::keyReleaseEvent(QKeyEvent *event)
 {
     dd->sendControlEvent(event);
-    QList<QGraphicsView *> views = scene()->views();
-    for (int i = 0; i < views.size(); ++i) {
-        QGraphicsView *view = views.at(i);
-        Q_ASSERT(view->viewport());
-        if(view->viewport()->hasFocus()) {
-            QInputContext *qic = view->viewport()->inputContext();
-            if(qic){
-               qic->update();
-            }
-            break;
-        }
-    }
 }
 
 /*!
@@ -9168,18 +9152,6 @@ void QGraphicsTextItem::focusInEvent(QFocusEvent *event)
         dd->clickCausedFocus = 1;
     }
     update();
-    QList<QGraphicsView *> views = scene()->views();
-    for (int i = 0; i < views.size(); ++i) {
-        QGraphicsView *view = views.at(i);
-        Q_ASSERT(view->viewport());
-        if(view->viewport()->hasFocus()) {
-            QInputContext *qic = view->viewport()->inputContext();
-            if(qic){
-               qic->reset();
-            }
-            break;
-        }
-    }
 }
 
 /*!
@@ -9189,18 +9161,6 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 {
     dd->sendControlEvent(event);
     update();
-    QList<QGraphicsView *> views = scene()->views();
-    for (int i = 0; i < views.size(); ++i) {
-        QGraphicsView *view = views.at(i);
-        Q_ASSERT(view->viewport());
-        if(view->viewport()->hasFocus()) {
-            QInputContext *qic = view->viewport()->inputContext();
-            if(qic){
-               qic->reset();
-            }
-            break;
-        }
-    }
 }
 
 /*!
@@ -9209,11 +9169,6 @@ void QGraphicsTextItem::focusOutEvent(QFocusEvent *event)
 void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9222,11 +9177,6 @@ void QGraphicsTextItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9235,11 +9185,6 @@ void QGraphicsTextItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9248,11 +9193,6 @@ void QGraphicsTextItem::dragMoveEvent(QGraphicsSceneDragDropEvent *event)
 void QGraphicsTextItem::dropEvent(QGraphicsSceneDragDropEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9269,11 +9209,6 @@ void QGraphicsTextItem::inputMethodEvent(QInputMethodEvent *event)
 void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9282,11 +9217,6 @@ void QGraphicsTextItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
@@ -9295,11 +9225,6 @@ void QGraphicsTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 void QGraphicsTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 {
     dd->sendControlEvent(event);
-    Q_ASSERT(event->widget());
-    QInputContext *qic = event->widget()->inputContext();
-    if(qic) {
-        qic->update();
-    }
 }
 
 /*!
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 5d8bce5..0af1070 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -1007,10 +1007,10 @@ QList<QGraphicsItem *> QGraphicsViewPrivate::findItems(const QRegion &exposedReg
 void QGraphicsViewPrivate::updateInputMethodSensitivity()
 {
     Q_Q(QGraphicsView);
-    q->setAttribute(
-        Qt::WA_InputMethodEnabled,
-        scene && scene->focusItem()
-        && scene->focusItem()->flags() & QGraphicsItem::ItemAcceptsInputMethod);
+    bool enabled = scene && scene->focusItem()
+                   && (scene->focusItem()->flags() & QGraphicsItem::ItemAcceptsInputMethod);
+    q->setAttribute(Qt::WA_InputMethodEnabled, enabled);
+    q->viewport()->setAttribute(Qt::WA_InputMethodEnabled, enabled);
 }
 
 /*!
@@ -1022,16 +1022,8 @@ QGraphicsView::QGraphicsView(QWidget *parent)
     setViewport(0);
     setAcceptDrops(true);
     setBackgroundRole(QPalette::Base);
-
-    // ### Ideally this would be enabled/disabled depending on whether any
-    // widgets in the current scene enabled input methods. We could do that
-    // using a simple reference count. The same goes for acceptDrops and mouse
-    // tracking.
+    // Investigate leaving these disabled by default.
     setAttribute(Qt::WA_InputMethodEnabled);
-
-    // viewport part of the graphics view has to be enabled
-    // as well, because when events come this widget is asked
-    // for input context and so on
     viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
@@ -1046,11 +1038,8 @@ QGraphicsView::QGraphicsView(QGraphicsScene *scene, QWidget *parent)
     setViewport(0);
     setAcceptDrops(true);
     setBackgroundRole(QPalette::Base);
+    // Investigate leaving these disabled by default.
     setAttribute(Qt::WA_InputMethodEnabled);
-
-    // viewport part of the graphics view has to be enabled
-    // as well, because when events come this widget is asked
-    // for input context and so on
     viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
@@ -1063,11 +1052,8 @@ QGraphicsView::QGraphicsView(QGraphicsViewPrivate &dd, QWidget *parent)
     setViewport(0);
     setAcceptDrops(true);
     setBackgroundRole(QPalette::Base);
+    // Investigate leaving these disabled by default.
     setAttribute(Qt::WA_InputMethodEnabled);
-
-    // viewport part of the graphics view has to be enabled
-    // as well, because when events come this widget is asked
-    // for input context and so on
     viewport()->setAttribute(Qt::WA_InputMethodEnabled);
 }
 
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index d33cdf0..cba41da 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -85,7 +85,12 @@ QT_BEGIN_NAMESPACE
 
 extern int qt_defaultDpiY(); // in qfont.cpp
 
-Q_GUI_EXPORT bool qt_enable_test_font = false;
+bool qt_enable_test_font = false;
+
+Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value)
+{
+    qt_enable_test_font = value;
+}
 
 static int getFontWeight(const QString &weightString)
 {
@@ -2588,7 +2593,7 @@ QStringList QFontDatabase::applicationFontFamilies(int id)
     \sa removeApplicationFont(), addApplicationFont(), addApplicationFontFromData()
 */
 
-/*! 
+/*!
     \fn bool QFontDatabase::supportsThreadedFontRendering()
     \since 4.4
 
diff --git a/tests/auto/qkeyevent/.gitignore b/tests/auto/qkeyevent/.gitignore
deleted file mode 100644
index 8d69f55..0000000
--- a/tests/auto/qkeyevent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qkeyevent
diff --git a/tests/auto/qkeyevent/qkeyevent.pro b/tests/auto/qkeyevent/qkeyevent.pro
deleted file mode 100644
index 8a3dc12..0000000
--- a/tests/auto/qkeyevent/qkeyevent.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-HEADERS += 
-SOURCES += tst_qkeyevent.cpp 
-
-
diff --git a/tests/auto/qkeyevent/tst_qkeyevent.cpp b/tests/auto/qkeyevent/tst_qkeyevent.cpp
deleted file mode 100644
index 9adf97c..0000000
--- a/tests/auto/qkeyevent/tst_qkeyevent.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-#include <QtTest/QtTest>
-#include <qevent.h>
-#include <qapplication.h>
-
-
-#include <qevent.h>
-
-//TESTED_CLASS=
-//TESTED_FILES=gui/itemviews/qitemselectionmodel.h gui/itemviews/qitemselectionmodel.cpp
-
-class KeyEventWidget : public QWidget
-{
-public:
-    KeyEventWidget( QWidget* parent = 0, const char* name = 0 );
-    ~KeyEventWidget();
-    QKeyEvent* getLastKeyPress();
-    QKeyEvent* getLastKeyRelease();
-    bool recievedKeyPress;
-    bool recievedKeyRelease;
-protected:
-    void keyPressEvent( QKeyEvent* e );
-    void keyReleaseEvent( QKeyEvent* e );
-private:
-    QKeyEvent* lastKeyPress;
-    QKeyEvent* lastKeyRelease;
-};
-
-class tst_QKeyEvent : public QObject
-{
-    Q_OBJECT
-public:
-    tst_QKeyEvent();
-    ~tst_QKeyEvent();
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-private slots:
-    void sendRecieveKeyEvents_data();
-    void sendRecieveKeyEvents();
-    void standardKey();
-private:
-    KeyEventWidget* testWidget;
-};
-
-
-KeyEventWidget::KeyEventWidget( QWidget* parent, const char* name )
-    : QWidget( parent ), recievedKeyPress( false ), recievedKeyRelease( false ),
-    lastKeyPress( 0 ), lastKeyRelease( 0 )
-{
-    setObjectName(name);
-}
-
-KeyEventWidget::~KeyEventWidget()
-{
-    delete lastKeyPress;
-    delete lastKeyRelease;
-}
-
-QKeyEvent* KeyEventWidget::getLastKeyPress()
-{
-    return lastKeyPress;
-}
-
-QKeyEvent* KeyEventWidget::getLastKeyRelease()
-{
-    return lastKeyRelease;
-}
-
-void KeyEventWidget::keyPressEvent( QKeyEvent* e )
-{
-    if (lastKeyPress)
-        delete lastKeyPress;
-    lastKeyPress = new QKeyEvent(*e);
-    recievedKeyPress = true;
-}
-
-void KeyEventWidget::keyReleaseEvent( QKeyEvent* e )
-{
-    if (lastKeyRelease)
-        delete lastKeyRelease;
-    lastKeyRelease = new QKeyEvent(*e);
-    recievedKeyRelease = true;
-}
-
-tst_QKeyEvent::tst_QKeyEvent()
-{
-}
-
-tst_QKeyEvent::~tst_QKeyEvent()
-{
-}
-
-void tst_QKeyEvent::initTestCase()
-{
-    testWidget = new KeyEventWidget( 0 );
-    testWidget->show();
-}
-
-void tst_QKeyEvent::cleanupTestCase()
-{
-    delete testWidget;
-}
-
-void tst_QKeyEvent::sendRecieveKeyEvents_data()
-{
-    QTest::addColumn<int>("key");
-    QTest::addColumn<bool>("textExpected");
-    QTest::addColumn<QString>("text");
-    int a;
-    for ( a = Qt::Key_Escape; a < Qt::Key_Direction_R; a++ ) {
-	if ( ( a > Qt::Key_Clear && a < Qt::Key_Home )
-	    || ( a > Qt::Key_PageDown && a < Qt::Key_Shift )
-	    || ( a > Qt::Key_ScrollLock && a < Qt::Key_F1 ) ) {
-	    // There is no representation for these values
-	    continue;
-	}
-	if ( a == Qt::Key_Backtab ) // Actually SHIFT+Tab
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << int(Qt::Key_Tab) << false << "";
-	else
-	    QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << false << "";
-    }
-
-    for ( a = Qt::Key_Space; a < Qt::Key_ydiaeresis; a++ ) {
-	QTest::newRow( QString("key - %1").arg( a ).toLatin1() ) << a << true << QString( QChar(a) );
-    }
-}
-
-void tst_QKeyEvent::standardKey()
-{
-
-}
-
-void tst_QKeyEvent::sendRecieveKeyEvents()
-{
-    QFETCH( int, key );
-    QFETCH( bool, textExpected );
-    QFETCH( QString, text );
-    testWidget->recievedKeyPress = false;
-
-#ifdef Q_WS_WIN
-    // Will be eaten by Windows system
-    if ( key == Qt::Key_Print )
-	return;
-
-    // This is mapped to nothing on Windows
-    if ( key == Qt::Key_SysReq )
-	return;
-
-    // Not supported on Windows
-    if ( key >= Qt::Key_F25 && key <= Qt::Key_Super_R )
-	return;
-    if ( key >= Qt::Key_Hyper_L && key <= Qt::Key_Hyper_R )
-	return;
-    if ( key == Qt::Key_Help )
-	return;
-
-    // Not sure on how to add support for these yet
-    if ( key >= Qt::Key_Direction_L && key <= Qt::Key_Direction_R )
-	return;
-
-    // Not sure on how to test these yet, since they use SHIFT etc
-    if ( key >= Qt::Key_Exclam && key <= Qt::Key_Slash )
-	return;
-    if ( key >= Qt::Key_Colon && key <= Qt::Key_At )
-	return;
-    if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
-	return;
-#endif // Q_WS_WIN
-
-#ifdef Q_OS_SYMBIAN
-    // Not supported on symbian
-    if ( key == Qt::Key_Print )
-    return;
-
-    // Not supported on symbian
-    if ( key == Qt::Key_SysReq )
-    return;
-
-    // Not supported on symbian
-    if ( key >= Qt::Key_F25 && key <= Qt::Key_Super_R )
-    return;
-    if ( key >= Qt::Key_Hyper_L && key <= Qt::Key_Hyper_R )
-    return;
-    if ( key == Qt::Key_Help )
-    return;
-
-    // Not sure on how to add support for these yet
-    if ( key >= Qt::Key_Direction_L && key <= Qt::Key_Direction_R )
-    return;
-
-    // Not supported on symbian
-    if ( key >= Qt::Key_Exclam && key <= Qt::Key_Slash )
-    return;
-    if ( key >= Qt::Key_Colon && key <= Qt::Key_At )
-    return;
-    if ( key >= Qt::Key_BracketRight && key <= Qt::Key_ydiaeresis )
-    return;
-#endif // Q_WS_WIN
-
-    if ( key == Qt::Key_F1 )
-	return; // Ignore for the moment
-
-    QTest::keyPress( testWidget, (Qt::Key)key );
-    while ( !testWidget->recievedKeyPress )
-        qApp->processEvents();
-    QKeyEvent* ke = testWidget->getLastKeyPress();
-    QCOMPARE( ke->key(), key );
-    if ( textExpected )
-        QCOMPARE( ke->text(), text );
-    testWidget->recievedKeyRelease = false;
-    QTest::keyRelease( testWidget, (Qt::Key)key );
-    while ( !testWidget->recievedKeyRelease )
-        qApp->processEvents();
-    ke = testWidget->getLastKeyRelease();
-    QCOMPARE( ke->key(), key );
-    if ( textExpected )
-        QCOMPARE( ke->text(), text );
-}
-
-QTEST_MAIN(tst_QKeyEvent)
-#include "tst_qkeyevent.moc"
diff --git a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
index be0bfe3..dfc6b78 100644
--- a/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
+++ b/tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp
@@ -153,14 +153,14 @@ void tst_QNativeSocketEngine::simpleConnectToIMAP()
     QVERIFY(socketDevice.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
     QVERIFY(socketDevice.state() == QAbstractSocket::UnconnectedState);
 
-    const bool isConnected = socketDevice.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143);
+    const bool isConnected = socketDevice.connectToHost(QtNetworkSettings::serverIP(), 143);
     if (!isConnected) {
         QVERIFY(socketDevice.state() == QAbstractSocket::ConnectingState);
         QVERIFY(socketDevice.waitForWrite());
         QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
     }
     QVERIFY(socketDevice.state() == QAbstractSocket::ConnectedState);
-    QVERIFY(socketDevice.peerAddress() == QHostAddress(QtNetworkSettings::serverIP()));
+    QVERIFY(socketDevice.peerAddress() == QtNetworkSettings::serverIP());
 
     // Wait for the greeting
     QVERIFY(socketDevice.waitForRead());
@@ -592,7 +592,7 @@ void tst_QNativeSocketEngine::networkError()
 
     QVERIFY(client.initialize(QAbstractSocket::TcpSocket, QAbstractSocket::IPv4Protocol));
 
-    const bool isConnected = client.connectToHost(QHostAddress(QtNetworkSettings::serverIP()), 143);
+    const bool isConnected = client.connectToHost(QtNetworkSettings::serverIP(), 143);
     if (!isConnected) {
         QVERIFY(client.state() == QAbstractSocket::ConnectingState);
         QVERIFY(client.waitForWrite());
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index 62e4ce5..4fee7fd 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -53,7 +53,9 @@
 
 class tst_QNetworkAccessManager_And_QProgressDialog : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
+public:
+    tst_QNetworkAccessManager_And_QProgressDialog();
 private slots:
     void downloadCheck();
 };
@@ -110,6 +112,11 @@ private:
     QNetworkAccessManager netmanager;
 };
 
+tst_QNetworkAccessManager_And_QProgressDialog::tst_QNetworkAccessManager_And_QProgressDialog()
+{
+    Q_SET_DEFAULT_IAP
+}
+
 void tst_QNetworkAccessManager_And_QProgressDialog::downloadCheck()
 {
     DownloadCheckWidget widget;
diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro
index 9199ac3..6d6ddbf 100644
--- a/tests/auto/qpropertyanimation/qpropertyanimation.pro
+++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-QT = core
+QT = core gui
 SOURCES  += tst_qpropertyanimation.cpp
 
 
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
index b8e0f0a..7f571a9 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -54,35 +54,35 @@ class tst_QScopedPointer : public QObject
     Q_OBJECT
 
 private Q_SLOTS:
-    void defaultConstructor() const;
-    void dataOnDefaultConstructed() const;
-    void useSubClassInConstructor() const;
-    void dataOnValue() const;
-    void dataSignature() const;
-    void reset() const;
-    void dereferenceOperator() const;
-    void dereferenceOperatorSignature() const;
-    void pointerOperator() const;
-    void pointerOperatorSignature() const;
-    void negationOperator() const;
-    void negationOperatorSignature() const;
-    void operatorBool() const;
-    void operatorBoolSignature() const;
-    void isNull() const;
-    void isNullSignature() const;
-    void objectSize() const;
-    void comparison() const;
-    // TODO instansiate on const object
+    void defaultConstructor();
+    void dataOnDefaultConstructed();
+    void useSubClassInConstructor();
+    void dataOnValue();
+    void dataSignature();
+    void reset();
+    void dereferenceOperator();
+    void dereferenceOperatorSignature();
+    void pointerOperator();
+    void pointerOperatorSignature();
+    void negationOperator();
+    void negationOperatorSignature();
+    void operatorBool();
+    void operatorBoolSignature();
+    void isNull();
+    void isNullSignature();
+    void objectSize();
+    void comparison();
+    // TODO instanciate on const object
 };
 
-void tst_QScopedPointer::defaultConstructor() const
+void tst_QScopedPointer::defaultConstructor()
 {
     /* Check that the members, one, is correctly initialized. */
     QScopedPointer<int> p;
     QCOMPARE(p.data(), static_cast<int *>(0));
 }
 
-void tst_QScopedPointer::dataOnDefaultConstructed() const
+void tst_QScopedPointer::dataOnDefaultConstructed()
 {
     QScopedPointer<int> p;
 
@@ -97,13 +97,13 @@ class MySubClass : public MyClass
 {
 };
 
-void tst_QScopedPointer::useSubClassInConstructor() const
+void tst_QScopedPointer::useSubClassInConstructor()
 {
     /* Use a syntax which users typically would do. */
     QScopedPointer<MyClass> p(new MyClass());
 }
 
-void tst_QScopedPointer::dataOnValue() const
+void tst_QScopedPointer::dataOnValue()
 {
     int *const rawPointer = new int(5);
     QScopedPointer<int> p(rawPointer);
@@ -111,14 +111,14 @@ void tst_QScopedPointer::dataOnValue() const
     QCOMPARE(p.data(), rawPointer);
 }
 
-void tst_QScopedPointer::dataSignature() const
+void tst_QScopedPointer::dataSignature()
 {
     const QScopedPointer<int> p;
     /* data() should be const. */
     p.data();
 }
 
-void tst_QScopedPointer::reset() const
+void tst_QScopedPointer::reset()
 {
     /* Call reset() on a default constructed value. */
     {
@@ -172,7 +172,7 @@ public:
     }
 };
 
-void tst_QScopedPointer::dereferenceOperator() const
+void tst_QScopedPointer::dereferenceOperator()
 {
     /* Dereference a basic value. */
     {
@@ -192,7 +192,7 @@ void tst_QScopedPointer::dereferenceOperator() const
     }
 }
 
-void tst_QScopedPointer::dereferenceOperatorSignature() const
+void tst_QScopedPointer::dereferenceOperatorSignature()
 {
     /* The operator should be const. */
     {
@@ -219,7 +219,7 @@ public:
     int value;
 };
 
-void tst_QScopedPointer::pointerOperator() const
+void tst_QScopedPointer::pointerOperator()
 {
     QScopedPointer<AnyForm> p(new AnyForm());
     p->value = 5;
@@ -227,7 +227,7 @@ void tst_QScopedPointer::pointerOperator() const
     QCOMPARE(p->value, 5);
 }
 
-void tst_QScopedPointer::pointerOperatorSignature() const
+void tst_QScopedPointer::pointerOperatorSignature()
 {
     /* The operator should be const. */
     const QScopedPointer<AnyForm> p(new AnyForm);
@@ -236,7 +236,7 @@ void tst_QScopedPointer::pointerOperatorSignature() const
     QVERIFY(p->value);
 }
 
-void tst_QScopedPointer::negationOperator() const
+void tst_QScopedPointer::negationOperator()
 {
     /* Invoke on default constructed value. */
     {
@@ -251,7 +251,7 @@ void tst_QScopedPointer::negationOperator() const
     }
 }
 
-void tst_QScopedPointer::negationOperatorSignature() const
+void tst_QScopedPointer::negationOperatorSignature()
 {
     /* The signature should be const. */
     const QScopedPointer<int> p;
@@ -261,7 +261,7 @@ void tst_QScopedPointer::negationOperatorSignature() const
     static_cast<bool>(!p);
 }
 
-void tst_QScopedPointer::operatorBool() const
+void tst_QScopedPointer::operatorBool()
 {
     /* Invoke on default constructed value. */
     {
@@ -276,15 +276,15 @@ void tst_QScopedPointer::operatorBool() const
     }
 }
 
-void tst_QScopedPointer::operatorBoolSignature() const
+void tst_QScopedPointer::operatorBoolSignature()
 {
     /* The signature should be const and return bool. */
     const QScopedPointer<int> p;
 
-    static_cast<bool>(p);
+    (void)static_cast<bool>(p);
 }
 
-void tst_QScopedPointer::isNull() const
+void tst_QScopedPointer::isNull()
 {
     /* Invoke on default constructed value. */
     {
@@ -299,7 +299,7 @@ void tst_QScopedPointer::isNull() const
     }
 }
 
-void tst_QScopedPointer::isNullSignature() const
+void tst_QScopedPointer::isNullSignature()
 {
     const QScopedPointer<int> p(new int(69));
 
@@ -307,13 +307,13 @@ void tst_QScopedPointer::isNullSignature() const
     static_cast<bool>(p.isNull());
 }
 
-void tst_QScopedPointer::objectSize() const
+void tst_QScopedPointer::objectSize()
 {
     /* The size of QScopedPointer should be the same as one pointer. */
     QCOMPARE(sizeof(QScopedPointer<int>), sizeof(void *));
 }
 
-void tst_QScopedPointer::comparison() const
+void tst_QScopedPointer::comparison()
 {
     int *a = new int(42);
     int *b = new int(43);
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index a6064bc..a29674f 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -175,7 +175,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
     QVERIFY(readEnd2.state() == QAbstractSocket::ConnectedState);
 #if defined(Q_OS_WIN)
     qWarning("### Windows returns 1 activation, Unix returns 2.");
-    QCOMPARE(tester.sequence, 1);
+    QCOMPARE(tester.getSequence(), 1);
 #else
     QCOMPARE(tester.getSequence(), 2);
 #endif
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 392af5e..100eecd 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -1917,7 +1917,7 @@ void tst_QTextEdit::setText()
 }
 
 QT_BEGIN_NAMESPACE
-extern Q_GUI_EXPORT bool qt_enable_test_font;
+extern void qt_setQtEnableTestFont(bool value);
 QT_END_NAMESPACE
 
 void tst_QTextEdit::fullWidthSelection_data()
@@ -1964,7 +1964,7 @@ void tst_QTextEdit::fullWidthSelection()
     cursor.setBlockFormat(bf1);
 
     // use the test font so we always know where stuff will end up.
-    qt_enable_test_font = true;
+    qt_setQtEnableTestFont(true);
     QFont testFont;
     testFont.setFamily("__Qt__Box__Engine__");
     testFont.setPixelSize(12);
@@ -2012,7 +2012,7 @@ void tst_QTextEdit::fullWidthSelection2()
     QTextCursor cursor = widget.textCursor();
 
     // use the test font so we always know where stuff will end up.
-    qt_enable_test_font = true;
+    qt_setQtEnableTestFont(true);
     QFont testFont;
     testFont.setFamily("__Qt__Box__Engine__");
     testFont.setPixelSize(12);
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index e948cf2..d76f387 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -57,8 +57,6 @@
 
 #define TESTFONT_SIZE 12
 
-
-
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -164,12 +162,12 @@ void tst_QTextLayout::getSetCheck()
 }
 
 QT_BEGIN_NAMESPACE
-extern Q_GUI_EXPORT bool qt_enable_test_font;
+extern void qt_setQtEnableTestFont(bool value);
 QT_END_NAMESPACE
 
 tst_QTextLayout::tst_QTextLayout()
 {
-    qt_enable_test_font = true;
+    qt_setQtEnableTestFont(true);
 }
 
 tst_QTextLayout::~tst_QTextLayout()