diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 14:35:54 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 12:37:31 +0000 |
| commit | c803830c02fb573582cd848185460ba65b4529e5 (patch) | |
| tree | bc0e00a8c82b4242661d3d6f7beb77e3c5691623 /src/controls/qquicktoolbar_p.h | |
| parent | 9b67ed1dde437448b927ef839ca60a2820f021dc (diff) | |
Frame, GroupBox, ToolBar: restore contentWidth & contentHeight
Change-Id: I79a974c64f6ec57ebfa83cea0857b2a1590af61f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquicktoolbar_p.h')
| -rw-r--r-- | src/controls/qquicktoolbar_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquicktoolbar_p.h b/src/controls/qquicktoolbar_p.h index 50352186..878ffe8c 100644 --- a/src/controls/qquicktoolbar_p.h +++ b/src/controls/qquicktoolbar_p.h @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontainer_p.h> +#include <QtQuickControls/private/qquickframe_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKCONTROLS_EXPORT QQuickToolBar : public QQuickContainer +class Q_QUICKCONTROLS_EXPORT QQuickToolBar : public QQuickFrame { Q_OBJECT |