diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:37:34 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:37:34 +0200 |
commit | cb3348dec91c535133cf4f4016649685c6de278c (patch) | |
tree | 235de2e22ce524bb279f4ecf12abe964d59ff1f1 /src/network | |
parent | 06e27c2a52a4bd98bc102de0875df9918166d130 (diff) | |
parent | 9a747cb5b7866d440211aa1dc4e07dd4ff914c2c (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If1abbe7810ea43ae750db91066f9f579c79b2289
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/doc/src/ssl.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc index e1bb1b9316..77fbec9943 100644 --- a/src/network/doc/src/ssl.qdoc +++ b/src/network/doc/src/ssl.qdoc @@ -57,7 +57,7 @@ system: \code - ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' + OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked \endcode To disable SSL support in a Qt build, configure Qt with the \c{-no-openssl} |