diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-05 13:35:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:05 +0000 |
| commit | 60985aa42b37217fb4c01ed85bbf6f14410c3491 (patch) | |
| tree | 710cf1c2457a9e0135d3a2cddf3bf17d2a622378 /src/network | |
| parent | 792a99438707c78ed96a1b066489f9100c24a922 (diff) | |
Use qtConfig throughout in qtbase
Use the new qtConfig macro in all pro/pri files.
This required adding some feature entries, and adding
{private,public}Feature to every referenced already existing entry.
Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/network/socket/socket.pri | 4 | ||||
| -rw-r--r-- | src/network/ssl/ssl.pri | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index c3e546eabc..e1eb4f7a93 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -62,7 +62,7 @@ mac { osx:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:SOURCES += kernel/qnetworkproxy_win.cpp -else:contains(QT_CONFIG, libproxy) { +else: qtConfig(libproxy) { SOURCES += kernel/qnetworkproxy_libproxy.cpp QMAKE_USE_PRIVATE += libproxy } diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index b1c0b6bd6e..793ea60b07 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -27,7 +27,7 @@ SOURCES += socket/qabstractsocketengine.cpp \ # SCTP support. -contains(QT_CONFIG, sctp) { +qtConfig(sctp) { HEADERS += socket/qsctpserver.h \ socket/qsctpserver_p.h \ socket/qsctpsocket.h \ @@ -80,6 +80,6 @@ integrity: { DEFINES += QT_LOCALSOCKET_TCP } -contains(QT_CONFIG, system-proxies) { +qtConfig(system-proxies) { DEFINES += QT_USE_SYSTEM_PROXIES } diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index edbbeadf51..8139af50af 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -1,5 +1,5 @@ # OpenSSL support; compile in QSslSocket. -contains(QT_CONFIG, ssl) { +qtConfig(ssl) { HEADERS += ssl/qasn1element_p.h \ ssl/qssl.h \ ssl/qssl_p.h \ @@ -45,7 +45,7 @@ contains(QT_CONFIG, ssl) { ssl/qsslellipticcurve_dummy.cpp } - contains(QT_CONFIG, securetransport) { + qtConfig(securetransport) { HEADERS += ssl/qsslsocket_mac_p.h SOURCES += ssl/qsslcertificate_qt.cpp \ ssl/qssldiffiehellmanparameters_dummy.cpp \ @@ -56,7 +56,7 @@ contains(QT_CONFIG, ssl) { ssl/qsslellipticcurve_dummy.cpp } - contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { + qtConfig(openssl)|qtConfig(openssl-linked) { HEADERS += ssl/qsslcontext_openssl_p.h \ ssl/qsslsocket_openssl_p.h \ ssl/qsslsocket_openssl_symbols_p.h |