diff options
author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-12-09 11:43:04 (GMT) |
---|---|---|
committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-12-09 11:43:04 (GMT) |
commit | 3b20e58b9494549713b492e35af6531b4bc179c9 (patch) | |
tree | 9ae3fb2e2d02a78f6f2fe36adaad364170fd704c /src/gui/styles/qstyleoption.cpp | |
parent | bd4ac06eb3c8ac3a9044689481873ce91aeb3180 (diff) | |
parent | 91518478d32a5d5ce188b02f92e744fc782dd687 (diff) | |
download | Qt-3b20e58b9494549713b492e35af6531b4bc179c9.zip Qt-3b20e58b9494549713b492e35af6531b4bc179c9.tar.gz Qt-3b20e58b9494549713b492e35af6531b4bc179c9.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/styles/qstyleoption.cpp')
-rw-r--r-- | src/gui/styles/qstyleoption.cpp | 4 |
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; } |