diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-07 14:45:56 (GMT) |
| commit | ce5f772c529517c3e1c043fd826a790316ed9915 (patch) | |
| tree | 159d306fedb648d659ecd6bc90c93225d1d2e6e1 /src/gui/styles/qstyleoption.cpp | |
| parent | a628b5579a977594cf125110589c8bd5096db380 (diff) | |
| parent | 55c983e33d974d046d8deab8b68b85efdb9eb03a (diff) | |
| download | Qt-ce5f772c529517c3e1c043fd826a790316ed9915.zip Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.gz Qt-ce5f772c529517c3e1c043fd826a790316ed9915.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/styles/qstyleoption.cpp')
| -rw-r--r-- | src/gui/styles/qstyleoption.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp index 9188ee0..c057a2b 100644 --- a/src/gui/styles/qstyleoption.cpp +++ b/src/gui/styles/qstyleoption.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -2826,8 +2826,9 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type) /*! \variable QStyleOptionComplex::subControls - \brief a bitwise OR of the various sub-controls that need to be - drawn for the complex control + + This variable holds a bitwise OR of the \l{QStyle::SubControl} + {sub-controls} to be drawn for the complex control. The default value is QStyle::SC_All. @@ -2836,8 +2837,9 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type) /*! \variable QStyleOptionComplex::activeSubControls - \brief a bitwise OR of the various sub-controls that are active - (pressed) for the complex control + + This variable holds a bitwise OR of the \l{QStyle::SubControl} + {sub-controls} that are active for the complex control. The default value is QStyle::SC_None. |