Merge remote-tracking branch 'origin/5.6' into 5.7

This also reverts commit 018e670a26ff5a61b949100ae080f5e654e7bee8.

The change was introduced in 5.6. After the refactoring, 14960f52,
in 5.7 branch and a merge, it is not needed any more.

Conflicts:
	.qmake.conf
	src/corelib/io/qstandardpaths_mac.mm
	src/corelib/tools/qsharedpointer_impl.h
	tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp

Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4

1 files changed, 13 insertions, 0 deletions

diff --git a/src/plugins/platforms/winrt/qwinrtbackingstore.cpp b/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
index 4517200a2d..fc7ab15f73 100644
--- a/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
+++ b/src/plugins/platforms/winrt/qwinrtbackingstore.cpp
@@ -47,6 +47,9 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(lcQpaBackingStore, "qt.qpa.backingstore")
+Q_LOGGING_CATEGORY(lcQpaBackingStoreVerbose, "qt.qpa.backingstore.verbose")
+
 class QWinRTBackingStorePrivate
 {
 public:
@@ -62,6 +65,7 @@ QWinRTBackingStore::QWinRTBackingStore(QWindow *window)
     : QPlatformBackingStore(window), d_ptr(new QWinRTBackingStorePrivate)
 {
     Q_D(QWinRTBackingStore);
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this << window;
 
     d->initialized = false;
     d->screen = static_cast<QWinRTScreen*>(window->screen()->handle());
@@ -73,6 +77,7 @@ QWinRTBackingStore::QWinRTBackingStore(QWindow *window)
 bool QWinRTBackingStore::initialize()
 {
     Q_D(QWinRTBackingStore);
+    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << d->initialized;
 
     if (d->initialized)
         return true;
@@ -94,6 +99,7 @@ bool QWinRTBackingStore::initialize()
 
 QWinRTBackingStore::~QWinRTBackingStore()
 {
+    qCDebug(lcQpaBackingStore) << __FUNCTION__ << this;
 }
 
 QPaintDevice *QWinRTBackingStore::paintDevice()
@@ -107,6 +113,8 @@ void QWinRTBackingStore::flush(QWindow *window, const QRegion &region, const QPo
     Q_D(QWinRTBackingStore);
     Q_UNUSED(offset)
 
+    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << window << region;
+
     if (d->size.isEmpty())
         return;
 
@@ -140,6 +148,8 @@ void QWinRTBackingStore::resize(const QSize &size, const QRegion &staticContents
     Q_D(QWinRTBackingStore);
     Q_UNUSED(staticContents)
 
+    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << size;
+
     if (!initialize())
         return;
 
@@ -169,11 +179,14 @@ QImage QWinRTBackingStore::toImage() const
 
 void QWinRTBackingStore::beginPaint(const QRegion &region)
 {
+    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this << region;
+
     resize(window()->size(), region);
 }
 
 void QWinRTBackingStore::endPaint()
 {
+    qCDebug(lcQpaBackingStoreVerbose) << __FUNCTION__ << this;
 }
 
 QT_END_NAMESPACE