diff options
| author | Gerry Boland <gerry.boland@canonical.com> | 2016-11-02 16:46:53 +0000 |
|---|---|---|
| committer | Matti Paaso <matti.paaso@qt.io> | 2017-01-24 05:52:52 +0000 |
| commit | c28fde3fdac19fd5a5f614bb7983080031c924b3 (patch) | |
| tree | 441d2d4ea4e1e17db49ed3b12c7c724cbc6db894 /src/plugins/platforms/mirclient/qmirclientlogging.h | |
| parent | 4b507e8257243e36f40089d57099c2d668c5884d (diff) | |
Mirclient: update based on upstream development in lp:qtubuntu
This is based on revision 360 of lp:qtubuntu.
Main features/bugs fixed:
- fix QQuickWidget-based app rendering
- wire up Qt window types to Mir to enable desktop-based applications
to function with a window manager
- use QEGLPlatformContext and QEGLPBuffer instead of custom code
- correctly populate and update list of QScreens
- support for switching keyboard layouts
- improve window resizing to fix visual glitching
Change-Id: If816a858eb10b6356275d4b80c89a72562b3c29f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Diffstat (limited to 'src/plugins/platforms/mirclient/qmirclientlogging.h')
| -rw-r--r-- | src/plugins/platforms/mirclient/qmirclientlogging.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientlogging.h b/src/plugins/platforms/mirclient/qmirclientlogging.h index 0eb3adbdc7..4921864ced 100644 --- a/src/plugins/platforms/mirclient/qmirclientlogging.h +++ b/src/plugins/platforms/mirclient/qmirclientlogging.h @@ -41,23 +41,15 @@ #ifndef QMIRCLIENTLOGGING_H #define QMIRCLIENTLOGGING_H -// Logging and assertion macros. -#define LOG(...) qDebug(__VA_ARGS__) -#define LOG_IF(cond,...) do { if (cond) qDebug(__VA_ARGS__); } while (0) +#include <QLoggingCategory> + #define ASSERT(cond) ((!(cond)) ? qt_assert(#cond,__FILE__,__LINE__) : qt_noop()) -#define NOT_REACHED() qt_assert("Not reached!",__FILE__,__LINE__) -// Logging and assertion macros are compiled out for release builds. -#if !defined(QT_NO_DEBUG) -#define DLOG(...) LOG(__VA_ARGS__) -#define DLOG_IF(cond,...) LOG_IF((cond), __VA_ARGS__) -#define DASSERT(cond) ASSERT((cond)) -#define DNOT_REACHED() NOT_REACHED() -#else -#define DLOG(...) qt_noop() -#define DLOG_IF(cond,...) qt_noop() -#define DASSERT(cond) qt_noop() -#define DNOT_REACHED() qt_noop() -#endif +Q_DECLARE_LOGGING_CATEGORY(mirclient) +Q_DECLARE_LOGGING_CATEGORY(mirclientBufferSwap) +Q_DECLARE_LOGGING_CATEGORY(mirclientInput) +Q_DECLARE_LOGGING_CATEGORY(mirclientGraphics) +Q_DECLARE_LOGGING_CATEGORY(mirclientCursor) +Q_DECLARE_LOGGING_CATEGORY(mirclientDebug) #endif // QMIRCLIENTLOGGING_H |