From cbcdb5f4cf7e52c3e184d87cc8716d6a9dcc9728 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 28 Nov 2011 12:02:52 +1000
Subject: [PATCH] Correct usage of network-settings.h.

Four of the modified files only use functions from network-settings.h
on Windows, and the other three files don't use anything from that
header.

Change-Id: Ifa4b0319d14367735b859e538921fa0eeeccce1a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/corelib/io/qdir/tst_qdir.cpp                      | 3 +++
 tests/auto/corelib/io/qfile/tst_qfile.cpp                    | 3 +++
 tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp            | 2 ++
 tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp   | 2 --
 tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 2 ++
 tests/manual/qhttpnetworkconnection/main.cpp                 | 1 -
 tests/manual/socketengine/main.cpp                           | 1 -
 7 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 28ccad3..d6944ea 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -47,7 +47,10 @@
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qstringlist.h>
+
+#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
 #include "../../../network-settings.h"
+#endif
 
 #if defined(Q_OS_WIN)
 #define _WIN32_WINNT  0x500
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index e467b86..6f295f1 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -73,7 +73,10 @@
 
 #include <stdio.h>
 #include <errno.h>
+
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include "../../../network-settings.h"
+#endif
 
 #ifndef STDIN_FILENO
 #define STDIN_FILENO 0
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 4ce22ab..06e16ec 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -63,7 +63,9 @@
 #endif
 #include <qplatformdefs.h>
 #include <qdebug.h>
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include "../../../network-settings.h"
+#endif
 #include <private/qfileinfo_p.h>
 #include "../../../../shared/filesystem.h"
 
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index bdc7609..5d64446 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -68,8 +68,6 @@
 #include <QFileDialog>
 #include <QFileSystemModel>
 
-#include "../../../network-settings.h"
-
 //TESTED_CLASS=
 //TESTED_FILES=
 
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 056d748..85b8166 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -64,7 +64,9 @@
 #include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h"
 #include "../../../../../src/widgets/dialogs/qfiledialog_p.h"
 
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include "../../../network-settings.h"
+#endif
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/manual/qhttpnetworkconnection/main.cpp b/tests/manual/qhttpnetworkconnection/main.cpp
index 62b1cb3..502efca 100644
--- a/tests/manual/qhttpnetworkconnection/main.cpp
+++ b/tests/manual/qhttpnetworkconnection/main.cpp
@@ -46,7 +46,6 @@
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
-#include "../../auto/network-settings.h"
 
 class tst_qhttpnetworkconnection : public QObject
 {
diff --git a/tests/manual/socketengine/main.cpp b/tests/manual/socketengine/main.cpp
index 36c233a..115a187 100644
--- a/tests/manual/socketengine/main.cpp
+++ b/tests/manual/socketengine/main.cpp
@@ -45,7 +45,6 @@
 #include <QtNetwork/qnetworkreply.h>
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
-#include "../../auto/network-settings.h"
 #include <QtNetwork>
 #include <QDebug>
 #include <private/qabstractsocketengine_p.h>
-- 
2.7.4