diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-12 14:38:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 06:23:27 +0100 |
| commit | 74494ea29ebc6e152348ed6a6c1e2c9399ddb204 (patch) | |
| tree | a2e32e5c4202758a5f6b3fbbd985666735f47372 /tests/manual/qnetworkreply | |
| parent | 3372b0faa74114184afbfde20a3bc27049df2c94 (diff) | |
Fix building of the manual tests.
Adapt to API-changes, exclude network/SSL-tests for Windows.
Change-Id: I80d5ef1bd81e149a2f04fa7644376a8a88b1f7b9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/manual/qnetworkreply')
| -rw-r--r-- | tests/manual/qnetworkreply/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp index feb07b4c7d..2f47985261 100644 --- a/tests/manual/qnetworkreply/main.cpp +++ b/tests/manual/qnetworkreply/main.cpp @@ -49,7 +49,7 @@ #include <QtNetwork/qsslconfiguration.h> #include "../../auto/network-settings.h" -#ifdef QT_BUILD_INTERNAL +#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) #include "private/qsslsocket_p.h" #endif @@ -147,6 +147,9 @@ void tst_qnetworkreply::setSslConfiguration_data() void tst_qnetworkreply::setSslConfiguration() { +#ifdef QT_NO_SSL + QSKIP("SSL is not enabled."); +#else QFETCH(QUrl, url); QNetworkRequest request(url); QSslConfiguration conf = request.sslConfiguration(); @@ -171,6 +174,7 @@ void tst_qnetworkreply::setSslConfiguration() QCOMPARE(reply->error(), QNetworkReply::SslHandshakeFailedError); } #endif +#endif // QT_NO_SSL } QTEST_MAIN(tst_qnetworkreply) |