diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 19:27:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 19:27:42 (GMT) |
| commit | 6e2c3e7306883cd4618742e37861e326e9c91895 (patch) | |
| tree | acef1cbd0595b1e34de10935c1326bc582ad98ab /src/gui/styles/qstyleoption.h | |
| parent | 03c01176ebf423085e56ceabcf8335ca5027a786 (diff) | |
| parent | f95a1d74c6a8672aac180ff8d9e8ba2e13074865 (diff) | |
| download | Qt-6e2c3e7306883cd4618742e37861e326e9c91895.zip Qt-6e2c3e7306883cd4618742e37861e326e9c91895.tar.gz Qt-6e2c3e7306883cd4618742e37861e326e9c91895.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QFileDialog : Fix completer showing up on the MyComputer view.
Amend previous commit 4e2eb2945dbc3865e2901f12d663ed89e8f0dfbf to fix compilation with QT_NO_DEBUG_STREAM
Compile with QT_NO_DEBUG_STREAM
Docs: HTML comments marks so Creator can extract data efficiently.
Work around memory leak issue in grid and linear layouts.
Diffstat (limited to 'src/gui/styles/qstyleoption.h')
| -rw-r--r-- | src/gui/styles/qstyleoption.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h index 95de8d5..e79d9a4 100644 --- a/src/gui/styles/qstyleoption.h +++ b/src/gui/styles/qstyleoption.h @@ -958,8 +958,10 @@ T qstyleoption_cast(QStyleHintReturn *hint) return 0; } +#if !defined(QT_NO_DEBUG_STREAM) Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType); Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option); +#endif QT_END_NAMESPACE |