7 files changed, 16 insertions, 19 deletions
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index cc8d850689..373722cdb4 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -80,6 +80,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcQpaBackingStore, "qt.qpa.backingstore", QtWarningMsg);
+
 class QPlatformBackingStorePrivate
 {
 public:
@@ -331,16 +333,19 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
         d_ptr->context->setScreen(d_ptr->window->screen());
         d_ptr->context->setShareContext(qt_window_private(d_ptr->window)->shareContext());
         if (!d_ptr->context->create()) {
-            qWarning("composeAndFlush: QOpenGLContext creation failed");
+            qCWarning(lcQpaBackingStore, "composeAndFlush: QOpenGLContext creation failed");
             return;
         }
     }
 
     if (!d_ptr->context->makeCurrent(window)) {
-        qWarning("composeAndFlush: makeCurrent() failed");
+        qCWarning(lcQpaBackingStore, "composeAndFlush: makeCurrent() failed");
         return;
     }
 
+    qCDebug(lcQpaBackingStore) << "Composing and flushing" << region << "of" << window
+        << "at offset" << offset << "with" << textures->count() << "texture(s) in" << textures;
+
     QWindowPrivate::get(window)->lastComposeTime.start();
 
     QOpenGLFunctions *funcs = d_ptr->context->functions();
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index 381c564079..de5ba964dc 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -50,6 +50,7 @@
 //
 
 #include <QtGui/qtguiglobal.h>
+#include <QtCore/qloggingcategory.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qobject.h>
 
@@ -59,6 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_GUI_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcQpaBackingStore)
 
 class QRegion;
 class QRect;
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
index 23a9edfa49..332683f63e 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
@@ -44,8 +44,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_LOGGING_CATEGORY(lcQpaBackingStore, "qt.qpa.backingstore");
-
 QCocoaBackingStore::QCocoaBackingStore(QWindow *window)
     : QRasterBackingStore(window)
 {
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 8d6a81036b..bba7d044f7 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -89,7 +89,6 @@
 QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcQpaWindows, "qt.qpa.windows")
-Q_LOGGING_CATEGORY(lcQpaBackingStore, "qt.qpa.backingstore")
 Q_LOGGING_CATEGORY(lcQpaEvents, "qt.qpa.events")
 Q_LOGGING_CATEGORY(lcQpaGl, "qt.qpa.gl")
 Q_LOGGING_CATEGORY(lcQpaMime, "qt.qpa.mime")
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
index 2c2313c30a..fe83c83934 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -57,7 +57,6 @@ struct _SHSTOCKICONINFO;
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcQpaWindows)
-Q_DECLARE_LOGGING_CATEGORY(lcQpaBackingStore)
 Q_DECLARE_LOGGING_CATEGORY(lcQpaEvents)
 Q_DECLARE_LOGGING_CATEGORY(lcQpaGl)
 Q_DECLARE_LOGGING_CATEGORY(lcQpaMime)
diff --git a/src/plugins/platforms/winrt/qwinrtbackingstore.cpp b/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
index 113886f9b4..b3bf52f09b 100644
--- a/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
+++ b/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
@@ -50,9 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_LOGGING_CATEGORY(lcQpaBackingStore, "qt.qpa.backingstore")
-Q_LOGGING_CATEGORY(lcQpaBackingStoreVerbose, "qt.qpa.backingstore.verbose")
-
 class QWinRTBackingStorePrivate
 {
 public:
@@ -68,7 +65,7 @@ QWinRTBackingStore::QWinRTBackingStore(QWindow *window)
     : QPlatformBackingStore(window), d_ptr(new QWinRTBackingStorePrivate)
 {
     Q_D(QWinRTBackingStore);
-    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this << window;
+    qCInfo(lcQpaBackingStore) << __FUNCTION__ << this << window;
 
     d->initialized = false;
     d->screen = static_cast<QWinRTScreen*>(window->screen()->handle());
@@ -80,7 +77,7 @@ QWinRTBackingStore::QWinRTBackingStore(QWindow *window)
 bool QWinRTBackingStore::initialize()
 {
     Q_D(QWinRTBackingStore);
-    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << d->initialized;
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << d->initialized;
 
     if (d->initialized)
         return true;
@@ -102,7 +99,7 @@ bool QWinRTBackingStore::initialize()
 
 QWinRTBackingStore::~QWinRTBackingStore()
 {
-    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this;
+    qCInfo(lcQpaBackingStore) << __FUNCTION__ << this;
 }
 
 QPaintDevice *QWinRTBackingStore::paintDevice()
@@ -116,7 +113,7 @@ void QWinRTBackingStore::flush(QWindow *window, const QRegion &region, const QPo
     Q_D(QWinRTBackingStore);
     Q_UNUSED(offset)
 
-    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << window << region;
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this << window << region;
 
     if (d->size.isEmpty())
         return;
@@ -151,7 +148,7 @@ void QWinRTBackingStore::resize(const QSize &size, const QRegion &staticContents
     Q_D(QWinRTBackingStore);
     Q_UNUSED(staticContents)
 
-    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << size;
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this << size;
 
     if (!initialize())
         return;
@@ -182,14 +179,14 @@ QImage QWinRTBackingStore::toImage() const
 
 void QWinRTBackingStore::beginPaint(const QRegion &region)
 {
-    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << region;
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this << region;
 
     resize(window()->size(), region);
 }
 
 void QWinRTBackingStore::endPaint()
 {
-    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this;
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this;
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/winrt/qwinrtbackingstore.h b/src/plugins/platforms/winrt/qwinrtbackingstore.h
index cd05faa63e..51fa13845e 100644
--- a/src/plugins/platforms/winrt/qwinrtbackingstore.h
+++ b/src/plugins/platforms/winrt/qwinrtbackingstore.h
@@ -47,9 +47,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_DECLARE_LOGGING_CATEGORY(lcQpaBackingStore)
-Q_DECLARE_LOGGING_CATEGORY(lcQpaBackingStoreVerbose)
-
 class QWinRTScreen;
 
 class QWinRTBackingStorePrivate;