diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-27 15:19:28 (GMT) |
| commit | 162892030766ffe8711888ea9e8d3a368c6a75b2 (patch) | |
| tree | ddfda2e163fdce5d7ead7ac1fbd7aedb4bb06b79 /src/gui/widgets/qtoolbarlayout_p.h | |
| parent | 0bc91ae61b07751f44210e1b772679c0a180c900 (diff) | |
| parent | 26b8b6783afe2c1c9f27c935eb46c05229757af1 (diff) | |
| download | Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.zip Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.gz Qt-162892030766ffe8711888ea9e8d3a368c6a75b2.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'src/gui/widgets/qtoolbarlayout_p.h')
| -rw-r--r-- | src/gui/widgets/qtoolbarlayout_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qtoolbarlayout_p.h b/src/gui/widgets/qtoolbarlayout_p.h index fe81d2f..bb40e215 100644 --- a/src/gui/widgets/qtoolbarlayout_p.h +++ b/src/gui/widgets/qtoolbarlayout_p.h @@ -111,8 +111,8 @@ public: void updateMarginAndSpacing(); bool hasExpandFlag() const; -public slots: - void setExpanded(bool b); +public Q_SLOTS: + void setExpanded(bool b, bool animated = true); private: QList<QToolBarItem*> items; |