summaryrefslogtreecommitdiffstats
path: root/src/kernel/qstyle.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-14 15:29:51 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-14 15:29:51 -0600
commit338f274c8595067bd2bee4e5ab28d097527cb557 (patch)
treef4a9aee6fda734a0357581af861e782ac87c0540 /src/kernel/qstyle.cpp
parent77053d90dc16bb25405d7f3b3353af4424c6e4b1 (diff)
parent367668d690ce2270f4d99f9a19ea800b6ea84a39 (diff)
downloadtqt3-338f274c8595067bd2bee4e5ab28d097527cb557.tar.gz
tqt3-338f274c8595067bd2bee4e5ab28d097527cb557.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/qstyle.cpp')
-rw-r--r--src/kernel/qstyle.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index f32d73b9a..df83f00eb 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -2579,7 +2579,11 @@ TQSize TQStyle::sizeFromContents(ContentsType contents,
int TQStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption &so, TQStyleHintReturn *shr) const
{
- TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false);
+ bool ceDataNotNeeded = false;
+ if (sh == SH_Widget_ShareActivation) {
+ ceDataNotNeeded = true;
+ }
+ TQStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false, ceDataNotNeeded);
return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, TQStyleOption(), false), so, shr, w);
}