diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-14 15:29:51 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-14 15:29:51 -0600 |
| commit | 338f274c8595067bd2bee4e5ab28d097527cb557 (patch) | |
| tree | f4a9aee6fda734a0357581af861e782ac87c0540 /src/kernel | |
| parent | 77053d90dc16bb25405d7f3b3353af4424c6e4b1 (diff) | |
| parent | 367668d690ce2270f4d99f9a19ea800b6ea84a39 (diff) | |
| download | tqt3-338f274c8595067bd2bee4e5ab28d097527cb557.tar.gz tqt3-338f274c8595067bd2bee4e5ab28d097527cb557.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/ntqstyle.h | 1 | ||||
| -rw-r--r-- | src/kernel/qstyle.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index 73543dd99..3e59bc027 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -1231,6 +1231,7 @@ Q_EXPORT TQStyleControlElementData populateControlElementDataFromWidget(const TQ Q_EXPORT TQStyleControlElementData populateControlElementDataFromApplication(const TQApplication* app, const TQStyleOption& opt, bool populateReliantFields=true); Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQObject* object, TQStringList objectTypeList, const TQStyleOption& opt, bool populateReliantFields=true); Q_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object); +Q_EXPORT TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); #endif // QT_NO_STYLE #endif // TQSTYLE_H 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); } |