diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-06-29 07:27:51 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-06-29 07:27:51 +0900 |
commit | 47c2015beb75693c7181fb7359a4aa166e926fe7 (patch) | |
tree | af905a0365ba425dcbf5c9a3d115c68e95302a8c | |
parent | 3aedfe41090e466fc161df9619dc377ec72f7297 (diff) | |
download | libquotient-47c2015beb75693c7181fb7359a4aa166e926fe7.tar.gz libquotient-47c2015beb75693c7181fb7359a4aa166e926fe7.zip |
Fixed building with Qt version=5.4; moved away a macro unused in headers
-rw-r--r-- | logging.cpp | 7 | ||||
-rw-r--r-- | logging.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/logging.cpp b/logging.cpp index 97540dd4..7476781f 100644 --- a/logging.cpp +++ b/logging.cpp @@ -18,6 +18,13 @@ #include "logging.h" +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) +#define LOGGING_CATEGORY(Name, Id) Q_LOGGING_CATEGORY((Name), (Id), QtInfoMsg) +#else +#define LOGGING_CATEGORY(Name, Id) Q_LOGGING_CATEGORY((Name), (Id)) +#endif + +// Use LOGGING_CATEGORY instead of Q_LOGGING_CATEGORY in the rest of the code LOGGING_CATEGORY(MAIN, "libqmatrixclient.main") LOGGING_CATEGORY(PROFILER, "libqmatrixclient.profiler") LOGGING_CATEGORY(EVENTS, "libqmatrixclient.events") @@ -27,13 +27,6 @@ Q_DECLARE_LOGGING_CATEGORY(EPHEMERAL) Q_DECLARE_LOGGING_CATEGORY(JOBS) Q_DECLARE_LOGGING_CATEGORY(SYNCJOB) -// Use LOGGING_CATEGORY instead of Q_LOGGING_CATEGORY in the rest of the code -#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) -#define LOGGING_CATEGORY(Name, Id) Q_LOGGING_CATEGORY((Name), (Id), QtInfoMsg) -#else -#define LOGGING_CATEGORY(Name, Id) Q_LOGGING_CATEGORY((Name), (Id)) -#endif - namespace QMatrixClient { // QDebug manipulators |