diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
| commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
| tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/network/ssl/ssl.pri | |
| parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
| parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/network/ssl/ssl.pri')
| -rw-r--r-- | src/network/ssl/ssl.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 2173bf6ccc..c70664ef9b 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -65,7 +65,7 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { darwin:SOURCES += ssl/qsslsocket_mac_shared.cpp - android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp + android: SOURCES += ssl/qsslsocket_openssl_android.cpp # Add optional SSL libs # Static linking of OpenSSL with msvc: |