diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-14 14:48:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-14 14:48:47 -0600 |
| commit | 30c5994817cb87f4a291eec0bc6eaec485eefb15 (patch) | |
| tree | 63e9b4446991db4a8b6876b106b4ce7bbd612de6 /src/kernel | |
| parent | d1c672237288068a5e3777d16277221912bc0088 (diff) | |
| download | qt3-30c5994817cb87f4a291eec0bc6eaec485eefb15.tar.gz qt3-30c5994817cb87f4a291eec0bc6eaec485eefb15.zip | |
Speed up application loading
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/qstyle.cpp | 6 | ||||
| -rw-r--r-- | src/kernel/qstyle.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 4e689c2..75d448d 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2579,7 +2579,11 @@ QSize QStyle::sizeFromContents(ContentsType contents, int QStyle::styleHint(StyleHint sh, const QWidget * w, const QStyleOption &so, QStyleHintReturn *shr) const { - QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false); + bool ceDataNotNeeded = false; + if (sh == SH_Widget_ShareActivation) { + ceDataNotNeeded = true; + } + QStyleControlElementData ceData = populateControlElementDataFromWidget(w, so, false, ceDataNotNeeded); return styleHint(sh, ceData, getControlElementFlagsForObject(w, ceData.widgetObjectTypes, QStyleOption(), false), so, shr, w); } diff --git a/src/kernel/qstyle.h b/src/kernel/qstyle.h index f76b970..63acec6 100644 --- a/src/kernel/qstyle.h +++ b/src/kernel/qstyle.h @@ -1231,6 +1231,7 @@ Q_EXPORT QStyleControlElementData populateControlElementDataFromWidget(const QWi Q_EXPORT QStyleControlElementData populateControlElementDataFromApplication(const QApplication* app, const QStyleOption& opt, bool populateReliantFields=true); Q_EXPORT QStyle::ControlElementFlags getControlElementFlagsForObject(const QObject* object, QStringList objectTypeList, const QStyleOption& opt, bool populateReliantFields=true); Q_EXPORT QStringList getObjectTypeListForObject(const QObject* object); +Q_EXPORT QStyleControlElementData populateControlElementDataFromWidget(const QWidget* widget, const QStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields); #endif // QT_NO_STYLE #endif // QSTYLE_H |