--- a/src/gui/styles/qstyle.cpp	Tue Jul 06 15:10:48 2010 +0300
+++ b/src/gui/styles/qstyle.cpp	Wed Aug 18 10:37:55 2010 +0300
@@ -325,7 +325,7 @@
     control over size of header items and row and column sizes.
 
     \sa QStyleOption, QStylePainter, {Styles Example},
-        {Implementing Styles and Style Aware Widgets}, QStyledItemDelegate
+        {Styles &amp Style Aware Widgets}, QStyledItemDelegate
 */
 
 /*!
@@ -2421,9 +2421,10 @@
 #include <QDebug>
 QT_END_INCLUDE_NAMESPACE
 
+#if !defined(QT_NO_DEBUG_STREAM)
 QDebug operator<<(QDebug debug, QStyle::State state)
 {
-#if !defined(QT_NO_DEBUG) && !defined(QT_NO_DEBUG_STREAM)
+#if !defined(QT_NO_DEBUG)
     debug << "QStyle::State(";
 
     QStringList states;
@@ -2458,6 +2459,7 @@
 #endif
     return debug;
 }
+#endif
 
 /*!
     \since 4.6