diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-27 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-27 23:00:12 (GMT) |
| commit | 37766cd0781218598daffeaa7fa9d1707ec14b38 (patch) | |
| tree | 28f19a5eda972a7d8a4f1425983e0273716891ec /src/gui/styles/qstyleoption.cpp | |
| parent | 5e0c4463c8dc8857e9f64a1bdde9a94cd8c39c4d (diff) | |
| parent | 220d13f0e83f9a70e69d95cb78711fec309e83cc (diff) | |
| download | Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.zip Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.tar.gz Qt-37766cd0781218598daffeaa7fa9d1707ec14b38.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
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; } |