diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-15 09:57:36 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-15 09:57:36 (GMT) |
| commit | 336dfcef05cb63df0a6d550b59a4badc7a0f01c1 (patch) | |
| tree | a218ec97413e0c8ebc9600ac5db9b2adea485b32 /src/gui/styles/qstyle.h | |
| parent | e44d64510e019e5d3b379b704cfb824e0d7ccc9d (diff) | |
| download | Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.zip Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.gz Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.bz2 | |
Merge of master
Diffstat (limited to 'src/gui/styles/qstyle.h')
| -rw-r--r-- | src/gui/styles/qstyle.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h index cc92459..eec3326 100644 --- a/src/gui/styles/qstyle.h +++ b/src/gui/styles/qstyle.h @@ -848,6 +848,8 @@ public: QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, QStyleOption *option = 0, QWidget *widget = 0) const; + const QStyle * proxy() const; + protected Q_SLOTS: QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, const QWidget *widget = 0) const; @@ -862,6 +864,9 @@ private: friend class QWidget; friend class QWidgetPrivate; friend class QApplication; + friend class QProxyStyle; + friend class QProxyStylePrivate; + void setProxy(QStyle *style); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::State) |