Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2017-01-23 00:07:25 +0300
committerMikkel Krautz <mikkel@krautz.dk>2017-01-23 00:07:25 +0300
commit44790f6f66b8fbab6309ef122a1bad1464ed5e55 (patch)
treec2627b7bbfd5ec6daf84c80cd06b7f3e19bb5ea7 /src/murmur/murmur.pro
parent645603771d519ed65d2766168d8489ce9a4f5b31 (diff)
murmur.pro: remove Mumble buildenv requirement for QSslDiffieHellmanParameters.
The API of QSslDiffieHellmanParameters is frozen and will be available in Qt 5.8.0. Remove the safety-net of only allowing QSslDiffieHellmanParameters for Mumble build environments.
Diffstat (limited to 'src/murmur/murmur.pro')
-rw-r--r--src/murmur/murmur.pro9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
index 99eaf01b8..e1e3607ec 100644
--- a/src/murmur/murmur.pro
+++ b/src/murmur/murmur.pro
@@ -199,14 +199,7 @@ bonjour {
#
# Can be disabled with no-qssldiffiehellmanparameters.
!CONFIG(no-qssldiffiehellmanparameters):exists($$[QT_INSTALL_HEADERS]/QtNetwork/QSslDiffieHellmanParameters) {
- # ...but only if we're inside a Mumble build environment for now.
- # If someone decides to put a Mumble snapshot into a distro, this
- # could break the build in the future, with newer versions of Qt,
- # if the API of QSslDiffieHellmanParameters changes when it is
- # upstreamed.
- CONFIG(buildenv) {
- DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS
- }
+ DEFINES += USE_QSSLDIFFIEHELLMANPARAMETERS
}
include(../../symbols.pri)