summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstyleoption.cpp
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-12-01 08:21:03 (GMT)
committeraavit <qt-info@nokia.com>2010-12-01 08:21:03 (GMT)
commit0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc (patch)
tree2cb7ed8e38523641a8a88a0d4c1f42014cae10af /src/gui/styles/qstyleoption.cpp
parentde30288bb108d70cd66774c3beb7497efb5d0e6d (diff)
parentd6174e48b4835d6fdaf10d9b742b866f03cbdcef (diff)
downloadQt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.zip
Qt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.tar.gz
Qt-0bc9a8abf52c1d4c98aefdb502487bcb8eb131bc.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/styles/qstyleoption.cpp')
-rw-r--r--src/gui/styles/qstyleoption.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 4780edf..05ca793 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -5483,6 +5483,8 @@ QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
case QStyleOption::SO_GraphicsItem:
debug << "SO_GraphicsItem"; break;
}
+#else
+ Q_UNUSED(optionType);
#endif
return debug;
}
@@ -5496,6 +5498,8 @@ QDebug operator<<(QDebug debug, const QStyleOption &option)
debug << ',' << option.state;
debug << ',' << option.rect;
debug << ')';
+#else
+ Q_UNUSED(option);
#endif
return debug;
}