diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-11-28 12:02:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-28 08:13:41 +0100 |
| commit | cbcdb5f4cf7e52c3e184d87cc8716d6a9dcc9728 (patch) | |
| tree | dcd5b2445f4e15910564cf5c73a365ffd40f8e28 /tests/auto/corelib/io | |
| parent | f6de476552e16be80f4c191890796c4f4ba95ce4 (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')
| -rw-r--r-- | tests/auto/corelib/io/qdir/tst_qdir.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 2 |
3 files changed, 8 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 diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index e467b86571..6f295f105b 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 4ce22ab888..06e16ec35f 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" |