From 50eb9120ce68a142ee6435fe0c7793c3726a42c8 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 31 Aug 2011 15:21:48 +0200
Subject: Fix further test builds on Windows.

Change-Id: I9846d19c5975f4d17bed46c59272a0fa428fd0d1
Reviewed-on: http://codereview.qt.nokia.com/3980
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 tests/auto/qaccessibility/tst_qaccessibility.cpp       | 4 ++++
 tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp | 8 +++++---
 tests/auto/qpainter/tst_qpainter.cpp                   | 2 +-
 tests/auto/qsql/qsql.pro                               | 2 +-
 tests/auto/windowsmobile/test/test.pro                 | 2 +-
 tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro | 1 +
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index d8aa382548..00999bd6b0 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -46,6 +46,10 @@
 #include <QtGui>
 #include <math.h>
 
+#if defined(Q_OS_WIN) && defined(interface)
+#   undef interface
+#endif
+
 
 #include "QtTest/qtestaccessible.h"
 
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
index ee914bd04e..1e1a51bde0 100644
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -40,9 +40,11 @@
 ****************************************************************************/
 
 
-#include <QtTest/QtTest>
-
-#include <qcoreapplication.h>
+#include <QtTest/QTest>
+#include <QtTest/QTestEventLoop>
+#include <QtCore/QQueue>
+#include <QtCore/QString>
+#include <QtCore/QCoreApplication>
 
 #include <private/qhttpsocketengine_p.h>
 #include <qhostinfo.h>
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 8898a4874d..ff4f7ad8eb 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -564,7 +564,7 @@ void tst_QPainter::qt_format_text_boundingRect()
 			QCOMPARE(pbr, br);
 		    }
 #endif
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+#if !defined(QT_NO_PRINTER) && !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
 		    {
 			QPrinter printer(QPrinter::HighResolution);
 			if (printer.printerName().isEmpty()) {
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index e367a8e1c1..3357e762dc 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsql.cpp
 
-QT += sql sql-private
+QT += sql sql-private gui widgets
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/windowsmobile/test/test.pro
index b0536a5e79..595a619d2a 100644
--- a/tests/auto/windowsmobile/test/test.pro
+++ b/tests/auto/windowsmobile/test/test.pro
@@ -1,6 +1,6 @@
 
 load(qttest_p4)
-
+QT += widgets
 HEADERS += ddhelper.h
 SOURCES += tst_windowsmobile.cpp ddhelper.cpp
 RESOURCES += windowsmobile.qrc
diff --git a/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro b/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro
index 87986e4d96..6b84ae937c 100644
--- a/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro
+++ b/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro
@@ -1,3 +1,4 @@
 SOURCES += main.cpp
+QT += widgets
 TARGET = ../testQMenuBar
 
-- 
cgit v1.2.3