diff options
author | David Faure <faure@kde.org> | 2012-01-12 12:49:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 16:15:00 +0100 |
commit | eb8fce6e5674ce199c19843ac8071063580bc9f6 (patch) | |
tree | 273e01f2cea77db1668277b0c2a0c51e722cb821 /src | |
parent | 0fda46932dbab64c092197c347c289c57488cb2a (diff) |
Fix compilation of Qt itself with QT_NO_DEBUG_STREAM
Change-Id: I07087dff0f109347ea80434f17eeb7cc1c13114c
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/opengl/qopenglengineshadermanager.cpp | 6 | ||||
-rw-r--r-- | src/network/access/qhttpthreaddelegate.cpp | 4 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 4 | ||||
-rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 | ||||
-rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 6 | ||||
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetsvariant.cpp | 2 |
7 files changed, 13 insertions, 15 deletions
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp index da9952a905..9520f07fcc 100644 --- a/src/gui/opengl/qopenglengineshadermanager.cpp +++ b/src/gui/opengl/qopenglengineshadermanager.cpp @@ -247,8 +247,7 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context) if (!inCache) simpleShaderCache.store(simpleShaderProg, context); } else { - qCritical() << "Errors linking simple shader:" - << simpleShaderProg->log(); + qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log())); } // Compile the blit shader: @@ -289,8 +288,7 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context) if (!inCache) blitShaderCache.store(blitShaderProg, context); } else { - qCritical() << "Errors linking blit shader:" - << blitShaderProg->log(); + qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log())); } #ifdef QT_GL_SHARED_SHADER_DEBUG diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index 323b7c71f6..39a7e8ed08 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -364,7 +364,7 @@ void QHttpThreadDelegate::readyReadSlot() void QHttpThreadDelegate::finishedSlot() { if (!httpReply) { - qWarning() << "QHttpThreadDelegate::finishedSlot: HTTP reply had already been deleted, internal problem. Please report."; + qWarning("QHttpThreadDelegate::finishedSlot: HTTP reply had already been deleted, internal problem. Please report."); return; } #ifdef QHTTPTHREADDELEGATE_DEBUG @@ -420,7 +420,7 @@ void QHttpThreadDelegate::synchronousFinishedSlot() void QHttpThreadDelegate::finishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail) { if (!httpReply) { - qWarning() << "QHttpThreadDelegate::finishedWithErrorSlot: HTTP reply had already been deleted, internal problem. Please report."; + qWarning("QHttpThreadDelegate::finishedWithErrorSlot: HTTP reply had already been deleted, internal problem. Please report."); return; } #ifdef QHTTPTHREADDELEGATE_DEBUG diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index a8b0a3e514..48767f5b13 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1846,7 +1846,7 @@ void QNetworkReplyHttpImplPrivate::error(QNetworkReplyImpl::NetworkError code, c Q_Q(QNetworkReplyHttpImpl); // Can't set and emit multiple errors. if (errorCode != QNetworkReply::NoError) { - qWarning() << "QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once."; + qWarning("QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once."); return; } @@ -1959,7 +1959,7 @@ void QNetworkReplyHttpImplPrivate::setCachingEnabled(bool enable) if (enable) { if (bytesDownloaded) { - qDebug() << "x" << bytesDownloaded; + qDebug("setCachingEnabled: %d bytesDownloaded", bytesDownloaded); // refuse to enable in this case qCritical("QNetworkReplyImpl: backend error: caching was enabled after some bytes had been written"); return; diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 14b4f8b96d..82579f0d54 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -780,7 +780,7 @@ void QNetworkReplyImplPrivate::error(QNetworkReplyImpl::NetworkError code, const Q_Q(QNetworkReplyImpl); // Can't set and emit multiple errors. if (errorCode != QNetworkReply::NoError) { - qWarning() << "QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once."; + qWarning( "QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once."); return; } diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 8755fbc938..4daed7ebfa 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -246,8 +246,7 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context) if (!inCache) simpleShaderCache.store(simpleShaderProg, context); } else { - qCritical() << "Errors linking simple shader:" - << simpleShaderProg->log(); + qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log())); } // Compile the blit shader: @@ -288,8 +287,7 @@ QGLEngineSharedShaders::QGLEngineSharedShaders(const QGLContext* context) if (!inCache) blitShaderCache.store(blitShaderProg, context); } else { - qCritical() << "Errors linking blit shader:" - << blitShaderProg->log(); + qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log())); } #ifdef QT_GL_SHARED_SHADER_DEBUG diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index ed7700eea4..f0d66ea872 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -84,7 +84,7 @@ inline static QString fromSQLTCHAR(const QVarLengthArray<SQLTCHAR>& input, int s result=QString::fromUcs4((const uint *)input.constData(), realsize); break; default: - qCritical() << "sizeof(SQLTCHAR) is " << sizeof(SQLTCHAR) << "Don't know how to handle this"; + qCritical("sizeof(SQLTCHAR) is %d. Don't know how to handle this.", sizeof(SQLTCHAR)); } return result; } @@ -104,7 +104,7 @@ inline static QVarLengthArray<SQLTCHAR> toSQLTCHAR(const QString &input) memcpy(result.data(), input.toUcs4().data(), input.size() * 4); break; default: - qCritical() << "sizeof(SQLTCHAR) is " << sizeof(SQLTCHAR) << "Don't know how to handle this"; + qCritical("sizeof(SQLTCHAR) is %d. Don't know how to handle this.", sizeof(SQLTCHAR)); } result.append(0); // make sure it's null terminated, doesn't matter if it already is, it does if it isn't. return result; diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index e9fa99a80e..f2ca99d040 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -127,6 +127,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type type, void *resul return false; } +#if !defined(QT_NO_DEBUG_STREAM) && !defined(Q_BROKEN_DEBUG_STREAM) static void streamDebug(QDebug dbg, const QVariant &v) { QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr()); @@ -143,6 +144,7 @@ static void streamDebug(QDebug dbg, const QVariant &v) dbg.nospace() << "QVariant::Type(" << d->type << ")"; } } +#endif static const QVariant::Handler widgets_handler = { construct, |