Merge lp:~dandrader/qtubuntu/loggingCategory into lp:qtubuntu

[Daniel d'Andrada]

Use logging categories and fix coding style (tab length)

So logging can be enabled/disabled at runtime instead of at build time

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/75/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/284/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Q_LOGGING_CATEGORY(ubuntumirclientInput, "ubuntumirclient.input", QtWarningMsg)
did you choose the long "ubuntumirclientInput" & "ubuntumirclient" category names in fear of symbol collision?

+++ src/ubuntumirclient/input.h
+++ src/ubuntumirclient/window.h
would prefer you move the logging category declaration into the logging.h file. I think it is handy to see all categories listed in one file.

+++ src/ubuntumirclient/clipboard.cpp
you're hiding all these critical clipboard error messages by default. I think those messages are more useful if they're always printed. I'm ok hiding the warnings by default.

+++ src/ubuntumirclient/screen.cpp
+static void printEglConfig(EGLDisplay display, EGLConfig config) {
whitespace: 2 spaces after 'void'

Please edit README to give instructions on how to enable the logging output.

review: Needs Fixing

[Gerry Boland (gerboland)]

>+++ src/ubuntumirclient/clipboard.cpp
>you're hiding all these critical clipboard error messages by default. I >think those messages are more useful if they're always printed. I'm ok >hiding the warnings by default.

I was wrong, they'll still print, plz ignore

[lp:~dandrader/qtubuntu/loggingCategory]

298. By Daniel d'Andrada on 2015-12-09

Remove extra space

299. By Daniel d'Andrada on 2015-12-09

Move all logging category declarations to logging.h

300. By Daniel d'Andrada on 2015-12-09

Update README

[Daniel d'Andrada (dandrader)]

On 09/12/2015 09:39, Gerry Boland wrote:
> Review: Needs Fixing
>
> Q_LOGGING_CATEGORY(ubuntumirclientInput, "ubuntumirclient.input", QtWarningMsg)
> did you choose the long "ubuntumirclientInput" & "ubuntumirclient" category names in fear of symbol collision?

Yes and because that's the name of the library after all.

>
> +++ src/ubuntumirclient/input.h
> +++ src/ubuntumirclient/window.h
> would prefer you move the logging category declaration into the logging.h file. I think it is handy to see all categories listed in one file.

Done.

>
> +++ src/ubuntumirclient/clipboard.cpp
> you're hiding all these critical clipboard error messages by default. I think those messages are more useful if they're always printed. I'm ok hiding the warnings by default.

No, by default I'm only hiding debug messages.

>
> +++ src/ubuntumirclient/screen.cpp
> +static void printEglConfig(EGLDisplay display, EGLConfig config) {
> whitespace: 2 spaces after 'void'
>
> Please edit README to give instructions on how to enable the logging output.

Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/77
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/77/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/286/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM, let's land it!

review: Approve

[Gerry Boland (gerboland)]

Conflict with trunk :(

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 16/12/2015 14:18, Gerry Boland wrote:
> Review: Needs Fixing
>
> Conflict with trunk :(

Fixed.

[lp:~dandrader/qtubuntu/loggingCategory]

301. By Daniel d'Andrada on 2015-12-16

Merge trunk

[ Daniel d'Andrada ]
* Implement support for application state (LP: #1504776)
* Update panel height hack when window enters or leaves fullscreen
  (LP: #1422523)
[ Lukáš Tinkl ]
* Update the panel height hack, orange line is gone
[ Michał Sawicz ]
* Run wrap-and-sort -at

[Gerry Boland (gerboland)]

review: Approve

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'README'
--- README	2014-06-18 23:10:00 +0000
+++ README	2016-01-05 20:27:18 +0000
@@ -1,15 +1,15 @@
   1. Description
   2. Running
-  3. Building
-  4. QPA native interface
-  5. QPA properties
+  3. Debug messages and logging
+  4. Building
+  5. QPA native interface
 
 
 1. Description
 --------------
 
   QtUbuntu contains a QPA (Qt Platform Abstraction) plugin based on the Ubuntu
-  Platform API
+  Platform API and Mir client API
 
 
 2 Running
@@ -39,7 +39,20 @@
     QTUBUNTU_ICON_THEME: Specifies the default icon theme name.
 
 
-3. Building
+3 Debug messages and logging
+----------------------------
+
+  QtUbuntu uses Qt logging categories (see QLoggingCategory class documentation
+  for more information). By default warnings and critical messages are
+  logged and debug messages are disabled. QtUbuntu provides the following
+  logging categories:
+
+  * ubuntumirclient.input       - Messages related to input and other Mir events.
+  * ubuntumirclient.swapBuffers - Messages related to surface buffer swapping.
+  * ubuntumirclient             - For all other messages.
+
+
+4. Building
 -----------
 
   To compile QtUbuntu, create the makefiles with qmake and build with
@@ -54,7 +67,7 @@
     $ qmake CONFIG+=debug
 
 
-4. QPA native interface
+5. QPA native interface
 -----------------------
 
   The QPA plugin exposes a native interface allowing to retrieve

=== modified file 'src/ubuntumirclient/clipboard.cpp'
--- src/ubuntumirclient/clipboard.cpp	2015-11-17 14:49:30 +0000
+++ src/ubuntumirclient/clipboard.cpp	2016-01-05 20:27:18 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "clipboard.h"
+#include "logging.h"
 
 #include <QtCore/QMimeData>
 #include <QtCore/QStringList>
@@ -80,7 +81,7 @@
 
     QDBusPendingReply<QByteArray> reply = *call;
     if (reply.isError()) {
-        qCritical("UbuntuClipboard - Failed to get system clipboard contents via D-Bus. %s, %s",
+        qCCritical(ubuntumirclient, "Failed to get system clipboard contents via D-Bus. %s, %s",
                 qPrintable(reply.error().name()), qPrintable(reply.error().message()));
         // TODO: Might try again later a number of times...
     } else {
@@ -94,7 +95,7 @@
 {
     QDBusPendingReply<void> reply = *call;
     if (reply.isError()) {
-        qCritical("UbuntuClipboard - Failed to set the system clipboard contents via D-Bus. %s, %s",
+        qCCritical(ubuntumirclient, "Failed to set the system clipboard contents via D-Bus. %s, %s",
                 qPrintable(reply.error().name()), qPrintable(reply.error().message()));
         // TODO: Might try again later a number of times...
     }
@@ -113,7 +114,7 @@
         mIsOutdated = false;
         emitChanged(QClipboard::Clipboard);
     } else {
-        qWarning("UbuntuClipboard - Got invalid serialized mime data. Ignoring it.");
+        qCWarning(ubuntumirclient) << "Got invalid serialized mime data. Ignoring it.";
     }
 }
 
@@ -128,7 +129,7 @@
             QStringLiteral("ContentsChanged"),
             this, SLOT(updateMimeData(QByteArray)));
     if (!ok) {
-        qCritical("UbuntuClipboard - Failed to connect to ContentsChanged signal form the D-Bus system clipboard.");
+        qCCritical(ubuntumirclient) << "Failed to connect to ContentsChanged signal form the D-Bus system clipboard.";
     }
 
     mDBusClipboard = new QDBusInterface(QStringLiteral("com.canonical.QtMir"),
@@ -176,7 +177,7 @@
             }
         }
     } else {
-        qWarning("UbuntuClipboard: Not sending contents (%d bytes) to the global clipboard as it's"
+        qCWarning(ubuntumirclient, "Not sending contents (%d bytes) to the global clipboard as it's"
                 " bigger than the maximum allowed size of %d bytes", bufferSize, maxBufferSize);
     }
 

=== modified file 'src/ubuntumirclient/cursor.cpp'
--- src/ubuntumirclient/cursor.cpp	2015-11-24 13:12:48 +0000
+++ src/ubuntumirclient/cursor.cpp	2016-01-05 20:27:18 +0000
@@ -49,7 +49,6 @@
 }
 
 namespace {
-#if !defined(QT_NO_DEBUG)
 const char *qtCursorShapeToStr(Qt::CursorShape shape)
 {
     switch(shape) {
@@ -103,7 +102,6 @@
         return "???";
     }
 }
-#endif // !defined(QT_NO_DEBUG)
 } // anonymous namespace
 
 void UbuntuCursor::changeCursor(QCursor *windowCursor, QWindow *window)
@@ -120,7 +118,7 @@
 
 
     if (windowCursor) {
-        DLOG("[ubuntumirclient QPA] changeCursor shape=%s, window=%p\n", qtCursorShapeToStr(windowCursor->shape()), window);
+        qCDebug(ubuntumirclient, "changeCursor shape=%s, window=%p", qtCursorShapeToStr(windowCursor->shape()), window);
         if (!windowCursor->pixmap().isNull()) {
             configureMirCursorWithPixmapQCursor(surface, *windowCursor);
         } else if (windowCursor->shape() == Qt::BitmapCursor) {

=== modified file 'src/ubuntumirclient/glcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2015-10-23 19:29:38 +0000
+++ src/ubuntumirclient/glcontext.cpp	2016-01-05 20:27:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -19,24 +19,22 @@
 #include "logging.h"
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
-#if !defined(QT_NO_DEBUG)
 static void printOpenGLESConfig() {
   static bool once = true;
   if (once) {
     const char* string = (const char*) glGetString(GL_VENDOR);
-    LOG("OpenGL ES vendor: %s", string);
+    qCDebug(ubuntumirclient, "OpenGL ES vendor: %s", string);
     string = (const char*) glGetString(GL_RENDERER);
-    LOG("OpenGL ES renderer: %s", string);
+    qCDebug(ubuntumirclient, "OpenGL ES renderer: %s", string);
     string = (const char*) glGetString(GL_VERSION);
-    LOG("OpenGL ES version: %s", string);
+    qCDebug(ubuntumirclient, "OpenGL ES version: %s", string);
     string = (const char*) glGetString(GL_SHADING_LANGUAGE_VERSION);
-    LOG("OpenGL ES Shading Language version: %s", string);
+    qCDebug(ubuntumirclient, "OpenGL ES Shading Language version: %s", string);
     string = (const char*) glGetString(GL_EXTENSIONS);
-    LOG("OpenGL ES extensions: %s", string);
+    qCDebug(ubuntumirclient, "OpenGL ES extensions: %s", string);
     once = false;
   }
 }
-#endif
 
 static EGLenum api_in_use()
 {
@@ -62,7 +60,7 @@
 
     mEglContext = eglCreateContext(mEglDisplay, screen->eglConfig(), share ? share->eglContext() : EGL_NO_CONTEXT,
                                    attribs.constData());
-    DASSERT(mEglContext != EGL_NO_CONTEXT);
+    Q_ASSERT(mEglContext != EGL_NO_CONTEXT);
 }
 
 UbuntuOpenGLContext::~UbuntuOpenGLContext()
@@ -72,28 +70,20 @@
 
 bool UbuntuOpenGLContext::makeCurrent(QPlatformSurface* surface)
 {
-    DASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
+    Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
     EGLSurface eglSurface = static_cast<UbuntuWindow*>(surface)->eglSurface();
-#if defined(QT_NO_DEBUG)
-    eglBindAPI(api_in_use());
-    eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext);
-#else
     ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
     ASSERT(eglMakeCurrent(mEglDisplay, eglSurface, eglSurface, mEglContext) == EGL_TRUE);
-    printOpenGLESConfig();
-#endif
+    if (ubuntumirclient().isDebugEnabled()) {
+        printOpenGLESConfig();
+    }
     return true;
 }
 
 void UbuntuOpenGLContext::doneCurrent()
 {
-#if defined(QT_NO_DEBUG)
-    eglBindAPI(api_in_use());
-    eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-#else
     ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
     ASSERT(eglMakeCurrent(mEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) == EGL_TRUE);
-#endif
 }
 
 void UbuntuOpenGLContext::swapBuffers(QPlatformSurface* surface)
@@ -101,23 +91,14 @@
     UbuntuWindow *ubuntuWindow = static_cast<UbuntuWindow*>(surface);
 
     EGLSurface eglSurface = ubuntuWindow->eglSurface();
-#if defined(QT_NO_DEBUG)
-    eglBindAPI(api_in_use());
-    eglSwapBuffers(mEglDisplay, eglSurface);
-#else
     ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
     ASSERT(eglSwapBuffers(mEglDisplay, eglSurface) == EGL_TRUE);
-#endif
 
     ubuntuWindow->onSwapBuffersDone();
 }
 
 void (*UbuntuOpenGLContext::getProcAddress(const QByteArray& procName)) ()
 {
-#if defined(QT_NO_DEBUG)
-    eglBindAPI(api_in_use());
-#else
     ASSERT(eglBindAPI(api_in_use()) == EGL_TRUE);
-#endif
     return eglGetProcAddress(procName.constData());
 }

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-12-23 13:55:42 +0000
+++ src/ubuntumirclient/input.cpp	2016-01-05 20:27:18 +0000
@@ -24,9 +24,7 @@
 #include "orientationchangeevent_p.h"
 
 // Qt
-#if !defined(QT_NO_DEBUG)
 #include <QtCore/QThread>
-#endif
 #include <QtCore/qglobal.h>
 #include <QtCore/QCoreApplication>
 #include <private/qguiapplication_p.h>
@@ -38,7 +36,7 @@
 
 #include <mir_toolkit/mir_client_library.h>
 
-#define LOG_EVENTS 0
+Q_LOGGING_CATEGORY(ubuntumirclientInput, "ubuntumirclient.input", QtWarningMsg)
 
 // XKB Keysyms which do not map directly to Qt types (i.e. Unicode points)
 static const uint32_t KeyTable[] = {
@@ -158,7 +156,6 @@
   // Qt will take care of deleting mTouchDevice.
 }
 
-#if (LOG_EVENTS != 0)
 static const char* nativeEventTypeToStr(MirEventType t)
 {
     switch (t)
@@ -180,20 +177,18 @@
     case mir_event_type_input:
         return "mir_event_type_input";
     default:
-        DLOG("Invalid event type %d", t);
         return "invalid";
     }
 }
-#endif // LOG_EVENTS != 0
 
 void UbuntuInput::customEvent(QEvent* event)
 {
-    DASSERT(QThread::currentThread() == thread());
+    Q_ASSERT(QThread::currentThread() == thread());
     UbuntuEvent* ubuntuEvent = static_cast<UbuntuEvent*>(event);
     const MirEvent *nativeEvent = ubuntuEvent->nativeEvent;
 
     if ((ubuntuEvent->window == nullptr) || (ubuntuEvent->window->window() == nullptr)) {
-        qWarning() << "Attempted to deliver an event to a non-existent window, ignoring.";
+        qCWarning(ubuntumirclient) << "Attempted to deliver an event to a non-existent window, ignoring.";
         return;
     }
 
@@ -202,13 +197,11 @@
     if (QWindowSystemInterface::handleNativeEvent(
             ubuntuEvent->window->window(), mEventFilterType,
             const_cast<void *>(static_cast<const void *>(nativeEvent)), &result) == true) {
-        DLOG("event filtered out by native interface");
+        qCDebug(ubuntumirclient, "event filtered out by native interface");
         return;
     }
 
-    #if (LOG_EVENTS != 0)
-    LOG("UbuntuInput::customEvent(type=%s)", nativeEventTypeToStr(mir_event_get_type(nativeEvent)));
-    #endif
+    qCDebug(ubuntumirclientInput, "customEvent(type=%s)", nativeEventTypeToStr(mir_event_get_type(nativeEvent)));
 
     // Event dispatching.
     switch (mir_event_get_type(nativeEvent))
@@ -248,7 +241,7 @@
                 QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
 
             } else if(!mPendingFocusGainedEvents) {
-                DLOG("[ubuntumirclient QPA] No windows have focus");
+                qCDebug(ubuntumirclient, "No windows have focus");
                 QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
                 QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
             }
@@ -262,7 +255,7 @@
         QWindowSystemInterface::handleCloseEvent(ubuntuEvent->window->window());
         break;
     default:
-        DLOG("unhandled event type: %d", static_cast<int>(mir_event_get_type(nativeEvent)));
+        qCDebug(ubuntumirclient, "unhandled event type: %d", static_cast<int>(mir_event_get_type(nativeEvent)));
     }
 }
 
@@ -426,7 +419,7 @@
         QKeyEvent qKeyEvent(keyType, sym, modifiers, text, is_auto_rep);
         qKeyEvent.setTimestamp(timestamp);
         if (context->filterEvent(&qKeyEvent)) {
-            DLOG("key event filtered out by input context");
+            qCDebug(ubuntumirclient, "key event filtered out by input context");
             return;
         }
     }
@@ -490,11 +483,10 @@
         QWindowSystemInterface::handleLeaveEvent(window);
         break;
     default:
-        DLOG("Unrecognized pointer event");
+        qCDebug(ubuntumirclient, "Unrecognized pointer event");
     }
 }
 
-#if (LOG_EVENTS != 0)
 static const char* nativeOrientationDirectionToStr(MirOrientation orientation)
 {
     switch (orientation) {
@@ -514,18 +506,14 @@
         return "INVALID!";
     }
 }
-#endif
 
 void UbuntuInput::dispatchOrientationEvent(QWindow *window, const MirOrientationEvent *event)
 {
     MirOrientation mir_orientation = mir_orientation_event_get_direction(event);
-    #if (LOG_EVENTS != 0)
-    // Orientation event logging.
-    LOG("ORIENTATION direction: %s", nativeOrientationDirectionToStr(mir_orientation));
-    #endif
+    qCDebug(ubuntumirclientInput, "orientation direction: %s", nativeOrientationDirectionToStr(mir_orientation));
 
     if (!window->screen()) {
-        DLOG("Window has no associated screen, dropping orientation event");
+        qCDebug(ubuntumirclient, "Window has no associated screen, dropping orientation event");
         return;
     }
 
@@ -544,7 +532,7 @@
         orientation = OrientationChangeEvent::RightUp;
         break;
     default:
-        DLOG("No such orientation %d", mir_orientation);
+        qCDebug(ubuntumirclient, "No such orientation %d", mir_orientation);
         return;
     }
 

=== modified file 'src/ubuntumirclient/input.h'
--- src/ubuntumirclient/input.h	2015-10-24 04:56:44 +0000
+++ src/ubuntumirclient/input.h	2016-01-05 20:27:18 +0000
@@ -20,6 +20,7 @@
 // Qt
 #include <qpa/qwindowsysteminterface.h>
 #include <QAtomicInt>
+#include <QLoggingCategory>
 
 #include <mir_toolkit/mir_client_library.h>
 

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-11-20 15:43:25 +0000
+++ src/ubuntumirclient/integration.cpp	2016-01-05 20:27:18 +0000
@@ -45,7 +45,7 @@
 {
     Q_UNUSED(options)
     Q_UNUSED(context)
-    DASSERT(context != NULL);
+    Q_ASSERT(context != NULL);
     if (qGuiApp->focusWindow()) {
         QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
     } else {
@@ -56,13 +56,13 @@
 static void aboutToStopCallback(UApplicationArchive *archive, void* context)
 {
     Q_UNUSED(archive)
-    DASSERT(context != NULL);
+    Q_ASSERT(context != NULL);
     UbuntuClientIntegration* integration = static_cast<UbuntuClientIntegration*>(context);
     QPlatformInputContext *inputContext = integration->inputContext();
     if (inputContext) {
         inputContext->hideInputPanel();
     } else {
-        qWarning("UbuntuClientIntegration aboutToStopCallback(): no input context");
+        qCWarning(ubuntumirclient) << "aboutToStopCallback(): no input context";
     }
     QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
 }
@@ -184,7 +184,7 @@
         if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
             return true;
         } else {
-            DLOG("ubuntumirclient: disabled threaded OpenGL");
+            qCDebug(ubuntumirclient, "disabled threaded OpenGL");
             return false;
         }
     case MultipleWindows:

=== modified file 'src/ubuntumirclient/logging.h'
--- src/ubuntumirclient/logging.h	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/logging.h	2016-01-05 20:27:18 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -17,23 +17,12 @@
 #ifndef QUBUNTULOGGING_H
 #define QUBUNTULOGGING_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(ubuntumirclient)
+Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientBufferSwap)
+Q_DECLARE_LOGGING_CATEGORY(ubuntumirclientInput)
 
 #endif  // QUBUNTULOGGING_H

=== modified file 'src/ubuntumirclient/plugin.cpp'
--- src/ubuntumirclient/plugin.cpp	2015-09-29 13:09:01 +0000
+++ src/ubuntumirclient/plugin.cpp	2016-01-05 20:27:18 +0000
@@ -16,6 +16,9 @@
 
 #include "plugin.h"
 #include "integration.h"
+#include "logging.h"
+
+Q_LOGGING_CATEGORY(ubuntumirclient, "ubuntumirclient", QtWarningMsg)
 
 QStringList UbuntuMirClientIntegrationPlugin::keys() const
 {

=== modified file 'src/ubuntumirclient/screen.cpp'
--- src/ubuntumirclient/screen.cpp	2015-11-23 11:10:24 +0000
+++ src/ubuntumirclient/screen.cpp	2016-01-05 20:27:18 +0000
@@ -33,8 +33,6 @@
 
 static const int kSwapInterval = 1;
 
-#if !defined(QT_NO_DEBUG)
-
 static const char *orientationToStr(Qt::ScreenOrientation orientation) {
     switch (orientation) {
         case Qt::PrimaryOrientation:
@@ -53,53 +51,55 @@
 }
 
 static void printEglConfig(EGLDisplay display, EGLConfig config) {
-  DASSERT(display != EGL_NO_DISPLAY);
-  DASSERT(config != nullptr);
-  static const struct { const EGLint attrib; const char* name; } kAttribs[] = {
-    { EGL_BUFFER_SIZE, "EGL_BUFFER_SIZE" },
-    { EGL_ALPHA_SIZE, "EGL_ALPHA_SIZE" },
-    { EGL_BLUE_SIZE, "EGL_BLUE_SIZE" },
-    { EGL_GREEN_SIZE, "EGL_GREEN_SIZE" },
-    { EGL_RED_SIZE, "EGL_RED_SIZE" },
-    { EGL_DEPTH_SIZE, "EGL_DEPTH_SIZE" },
-    { EGL_STENCIL_SIZE, "EGL_STENCIL_SIZE" },
-    { EGL_CONFIG_CAVEAT, "EGL_CONFIG_CAVEAT" },
-    { EGL_CONFIG_ID, "EGL_CONFIG_ID" },
-    { EGL_LEVEL, "EGL_LEVEL" },
-    { EGL_MAX_PBUFFER_HEIGHT, "EGL_MAX_PBUFFER_HEIGHT" },
-    { EGL_MAX_PBUFFER_PIXELS, "EGL_MAX_PBUFFER_PIXELS" },
-    { EGL_MAX_PBUFFER_WIDTH, "EGL_MAX_PBUFFER_WIDTH" },
-    { EGL_NATIVE_RENDERABLE, "EGL_NATIVE_RENDERABLE" },
-    { EGL_NATIVE_VISUAL_ID, "EGL_NATIVE_VISUAL_ID" },
-    { EGL_NATIVE_VISUAL_TYPE, "EGL_NATIVE_VISUAL_TYPE" },
-    { EGL_SAMPLES, "EGL_SAMPLES" },
-    { EGL_SAMPLE_BUFFERS, "EGL_SAMPLE_BUFFERS" },
-    { EGL_SURFACE_TYPE, "EGL_SURFACE_TYPE" },
-    { EGL_TRANSPARENT_TYPE, "EGL_TRANSPARENT_TYPE" },
-    { EGL_TRANSPARENT_BLUE_VALUE, "EGL_TRANSPARENT_BLUE_VALUE" },
-    { EGL_TRANSPARENT_GREEN_VALUE, "EGL_TRANSPARENT_GREEN_VALUE" },
-    { EGL_TRANSPARENT_RED_VALUE, "EGL_TRANSPARENT_RED_VALUE" },
-    { EGL_BIND_TO_TEXTURE_RGB, "EGL_BIND_TO_TEXTURE_RGB" },
-    { EGL_BIND_TO_TEXTURE_RGBA, "EGL_BIND_TO_TEXTURE_RGBA" },
-    { EGL_MIN_SWAP_INTERVAL, "EGL_MIN_SWAP_INTERVAL" },
-    { EGL_MAX_SWAP_INTERVAL, "EGL_MAX_SWAP_INTERVAL" },
-    { -1, NULL }
-  };
-  const char* string = eglQueryString(display, EGL_VENDOR);
-  LOG("EGL vendor: %s", string);
-  string = eglQueryString(display, EGL_VERSION);
-  LOG("EGL version: %s", string);
-  string = eglQueryString(display, EGL_EXTENSIONS);
-  LOG("EGL extensions: %s", string);
-  LOG("EGL configuration attibutes:");
-  for (int index = 0; kAttribs[index].attrib != -1; index++) {
-    EGLint value;
-    if (eglGetConfigAttrib(display, config, kAttribs[index].attrib, &value))
-      LOG("  %s: %d", kAttribs[index].name, static_cast<int>(value));
-  }
+    Q_ASSERT(display != EGL_NO_DISPLAY);
+    Q_ASSERT(config != nullptr);
+
+    static const struct { const EGLint attrib; const char* name; } kAttribs[] = {
+        { EGL_BUFFER_SIZE, "EGL_BUFFER_SIZE" },
+        { EGL_ALPHA_SIZE, "EGL_ALPHA_SIZE" },
+        { EGL_BLUE_SIZE, "EGL_BLUE_SIZE" },
+        { EGL_GREEN_SIZE, "EGL_GREEN_SIZE" },
+        { EGL_RED_SIZE, "EGL_RED_SIZE" },
+        { EGL_DEPTH_SIZE, "EGL_DEPTH_SIZE" },
+        { EGL_STENCIL_SIZE, "EGL_STENCIL_SIZE" },
+        { EGL_CONFIG_CAVEAT, "EGL_CONFIG_CAVEAT" },
+        { EGL_CONFIG_ID, "EGL_CONFIG_ID" },
+        { EGL_LEVEL, "EGL_LEVEL" },
+        { EGL_MAX_PBUFFER_HEIGHT, "EGL_MAX_PBUFFER_HEIGHT" },
+        { EGL_MAX_PBUFFER_PIXELS, "EGL_MAX_PBUFFER_PIXELS" },
+        { EGL_MAX_PBUFFER_WIDTH, "EGL_MAX_PBUFFER_WIDTH" },
+        { EGL_NATIVE_RENDERABLE, "EGL_NATIVE_RENDERABLE" },
+        { EGL_NATIVE_VISUAL_ID, "EGL_NATIVE_VISUAL_ID" },
+        { EGL_NATIVE_VISUAL_TYPE, "EGL_NATIVE_VISUAL_TYPE" },
+        { EGL_SAMPLES, "EGL_SAMPLES" },
+        { EGL_SAMPLE_BUFFERS, "EGL_SAMPLE_BUFFERS" },
+        { EGL_SURFACE_TYPE, "EGL_SURFACE_TYPE" },
+        { EGL_TRANSPARENT_TYPE, "EGL_TRANSPARENT_TYPE" },
+        { EGL_TRANSPARENT_BLUE_VALUE, "EGL_TRANSPARENT_BLUE_VALUE" },
+        { EGL_TRANSPARENT_GREEN_VALUE, "EGL_TRANSPARENT_GREEN_VALUE" },
+        { EGL_TRANSPARENT_RED_VALUE, "EGL_TRANSPARENT_RED_VALUE" },
+        { EGL_BIND_TO_TEXTURE_RGB, "EGL_BIND_TO_TEXTURE_RGB" },
+        { EGL_BIND_TO_TEXTURE_RGBA, "EGL_BIND_TO_TEXTURE_RGBA" },
+        { EGL_MIN_SWAP_INTERVAL, "EGL_MIN_SWAP_INTERVAL" },
+        { EGL_MAX_SWAP_INTERVAL, "EGL_MAX_SWAP_INTERVAL" },
+        { -1, NULL }
+    };
+    const char* string = eglQueryString(display, EGL_VENDOR);
+    qCDebug(ubuntumirclient, "EGL vendor: %s", string);
+
+    string = eglQueryString(display, EGL_VERSION);
+    qCDebug(ubuntumirclient, "EGL version: %s", string);
+
+    string = eglQueryString(display, EGL_EXTENSIONS);
+    qCDebug(ubuntumirclient, "EGL extensions: %s", string);
+
+    qCDebug(ubuntumirclient, "EGL configuration attibutes:");
+    for (int index = 0; kAttribs[index].attrib != -1; index++) {
+        EGLint value;
+        if (eglGetConfigAttrib(display, config, kAttribs[index].attrib, &value))
+            qCDebug(ubuntumirclient, "  %s: %d", kAttribs[index].name, static_cast<int>(value));
+    }
 }
-#endif
-
 
 const QEvent::Type OrientationChangeEvent::mType =
         static_cast<QEvent::Type>(QEvent::registerEventType());
@@ -150,7 +150,7 @@
     mSurfaceFormat.setStencilBufferSize(8);
     if (!qEnvironmentVariableIsEmpty("QTUBUNTU_MULTISAMPLE")) {
         mSurfaceFormat.setSamples(4);
-        DLOG("ubuntumirclient: setting MSAA to 4 samples");
+        qCDebug(ubuntumirclient, "setting MSAA to 4 samples");
     }
 #ifdef QTUBUNTU_USE_OPENGL
     mSurfaceFormat.setRenderableType(QSurfaceFormat::OpenGL);
@@ -159,9 +159,9 @@
 #endif
     mEglConfig = q_configFromGLFormat(mEglDisplay, mSurfaceFormat, true);
 
-    #if !defined(QT_NO_DEBUG)
-    printEglConfig(mEglDisplay, mEglConfig);
-    #endif
+    if (ubuntumirclient().isDebugEnabled()) {
+        printEglConfig(mEglDisplay, mEglConfig);
+    }
 
     // Set vblank swap interval.
     int swapInterval = kSwapInterval;
@@ -172,7 +172,7 @@
         if (!ok)
             swapInterval = kSwapInterval;
     }
-    DLOG("ubuntumirclient: setting swap interval to %d", swapInterval);
+    qCDebug(ubuntumirclient, "setting swap interval to %d", swapInterval);
     eglSwapInterval(mEglDisplay, swapInterval);
 
     // Get screen resolution.
@@ -187,19 +187,17 @@
     mOutputId = displayOutput->output_id;
 
     mPhysicalSize = QSizeF(displayOutput->physical_width_mm, displayOutput->physical_height_mm);
-    DLOG("ubuntumirclient: screen physical size: %.2fx%.2f", mPhysicalSize.width(), mPhysicalSize.height());
+    qCDebug(ubuntumirclient, "screen physical size: %.2fx%.2f", mPhysicalSize.width(), mPhysicalSize.height());
 
     const MirDisplayMode *mode = &displayOutput->modes[displayOutput->current_mode];
     const int kScreenWidth = mode->horizontal_resolution;
     const int kScreenHeight = mode->vertical_resolution;
-    DASSERT(kScreenWidth > 0 && kScreenHeight > 0);
+    Q_ASSERT(kScreenWidth > 0 && kScreenHeight > 0);
 
-    DLOG("ubuntumirclient: screen resolution: %dx%d", kScreenWidth, kScreenHeight);
+    qCDebug(ubuntumirclient, "screen resolution: %dx%d", kScreenWidth, kScreenHeight);
 
     mGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
 
-    DLOG("QUbuntuScreen::QUbuntuScreen (this=%p)", this);
-
     // Set the default orientation based on the initial screen dimmensions.
     mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
 
@@ -213,7 +211,7 @@
 }
 
 void UbuntuScreen::customEvent(QEvent* event) {
-    DASSERT(QThread::currentThread() == thread());
+    Q_ASSERT(QThread::currentThread() == thread());
 
     OrientationChangeEvent* oReadingEvent = static_cast<OrientationChangeEvent*>(event);
     switch (oReadingEvent->mOrientation) {
@@ -238,13 +236,13 @@
             break;
         }
         default: {
-            DLOG("UbuntuScreen::customEvent - Unknown orientation.");
+            qCDebug(ubuntumirclient, "UbuntuScreen::customEvent - Unknown orientation.");
             return;
         }
     }
 
     // Raise the event signal so that client apps know the orientation changed
-    DLOG("UbuntuScreen::customEvent - handling orientation change to %s", orientationToStr(mCurrentOrientation));
+    qCDebug(ubuntumirclient, "UbuntuScreen::customEvent - handling orientation change to %s", orientationToStr(mCurrentOrientation));
     QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
 }
 
@@ -265,7 +263,7 @@
         mGeometry.setWidth(currGeometry.height());
         mGeometry.setHeight(currGeometry.width());
 
-        DLOG("UbuntuScreen::handleWindowSurfaceResize - new screen geometry (w=%d, h=%d)",
+        qCDebug(ubuntumirclient, "UbuntuScreen::handleWindowSurfaceResize - new screen geometry (w=%d, h=%d)",
             mGeometry.width(), mGeometry.height());
         QWindowSystemInterface::handleScreenGeometryChange(screen(),
                                                            mGeometry /* newGeometry */,
@@ -276,7 +274,7 @@
         } else {
             mCurrentOrientation = Qt::LandscapeOrientation;
         }
-        DLOG("UbuntuScreen::handleWindowSurfaceResize - new orientation %s",orientationToStr(mCurrentOrientation));
+        qCDebug(ubuntumirclient, "UbuntuScreen::handleWindowSurfaceResize - new orientation %s",orientationToStr(mCurrentOrientation));
         QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
     }
 }

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-12-16 11:28:09 +0000
+++ src/ubuntumirclient/window.cpp	2016-01-05 20:27:18 +0000
@@ -34,6 +34,8 @@
 
 #include <EGL/egl.h>
 
+Q_LOGGING_CATEGORY(ubuntumirclientBufferSwap, "ubuntumirclient.bufferSwap", QtWarningMsg)
+
 namespace
 {
 
@@ -75,12 +77,11 @@
     case Qt::WindowMinimized:
         return mir_surface_state_minimized;
     default:
-        LOG("Unexpected Qt::WindowState: %d", state);
+        qCWarning(ubuntumirclient, "Unexpected Qt::WindowState: %d", state);
         return mir_surface_state_restored;
     }
 }
 
-#if !defined(QT_NO_DEBUG)
 const char *qtWindowStateToStr(Qt::WindowState state)
 {
     switch (state) {
@@ -96,7 +97,6 @@
         return "!?";
     }
 }
-#endif
 
 WId makeId()
 {
@@ -133,50 +133,50 @@
 
 Spec makeSurfaceSpec(QWindow *window, UbuntuInput *input, MirConnection *connection)
 {
-   const auto geom = window->geometry();
-   const int width = geom.width() > 0 ? geom.width() : 1;
-   const int height = geom.height() > 0 ? geom.height() : 1;
-   const auto pixelFormat = defaultPixelFormatFor(connection);
-
-   if (U_ON_SCREEN_KEYBOARD_ROLE == roleFor(window)) {
-       DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - creating input method surface (width=%d, height=%d", window, width, height);
-       return Spec{mir_connection_create_spec_for_input_method(connection, width, height, pixelFormat)};
-   }
-
-   const Qt::WindowType type = window->type();
-   if (type == Qt::Popup) {
-       auto parent = transientParentFor(window);
-       if (parent == nullptr) {
-           //NOTE: We cannot have a parentless popup -
-           //try using the last surface to receive input as that will most likely be
-           //the one that caused this popup to be created
-           parent = input->lastFocusedWindow();
-       }
-       if (parent) {
-           auto pos = geom.topLeft();
-           pos -= parent->geometry().topLeft();
-           MirRectangle location{pos.x(), pos.y(), 0, 0};
-           DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - creating menu surface(width:%d, height:%d)", window, width, height);
-           return Spec{mir_connection_create_spec_for_menu(
-                       connection, width, height, pixelFormat, parent->mirSurface(),
-                       &location, mir_edge_attachment_any)};
-       } else {
-           DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - cannot create a menu without a parent!", window);
-       }
-   } else if (type == Qt::Dialog) {
-       auto parent = transientParentFor(window);
-       if (parent) {
-           // Modal dialog
-           DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - creating modal dialog (width=%d, height=%d", window, width, height);
-           return Spec{mir_connection_create_spec_for_modal_dialog(connection, width, height, pixelFormat, parent->mirSurface())};
-       } else {
-           // TODO: do Qt parentless dialogs have the same semantics as mir?
-           DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - creating parentless dialog (width=%d, height=%d)", window, width, height);
-           return Spec{mir_connection_create_spec_for_dialog(connection, width, height, pixelFormat)};
-       }
-   }
-   DLOG("[ubuntumirclient QPA] makeSurfaceSpec(window=%p) - creating normal surface(type=0x%x, width=%d, height=%d)", window, type, width, height);
-   return Spec{mir_connection_create_spec_for_normal_surface(connection, width, height, pixelFormat)};
+    const auto geom = window->geometry();
+    const int width = geom.width() > 0 ? geom.width() : 1;
+    const int height = geom.height() > 0 ? geom.height() : 1;
+    const auto pixelFormat = defaultPixelFormatFor(connection);
+
+    if (U_ON_SCREEN_KEYBOARD_ROLE == roleFor(window)) {
+        qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - creating input method surface (width=%d, height=%d", window, width, height);
+        return Spec{mir_connection_create_spec_for_input_method(connection, width, height, pixelFormat)};
+    }
+
+    const Qt::WindowType type = window->type();
+    if (type == Qt::Popup) {
+        auto parent = transientParentFor(window);
+        if (parent == nullptr) {
+            //NOTE: We cannot have a parentless popup -
+            //try using the last surface to receive input as that will most likely be
+            //the one that caused this popup to be created
+            parent = input->lastFocusedWindow();
+        }
+        if (parent) {
+            auto pos = geom.topLeft();
+            pos -= parent->geometry().topLeft();
+            MirRectangle location{pos.x(), pos.y(), 0, 0};
+            qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - creating menu surface(width:%d, height:%d)", window, width, height);
+            return Spec{mir_connection_create_spec_for_menu(
+                    connection, width, height, pixelFormat, parent->mirSurface(),
+                    &location, mir_edge_attachment_any)};
+        } else {
+            qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - cannot create a menu without a parent!", window);
+        }
+    } else if (type == Qt::Dialog) {
+        auto parent = transientParentFor(window);
+        if (parent) {
+            // Modal dialog
+            qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - creating modal dialog (width=%d, height=%d", window, width, height);
+            return Spec{mir_connection_create_spec_for_modal_dialog(connection, width, height, pixelFormat, parent->mirSurface())};
+        } else {
+            // TODO: do Qt parentless dialogs have the same semantics as mir?
+            qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - creating parentless dialog (width=%d, height=%d)", window, width, height);
+            return Spec{mir_connection_create_spec_for_dialog(connection, width, height, pixelFormat)};
+        }
+    }
+    qCDebug(ubuntumirclient, "makeSurfaceSpec(window=%p) - creating normal surface(type=0x%x, width=%d, height=%d)", window, type, width, height);
+    return Spec{mir_connection_create_spec_for_normal_surface(connection, width, height, pixelFormat)};
 }
 
 void setSizingConstraints(MirSurfaceSpec *spec, const QSize& minSize, const QSize& maxSize, const QSize& increment)
@@ -271,7 +271,7 @@
         platformWindow->QPlatformWindow::setGeometry(geom);
         QWindowSystemInterface::handleGeometryChange(mWindow, geom);
 
-        DLOG("[ubuntumirclient QPA] created surface at (%d, %d) with size (%d, %d), title '%s', role: '%d'\n",
+        qCDebug(ubuntumirclient, "created surface at (%d, %d) with size (%d, %d), title '%s', role: '%d'\n",
              geom.x(), geom.y(), geom.width(), geom.height(), mWindow->title().toUtf8().constData(), roleFor(mWindow));
     }
 
@@ -325,15 +325,15 @@
 
 void UbuntuSurface::resize(const QSize& size)
 {
-    DLOG("[ubuntumirclient QPA] resize(window=%p, width=%d, height=%d)", mWindow, size.width(), size.height());
+    qCDebug(ubuntumirclient,"resize(window=%p, width=%d, height=%d)", mWindow, size.width(), size.height());
 
     if (mWindowState == Qt::WindowFullScreen || mWindowState == Qt::WindowMaximized) {
-        DLOG("[ubuntumirclient QPA] resize(window=%p) - not resizing, window is maximized or fullscreen", mWindow);
+        qCDebug(ubuntumirclient, "resize(window=%p) - not resizing, window is maximized or fullscreen", mWindow);
         return;
     }
 
     if (size.isEmpty()) {
-        DLOG("[ubuntumirclient QPA] resize(window=%p) - not resizing, size is empty", mWindow);
+        qCDebug(ubuntumirclient, "resize(window=%p) - not resizing, size is empty", mWindow);
         return;
     }
 
@@ -412,10 +412,8 @@
 
 void UbuntuSurface::onSwapBuffersDone()
 {
-#if !defined(QT_NO_DEBUG)
     static int sFrameNumber = 0;
     ++sFrameNumber;
-#endif
 
     EGLint eglSurfaceWidth = -1;
     EGLint eglSurfaceHeight = -1;
@@ -426,7 +424,7 @@
 
     if (validSize && (mBufferSize.width() != eglSurfaceWidth || mBufferSize.height() != eglSurfaceHeight)) {
 
-        DLOG("[ubuntumirclient QPA] onSwapBuffersDone(window=%p) [%d] - size changed (%d, %d) => (%d, %d)",
+        qCDebug(ubuntumirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - size changed (%d, %d) => (%d, %d)",
                mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height(), eglSurfaceWidth, eglSurfaceHeight);
 
         mBufferSize.rwidth() = eglSurfaceWidth;
@@ -438,7 +436,7 @@
         mPlatformWindow->QPlatformWindow::setGeometry(newGeometry);
         QWindowSystemInterface::handleGeometryChange(mWindow, newGeometry);
     } else {
-        DLOG("[ubuntumirclient QPA] onSwapBuffersDone(window=%p) [%d] - buffer size (%d,%d)",
+        qCDebug(ubuntumirclientBufferSwap, "onSwapBuffersDone(window=%p) [%d] - buffer size (%d,%d)",
                mWindow, sFrameNumber, mBufferSize.width(), mBufferSize.height());
     }
 }
@@ -462,7 +460,7 @@
         const auto resizeEvent = mir_event_get_resize_event(event);
         const auto width =  mir_resize_event_get_width(resizeEvent);
         const auto height =  mir_resize_event_get_height(resizeEvent);
-        DLOG("[ubuntumirclient QPA] resizeEvent(window=%p, width=%d, height=%d)", mWindow, width, height);
+        qCDebug(ubuntumirclient, "resizeEvent(window=%p, width=%d, height=%d)", mWindow, width, height);
 
         QMutexLocker lock(&mTargetSizeMutex);
         mTargetSize.rwidth() = width;
@@ -474,14 +472,14 @@
 
 void UbuntuSurface::updateSurface()
 {
-    DLOG("[ubuntumirclient QPA] updateSurface(window=%p)", mWindow);
+    qCDebug(ubuntumirclient, "updateSurface(window=%p)", mWindow);
 
     if (!mParented && mWindow->type() == Qt::Dialog) {
         // The dialog may have been parented after creation time
         // so morph it into a modal dialog
         auto parent = transientParentFor(mWindow);
         if (parent) {
-            DLOG("[ubuntumirclient QPA] updateSurface(window=%p) dialog now parented", mWindow);
+            qCDebug(ubuntumirclient, "updateSurface(window=%p) dialog now parented", mWindow);
             mParented = true;
             Spec spec{mir_connection_create_spec_for_changes(mConnection)};
             mir_surface_spec_set_parent(spec.get(), parent->mirSurface());
@@ -498,18 +496,18 @@
     , mClipboard(clipboard)
     , mSurface(new UbuntuSurface{this, screen, input, connection})
 {
-    DLOG("[ubuntumirclient QPA] UbuntuWindow(window=%p, screen=%p, input=%p, surf=%p)", w, screen, input, mSurface.get());
+    qCDebug(ubuntumirclient, "UbuntuWindow(window=%p, screen=%p, input=%p, surf=%p)", w, screen, input, mSurface.get());
 }
 
 UbuntuWindow::~UbuntuWindow()
 {
-    DLOG("[ubuntumirclient QPA] ~UbuntuWindow(window=%p)", this);
+    qCDebug(ubuntumirclient, "~UbuntuWindow(window=%p)", this);
 }
 
 void UbuntuWindow::handleSurfaceResized(int width, int height)
 {
     QMutexLocker lock(&mMutex);
-    DLOG("[ubuntumirclient QPA] handleSurfaceResize(window=%p, width=%d, height=%d)", window(), width, height);
+    qCDebug(ubuntumirclient, "handleSurfaceResize(window=%p, width=%d, height=%d)", window(), width, height);
 
     mSurface->handleSurfaceResized(width, height);
 
@@ -519,16 +517,16 @@
     // updated size but it still needs re-rendering so another redraw may be needed.
     // A mir API to drop the currently held buffer would help here, so that we wouldn't have to redraw twice
     auto const numRepaints = mSurface->needsRepaint();
-    DLOG("[ubuntumirclient QPA] handleSurfaceResize(window=%p) redraw %d times", window(), numRepaints);
+    qCDebug(ubuntumirclient, "handleSurfaceResize(window=%p) redraw %d times", window(), numRepaints);
     for (int i = 0; i < numRepaints; i++) {
-        DLOG("[ubuntumirclient QPA] handleSurfaceResize(window=%p) repainting width=%d, height=%d", window(), geometry().size().width(), geometry().size().height());
+        qCDebug(ubuntumirclient, "handleSurfaceResize(window=%p) repainting width=%d, height=%d", window(), geometry().size().width(), geometry().size().height());
         QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(), geometry().size()));
     }
 }
 
 void UbuntuWindow::handleSurfaceFocused()
 {
-    DLOG("[ubuntumirclient QPA] handleSurfaceFocused(window=%p)", window());
+    qCDebug(ubuntumirclient, "handleSurfaceFocused(window=%p)", window());
 
     // System clipboard contents might have changed while this window was unfocused and without
     // this process getting notified about it because it might have been suspended (due to
@@ -542,7 +540,7 @@
 void UbuntuWindow::setWindowState(Qt::WindowState state)
 {
     QMutexLocker lock(&mMutex);
-    DLOG("[ubuntumirclient QPA] setWindowState(window=%p, %s)", this, qtWindowStateToStr(state));
+    qCDebug(ubuntumirclient, "setWindowState(window=%p, %s)", this, qtWindowStateToStr(state));
     mSurface->setState(state);
 
     updatePanelHeightHack(state);
@@ -572,7 +570,7 @@
 void UbuntuWindow::setGeometry(const QRect& rect)
 {
     QMutexLocker lock(&mMutex);
-    DLOG("[ubuntumirclient QPA] setGeometry (window=%p, x=%d, y=%d, width=%d, height=%d)",
+    qCDebug(ubuntumirclient, "setGeometry (window=%p, x=%d, y=%d, width=%d, height=%d)",
            window(), rect.x(), rect.y(), rect.width(), rect.height());
 
     //NOTE: mir surfaces cannot be moved by the client so ignore the topLeft coordinates
@@ -587,7 +585,7 @@
 void UbuntuWindow::setVisible(bool visible)
 {
     QMutexLocker lock(&mMutex);
-    DLOG("[ubuntumirclient QPA] setVisible (window=%p, visible=%s)", window(), visible ? "true" : "false");
+    qCDebug(ubuntumirclient, "setVisible (window=%p, visible=%s)", window(), visible ? "true" : "false");
 
     mSurface->setVisible(visible);
     const QRect& exposeRect = visible ? QRect(QPoint(), geometry().size()) : QRect();
@@ -600,7 +598,7 @@
 void UbuntuWindow::setWindowTitle(const QString& title)
 {
     QMutexLocker lock(&mMutex);
-    DLOG("[ubuntumirclient QPA] setWindowTitle(window=%p) title=%s)", window(), title.toUtf8().constData());
+    qCDebug(ubuntumirclient, "setWindowTitle(window=%p) title=%s)", window(), title.toUtf8().constData());
     mSurface->updateTitle(title);
 }
 
@@ -608,7 +606,7 @@
 {
     QMutexLocker lock(&mMutex);
     const auto win = window();
-    DLOG("[ubuntumirclient QPA] propagateSizeHints(window=%p) min(%d,%d), max(%d,%d) increment(%d, %d)",
+    qCDebug(ubuntumirclient, "propagateSizeHints(window=%p) min(%d,%d), max(%d,%d) increment(%d, %d)",
            win, win->minimumSize().width(), win->minimumSize().height(),
            win->maximumSize().width(), win->maximumSize().height(),
            win->sizeIncrement().width(), win->sizeIncrement().height());

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2015-12-07 16:20:58 +0000
+++ src/ubuntumirclient/window.h	2016-01-05 20:27:18 +0000
@@ -18,6 +18,7 @@
 #define UBUNTU_WINDOW_H
 
 #include <qpa/qplatformwindow.h>
+#include <QLoggingCategory>
 #include <QSharedPointer>
 #include <QMutex>