From eb8fce6e5674ce199c19843ac8071063580bc9f6 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Thu, 12 Jan 2012 12:49:20 +0100
Subject: Fix compilation of Qt itself with QT_NO_DEBUG_STREAM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/widgets/kernel/qwidgetsvariant.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/widgets')

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,
-- 
cgit v1.2.3