summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qdir
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-28 12:02:52 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-28 08:13:41 +0100
commitcbcdb5f4cf7e52c3e184d87cc8716d6a9dcc9728 (patch)
treedcd5b2445f4e15910564cf5c73a365ffd40f8e28 /tests/auto/corelib/io/qdir
parentf6de476552e16be80f4c191890796c4f4ba95ce4 (diff)
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>
Diffstat (limited to 'tests/auto/corelib/io/qdir')
-rw-r--r--tests/auto/corelib/io/qdir/tst_qdir.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index 28ccad3b56..d6944eada8 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