summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstyleoption.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-14 00:31:37 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-14 00:31:37 (GMT)
commit2ec89699a6f372ccbd92ce2bda753ec0e28f8650 (patch)
treee8f5a9c9bb8cb41a7e47e7b75cd3f6ddac702814 /src/gui/styles/qstyleoption.cpp
parent351060bd313220044b9323d59d56627e78deea9f (diff)
parent48592026bc9eb024f304411895c3f233b2296cfa (diff)
downloadQt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.zip
Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.gz
Qt-2ec89699a6f372ccbd92ce2bda753ec0e28f8650.tar.bz2
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts: bin/syncqt src/corelib/io/qurl.cpp
Diffstat (limited to 'src/gui/styles/qstyleoption.cpp')
-rw-r--r--src/gui/styles/qstyleoption.cpp12
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.