diff options
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/websockets/websockets.pro b/examples/websockets/websockets.pro index e5eddf6..8ad9645 100644 --- a/examples/websockets/websockets.pro +++ b/examples/websockets/websockets.pro @@ -9,7 +9,7 @@ SUBDIRS += qmlwebsocketclient \ qmlwebsocketserver } -contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { +qtConfig(ssl) { SUBDIRS += \ sslechoserver \ sslechoclient diff --git a/src/websockets/websockets.pro b/src/websockets/websockets.pro index b9a513b..e4366ba 100644 --- a/src/websockets/websockets.pro +++ b/src/websockets/websockets.pro @@ -40,7 +40,7 @@ SOURCES += \ $$PWD/qmaskgenerator.cpp \ $$PWD/qdefaultmaskgenerator_p.cpp -contains(QT_CONFIG, ssl) | contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { +qtConfig(ssl) { SOURCES += $$PWD/qsslserver.cpp PRIVATE_HEADERS += $$PWD/qsslserver_p.h } diff --git a/tests/auto/websockets/dataprocessor/dataprocessor.pro b/tests/auto/websockets/dataprocessor/dataprocessor.pro index 41fc91f..ad99900 100644 --- a/tests/auto/websockets/dataprocessor/dataprocessor.pro +++ b/tests/auto/websockets/dataprocessor/dataprocessor.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_dataprocessor.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/handshakerequest/handshakerequest.pro b/tests/auto/websockets/handshakerequest/handshakerequest.pro index 6a373b8..aa7779e 100644 --- a/tests/auto/websockets/handshakerequest/handshakerequest.pro +++ b/tests/auto/websockets/handshakerequest/handshakerequest.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_handshakerequest.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/handshakeresponse/handshakeresponse.pro b/tests/auto/websockets/handshakeresponse/handshakeresponse.pro index 9e23c46..ab6682b 100644 --- a/tests/auto/websockets/handshakeresponse/handshakeresponse.pro +++ b/tests/auto/websockets/handshakeresponse/handshakeresponse.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_handshakeresponse.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro b/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro index e284bc5..c3b1046 100644 --- a/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro +++ b/tests/auto/websockets/qdefaultmaskgenerator/qdefaultmaskgenerator.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_defaultmaskgenerator.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/websocketframe/websocketframe.pro b/tests/auto/websockets/websocketframe/websocketframe.pro index df9c910..8f58302 100644 --- a/tests/auto/websockets/websocketframe/websocketframe.pro +++ b/tests/auto/websockets/websocketframe/websocketframe.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_websocketframe.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/websocketprotocol/websocketprotocol.pro b/tests/auto/websockets/websocketprotocol/websocketprotocol.pro index 8ee7ff9..27748a9 100644 --- a/tests/auto/websockets/websocketprotocol/websocketprotocol.pro +++ b/tests/auto/websockets/websocketprotocol/websocketprotocol.pro @@ -10,4 +10,4 @@ QT = core testlib websockets websockets-private SOURCES += tst_websocketprotocol.cpp -requires(contains(QT_CONFIG, private_tests)) +requires(qtConfig(private_tests)) diff --git a/tests/auto/websockets/websockets.pro b/tests/auto/websockets/websockets.pro index 4698cd0..b000229 100644 --- a/tests/auto/websockets/websockets.pro +++ b/tests/auto/websockets/websockets.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS = \ qwebsocketcorsauthenticator -contains(QT_CONFIG, private_tests): SUBDIRS += \ +qtConfig(private_tests): SUBDIRS += \ websocketprotocol \ dataprocessor \ websocketframe \ |