Merge PR #2933: os_win.cpp: Fix unused "mumbleMessageOutput()" functi…

…on with Qt 5
mumble-voip · Mar 13, 2017 · 841bff8 · 841bff8
2 parents 76d2ea2 + 357c30e
commit 841bff8
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp
@@ -64,9 +64,11 @@ static void mumbleMessageOutputQString(QtMsgType type, const QString &msg) {
 	}
 }
 
+#if QT_VERSION < 0x050000
 static void mumbleMessageOutput(QtMsgType type, const char *msg) {
 	mumbleMessageOutputQString(type, QString::fromUtf8(msg));
 }
+#endif
 
 #if QT_VERSION >= 0x050000
 static void mumbleMessageOutputWithContext(QtMsgType type, const QMessageLogContext &ctx, const QString &msg) {