diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
commit | 1139eb432a18d556efb4ecfc079e82c2e2093b96 (patch) | |
tree | 57bbe6a7588ba01d88f0a9b9b28e4d95beadad1d /src/gui/kernel/qwidget.cpp | |
parent | 2366667fc97eb6a56203b2dd7dac776ff4164abd (diff) | |
parent | db4e2a600c53ad857d7fa3f7d84ac995215ecf93 (diff) | |
download | Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.zip Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.gz Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.bz2 |
Merge branch 'master' of ../../qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 3e25ffc..9f5f18d 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -2234,9 +2234,10 @@ WId QWidget::effectiveWinId() const The style sheet contains a textual description of customizations to the widget's style, as described in the \l{Qt Style Sheets} document. - \note Qt style sheets are currently not supported for QMacStyle - (the default style on Mac OS X). We plan to address this in some future - release. + Since Qt 4.5, Qt style sheets fully supports Mac OS X. + + \warning Qt style sheets are currently not supported for custom QStyle + subclasses. We plan to address this in some future release. \sa setStyle(), QApplication::styleSheet, {Qt Style Sheets} */ |