From a48d9b52c38b60882b8b6a7ec2647ed96358baa8 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 19 Apr 2012 22:55:33 +0200 Subject: Fix compilation with QT_NO_DEBUG_OUTPUT defined Change-Id: If96e93c08240e0f626f8e465993b2c38b2cad832 Reviewed-by: Thiago Macieira --- src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h | 4 +++- src/plugins/platforms/windows/qwindowsbackingstore.cpp | 2 ++ src/plugins/platforms/windows/qwindowsclipboard.cpp | 2 ++ src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 2 ++ src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp | 2 ++ src/plugins/platforms/windows/qwindowsglcontext.cpp | 2 ++ 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h index 80ff78d477..28f45eb9b5 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h +++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h @@ -59,14 +59,16 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_DEBUG +#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_OUTPUT) bool debug_accessibility(); # define accessibleDebug !debug_accessibility() ? (void)0 : qDebug #else # define accessibleDebug #endif +#ifndef QT_NO_DEBUG_OUTPUT #define DEBUG_SHOW_ATCLIENT_COMMANDS +#endif #if defined(DEBUG_SHOW_ATCLIENT_COMMANDS) void accessibleDebugClientCalls_helper(const char* funcName, const QAccessibleInterface *iface); # define accessibleDebugClientCalls(iface) accessibleDebugClientCalls_helper(Q_FUNC_INFO, iface) diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp index bbb6b5305f..2cf9645786 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp +++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp @@ -106,6 +106,7 @@ void QWindowsBackingStore::flush(QWindow *window, const QRegion ®ion, void QWindowsBackingStore::resize(const QSize &size, const QRegion ®ion) { if (m_image.isNull() || m_image->image().size() != size) { +#ifndef QT_NO_DEBUG_OUTPUT if (QWindowsContext::verboseBackingStore) { QDebug nsp = qDebug().nospace(); nsp << __FUNCTION__ << ' ' << rasterWindow()->window() @@ -113,6 +114,7 @@ void QWindowsBackingStore::resize(const QSize &size, const QRegion ®ion) if (!m_image.isNull()) nsp << " from: " << m_image->image().size(); } +#endif m_image.reset(new QWindowsNativeImage(size.width(), size.height(), QWindowsNativeImage::systemFormat())); } diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp index cd555d71a1..4166e567c4 100644 --- a/src/plugins/platforms/windows/qwindowsclipboard.cpp +++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp @@ -158,6 +158,7 @@ QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, if (const QWindowsMime *converter = mc.converterToMime(mimeType, pDataObj)) result = converter->convertToMime(mimeType, pDataObj, type); releaseDataObject(pDataObj); +#ifndef QT_NO_DEBUG_OUTPUT if (QWindowsContext::verboseOLE) { QDebug nospace = qDebug().nospace(); nospace << __FUNCTION__ << ' ' << mimeType << ' ' << type @@ -165,6 +166,7 @@ QVariant QWindowsInternalMimeData::retrieveData_sys(const QString &mimeType, if (result.type() != QVariant::ByteArray) nospace << ' ' << result; } +#endif return result; } diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 979b2a028b..835c979579 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -536,6 +536,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName, const QFont::Weight weight = weightFromInteger(tm->tmWeight); const QFont::Stretch stretch = QFont::Unstretched; +#ifndef QT_NO_DEBUG_OUTPUT if (QWindowsContext::verboseFonts > 2) { QDebug nospace = qDebug().nospace(); nospace << __FUNCTION__ << familyName << scriptName @@ -550,6 +551,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName, << " Style=" << style << " Weight=" << weight << " stretch=" << stretch; } +#endif QString englishName; if (ttf && localizedName(familyName)) diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp index 246b5b3710..ab878a75bc 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp @@ -144,6 +144,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName, const QFont::Weight weight = weightFromInteger(tm->tmWeight); const QFont::Stretch stretch = QFont::Unstretched; +#ifndef QT_NO_DEBUG_OUTPUT if (QWindowsContext::verboseFonts > 2) { QDebug nospace = qDebug().nospace(); nospace << __FUNCTION__ << faceName << fullName << scriptName @@ -158,6 +159,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName, << " Style=" << style << " Weight=" << weight << " stretch=" << stretch; } +#endif QString englishName; if (ttf && localizedName(faceName)) diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index 098f15f0f0..f16a0ca73d 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -470,6 +470,7 @@ static int choosePixelFormat(HDC hdc, pixelFormat = 0; } +#ifndef QT_NO_DEBUG_OUTPUT if (QWindowsContext::verboseGL) { QDebug nsp = qDebug().nospace(); nsp << __FUNCTION__; @@ -481,6 +482,7 @@ static int choosePixelFormat(HDC hdc, nsp << noshowbase << dec << "\n obtained px #" << pixelFormat << " of " << numFormats << "\n " << *obtainedPfd; } // Debug +#endif return pixelFormat; } -- cgit v1.2.3