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:
authorStefan Hacker <dd0t@users.sourceforge.net>2014-08-22 03:55:34 +0400
committerStefan Hacker <dd0t@users.sourceforge.net>2014-08-22 03:55:34 +0400
commit12eb26431f03f5ed3c634d647b1581572039112d (patch)
treea827af54d07919cae8cce5135d5652c76537156c /src/murmur/Cert.cpp
parent4efabcea5c5f6aff6de5d69500044429e8d9c053 (diff)
Replace all uses of QT_VERSION_CHECK with explicit version.
Qt4's moc is not able to expand QT_VERSION_CHECK which may lead to invalid codegen when used for backwards compatibility work. Replaced all occurances with explicit check against numeric version which are treated correctly. Even though bad interactions might be rare we should no longer use this macro as long as we want to compile with Qt 4. Also see: http://lists.qt-project.org/pipermail/interest/2013-August/008351.html
Diffstat (limited to 'src/murmur/Cert.cpp')
-rw-r--r--src/murmur/Cert.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp
index 2f2c36f74..cf08ebfb1 100644
--- a/src/murmur/Cert.cpp
+++ b/src/murmur/Cert.cpp
@@ -117,7 +117,7 @@ void Server::initializeCert() {
}
QString issuer;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= 0x050000
QStringList issuerNames = qscCert.issuerInfo(QSslCertificate::CommonName);
if (! issuerNames.isEmpty()) {
issuer = issuerNames.first();