diff options
author | axis <qt-info@nokia.com> | 2009-10-27 14:24:02 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-10-27 14:24:02 (GMT) |
commit | 83e25326c7fb6aa2e239b220e608446f52aeff34 (patch) | |
tree | c0688f424065bdd471dc1930b732f511a1b89c6b /src/gui/styles/qstyle.h | |
parent | 8135af2cebdaaccefb95f0be149328077d237a89 (diff) | |
parent | 51bfafed59d77b791f0266fa1bfc36634597c5c4 (diff) | |
download | Qt-83e25326c7fb6aa2e239b220e608446f52aeff34.zip Qt-83e25326c7fb6aa2e239b220e608446f52aeff34.tar.gz Qt-83e25326c7fb6aa2e239b220e608446f52aeff34.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui/styles/qstyle.h')
-rw-r--r-- | src/gui/styles/qstyle.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h index 1f8d5c8..0014954 100644 --- a/src/gui/styles/qstyle.h +++ b/src/gui/styles/qstyle.h @@ -878,9 +878,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::State) Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::SubControls) -#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_DEBUG) Q_GUI_EXPORT QDebug operator<<(QDebug debug, QStyle::State state); -#endif QT_END_NAMESPACE |