diff options
Diffstat (limited to 'src/plugins/platforms')
6 files changed, 9 insertions, 18 deletions
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/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index d842bed91e..612290c9bd 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -255,7 +255,7 @@ void QCocoaIntegration::updateScreens() continue; } QCocoaScreen* screen = nullptr; - foreach (QCocoaScreen* existingScr, mScreens) + foreach (QCocoaScreen* existingScr, mScreens) { // NSScreen documentation says do not cache the array returned from [NSScreen screens]. // However in practice, we can identify a screen by its pointer: if resolution changes, // the NSScreen object will be the same instance, just with different values. @@ -263,6 +263,7 @@ void QCocoaIntegration::updateScreens() screen = existingScr; break; } + } if (screen) { remainingScreens.remove(screen); screen->updateProperties(); 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 ®ion, 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 ®ion) { - 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; |