X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclient.h;h=8c707f343039bec6e4aeaf21b65ffa7216437d3e;hb=e50ae7a06fc4e5d3a911c361d30953410deab609;hp=e3aacd0492e540b165a8c2a627f78ad0a014e2f9;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index e3aacd04..8c707f34 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -142,7 +142,11 @@ public: static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); static void purgeKnownBufferIds(); +#if QT_VERSION < 0x050000 static void logMessage(QtMsgType type, const char *msg); +#else + static void logMessage(QtMsgType, const QMessageLogContext&, const QString&); +#endif static inline const QString &debugLog() { return instance()->_debugLogBuffer; } signals: