diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:24:37 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 13:26:27 +0200 |
commit | c5ea7fd39a737ee16e82a6ef49a3149758b96e2b (patch) | |
tree | f14c1b1c25661bbd78f8ffb1de9a3c64a5319232 /tests/auto/qsslsocket | |
parent | 94355ca15a4d451f4a4b858240e2c1a96e26537b (diff) |
Fix autotests to build on Windows.
Basically breakage by <windows.h> being included from the OpenGL
parts of <QtGui/QtGui> included from <QtTest/QtTest>.
Change-Id: Id285fb89c64bf77e2408faac5688acd085579351
Reviewed-on: http://codereview.qt.nokia.com/3952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/qsslsocket')
-rw-r--r-- | tests/auto/qsslsocket/tst_qsslsocket.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 8b3ec3d31e..7f613241a0 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -54,8 +54,10 @@ #include <QNetworkProxy> #include <QAuthenticator> -#include "private/qhostinfo_p.h" -#include "private/qsslsocket_openssl_p.h" +#include <private/qhostinfo_p.h> +#ifndef QT_NO_OPENSSL +# include <private/qsslsocket_openssl_p.h> +#endif #include "../network-settings.h" |