diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-11 20:39:11 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-22 07:45:59 +0000 |
| commit | 5e2367aaa5137f27c722cd7f8474696b0fbaa099 (patch) | |
| tree | b3cc6df819e1419c80e595c105018a41f6184284 /tests | |
| parent | 4f2a571f0969eec6178e0bc8723b60cc05443d20 (diff) | |
use regular configure mechanism for openssl library references
don't attempt to hand-craft a library export any more. instead, use the
configure system's built-in mechanism, and refer to it via QMAKE_USE.
this also allows us to rely on transitive dependencies in the autotest.
as a side effect, this makes the openssl-linked feature imply the
openssl one.
Change-Id: I5dd209b63bc8fbbc62852f6ffc472d4452ea2e68
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/ssl/qsslsocket/qsslsocket.pro | 6 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro index 5c92ca833a..4ccf0f24b0 100644 --- a/tests/auto/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro @@ -14,12 +14,6 @@ win32 { } } -# OpenSSL support -qtConfig(openssl)|qtConfig(openssl-linked) { - # Add optional SSL libs - LIBS += $$OPENSSL_LIBS -} - DEFINES += SRCDIR=\\\"$$PWD/\\\" requires(qtConfig(private_tests)) diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 8367994509..a93a003dff 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -54,7 +54,7 @@ dialogs \ windowtransparency \ unc -!qtConfig(openssl):!qtConfig(openssl-linked): SUBDIRS -= qssloptions +!qtConfig(openssl): SUBDIRS -= qssloptions qtConfig(opengl) { SUBDIRS += qopengltextureblitter |