From: Kurt Korbatits Date: Mon, 23 Jan 2012 00:35:19 +0000 (+1000) Subject: Changed debug output to option in qminimalbackingstore. X-Git-Tag: qt-v5.0.0-alpha1~1459 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0790756c9308661616fffaf1d940c28497941439;p=profile%2Fivi%2Fqtbase.git Changed debug output to option in qminimalbackingstore. - Added QT_DEBUG_BACKINGSTORE environment variable to enable debug output. Defaulting to no output if not set. Change-Id: Id9c369031f946d77605321c8b28ab3378da8fbf9 Reviewed-by: Kurt Korbatits Reviewed-by: Rohan McGovern Reviewed-by: Jonas Gastal Reviewed-by: Samuel Rødal --- diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp index eca81c2..b6b9c0e 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp +++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp @@ -48,9 +48,12 @@ QT_BEGIN_NAMESPACE QMinimalBackingStore::QMinimalBackingStore(QWindow *window) - : QPlatformBackingStore(window) + : QPlatformBackingStore(window),mDebug(false) { - //qDebug() << "QMinimalBackingStore::QMinimalBackingStore:" << (long)this; + if (QT_PREPEND_NAMESPACE(qgetenv)("QT_DEBUG_BACKINGSTORE").toInt() > 0) + mDebug = true; + if (mDebug) + qDebug() << "QMinimalBackingStore::QMinimalBackingStore:" << (long)this; } QMinimalBackingStore::~QMinimalBackingStore() @@ -59,7 +62,9 @@ QMinimalBackingStore::~QMinimalBackingStore() QPaintDevice *QMinimalBackingStore::paintDevice() { - //qDebug() << "QMinimalBackingStore::paintDevice"; + if (mDebug) + qDebug() << "QMinimalBackingStore::paintDevice"; + return &mImage; } @@ -69,15 +74,16 @@ void QMinimalBackingStore::flush(QWindow *window, const QRegion ®ion, const Q Q_UNUSED(region); Q_UNUSED(offset); - static int c = 0; - QString filename = QString("output%1.png").arg(c++, 4, 10, QLatin1Char('0')); - qDebug() << "QMinimalBackingStore::flush() saving contents to" << filename.toLocal8Bit().constData(); - mImage.save(filename); + if (mDebug) { + static int c = 0; + QString filename = QString("output%1.png").arg(c++, 4, 10, QLatin1Char('0')); + qDebug() << "QMinimalBackingStore::flush() saving contents to" << filename.toLocal8Bit().constData(); + mImage.save(filename); + } } void QMinimalBackingStore::resize(const QSize &size, const QRegion &) { - //qDebug() << "QMinimalBackingStore::setGeometry:" << (long)this << rect; QImage::Format format = QGuiApplication::primaryScreen()->handle()->format(); if (mImage.size() != size) mImage = QImage(size, format); diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h index 9969a93..375edaa 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.h +++ b/src/plugins/platforms/minimal/qminimalbackingstore.h @@ -60,6 +60,7 @@ public: private: QImage mImage; + bool mDebug; }; QT_END_NAMESPACE