1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct usage of network-settings.h.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2011-11-28 12:02:52 +10:00 committed by Qt by Nokia
parent f6de476552
commit cbcdb5f4cf
7 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/corelib/io/qdir/tst_qdir.cpp
View File

@ -47,7 +47,10 @@
#include <qfileinfo.h> #include <qfileinfo.h>
#include <qregexp.h> #include <qregexp.h>
#include <qstringlist.h> #include <qstringlist.h>
#if (defined(Q_OS_WIN) && !defined(Q_OS_WINCE))
#include "../../../network-settings.h" #include "../../../network-settings.h"
#endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#define _WIN32_WINNT 0x500 #define _WIN32_WINNT 0x500

3
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -73,7 +73,10 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
#include "../../../network-settings.h" #include "../../../network-settings.h"
#endif
#ifndef STDIN_FILENO #ifndef STDIN_FILENO
#define STDIN_FILENO 0 #define STDIN_FILENO 0

2
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
View File

@ -63,7 +63,9 @@
#endif #endif
#include <qplatformdefs.h> #include <qplatformdefs.h>
#include <qdebug.h> #include <qdebug.h>
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
#include "../../../network-settings.h" #include "../../../network-settings.h"
#endif
#include <private/qfileinfo_p.h> #include <private/qfileinfo_p.h>
#include "../../../../shared/filesystem.h" #include "../../../../shared/filesystem.h"

2
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -68,8 +68,6 @@
#include <QFileDialog> #include <QFileDialog>
#include <QFileSystemModel> #include <QFileSystemModel>
#include "../../../network-settings.h"
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=

2
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
View File

@ -64,7 +64,9 @@
#include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h" #include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h"
#include "../../../../../src/widgets/dialogs/qfiledialog_p.h" #include "../../../../../src/widgets/dialogs/qfiledialog_p.h"
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
#include "../../../network-settings.h" #include "../../../network-settings.h"
#endif
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=

1
tests/manual/qhttpnetworkconnection/main.cpp
View File

@ -46,7 +46,6 @@
#include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkreply.h>
#include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkrequest.h>
#include <QtNetwork/qnetworkaccessmanager.h> #include <QtNetwork/qnetworkaccessmanager.h>
#include "../../auto/network-settings.h"
class tst_qhttpnetworkconnection : public QObject class tst_qhttpnetworkconnection : public QObject
{ {

1
tests/manual/socketengine/main.cpp
View File

@ -45,7 +45,6 @@
#include <QtNetwork/qnetworkreply.h> #include <QtNetwork/qnetworkreply.h>
#include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkrequest.h>
#include <QtNetwork/qnetworkaccessmanager.h> #include <QtNetwork/qnetworkaccessmanager.h>
#include "../../auto/network-settings.h"
#include <QtNetwork> #include <QtNetwork>
#include <QDebug> #include <QDebug>
#include <private/qabstractsocketengine_p.h> #include <private/qabstractsocketengine_p.h>