diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
| commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
| tree | 98d321520f31107067ca45e5b5806d92551b2f3d /src/libs/utils/logging.h | |
| parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
| parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
| download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'src/libs/utils/logging.h')
| -rw-r--r-- | src/libs/utils/logging.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/logging.h b/src/libs/utils/logging.h index 825abff590..3252287627 100644 --- a/src/libs/utils/logging.h +++ b/src/libs/utils/logging.h @@ -31,7 +31,7 @@ #include <qglobal.h> -#if QT_VERSION < 0x052000 +#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) // // Qt < 5.2 didn't feature categorized logging: @@ -67,7 +67,7 @@ private: return category; \ } -#if QT_VERSION > 0x050000 +#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) // // Qt 5.0, 5.1 do have already support for categories in QMessageLogger @@ -100,13 +100,13 @@ private: qCritical(__VA_ARGS__) -# endif // QT_VERSION > 0x050000 +# endif // QT_VERSION > QT_VERSION_CHECK(5, 0, 0) -#else // QT_VERSION >= 0x052000 +#else // QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) #include <QLoggingCategory> -#if QT_VERSION < 0x053000 +#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) // printf style for qCDebug was only added in Qt 5.3 @@ -124,6 +124,6 @@ private: for (bool q_category_enabled = category().isCriticalEnabled(); q_category_enabled; q_category_enabled = false) \ QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category().categoryName()).critical(__VA_ARGS__) -#endif // QT_VERSION < 0x053000 -#endif // QT_VERSION < 0x052000 +#endif // QT_VERSION < QT_VERSION_CHECK(5, 3, 0) +#endif // QT_VERSION < QT_VERSION_CHECK(5, 2, 0) #endif // LOGGING_H |