summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-06 13:57:15 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-01-13 09:38:47 (GMT)
commita6236b2028ae5197da3e9701b5052611bda1a2fe (patch)
tree69af0f241cdfa9512747eef2d2d64d9834b3cab5
parent0bf13d5b011843bf2a15d8eff884f81e489e1dcc (diff)
downloadQt-a6236b2028ae5197da3e9701b5052611bda1a2fe.zip
Qt-a6236b2028ae5197da3e9701b5052611bda1a2fe.tar.gz
Qt-a6236b2028ae5197da3e9701b5052611bda1a2fe.tar.bz2
doc: Clarified activeSubControls and subControls.
Task-number: QTBUG-6405 (cherry picked from commit e2734782e72fccbc3bf528f201bac50703718b54)
-rw-r--r--src/gui/styles/qstyleoption.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index a8a6334..5084ffd 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -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 \l{QStyle::SubControl} {sub-controls}
- that are active 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.