diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-05-20 13:44:49 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-23 09:17:23 +0000 |
commit | 13406603d58757929c1cebbc44b43d3bea23fc9c (patch) | |
tree | b9cdb41473803f03f4f3224ff385ff809445fe83 /src/quicktemplates2/qquicktoolbar.cpp | |
parent | deddfccc42e0551a70bc79e4290ce057cc65bb1a (diff) |
Fix QQuickToolBar base class
Change-Id: I0802a16ee704d81d690cc642d3b62445ec2147e8
Task-number: QTBUG-53519
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquicktoolbar.cpp')
-rw-r--r-- | src/quicktemplates2/qquicktoolbar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp index edf0bebf..b02a12b1 100644 --- a/src/quicktemplates2/qquicktoolbar.cpp +++ b/src/quicktemplates2/qquicktoolbar.cpp @@ -35,13 +35,13 @@ ****************************************************************************/ #include "qquicktoolbar_p.h" -#include "qquickframe_p_p.h" +#include "qquickpane_p_p.h" QT_BEGIN_NAMESPACE /*! \qmltype ToolBar - \inherits Frame + \inherits Pane \instantiates QQuickToolBar \inqmlmodule QtQuick.Controls \ingroup qtquickcontrols2-containers @@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE \sa ApplicationWindow, ToolButton, {Customizing ToolBar}, {Container Controls} */ -class QQuickToolBarPrivate : public QQuickFramePrivate +class QQuickToolBarPrivate : public QQuickPanePrivate { public: QQuickToolBarPrivate() : position(QQuickToolBar::Header) { } @@ -99,7 +99,7 @@ public: }; QQuickToolBar::QQuickToolBar(QQuickItem *parent) : - QQuickFrame(*(new QQuickToolBarPrivate), parent) + QQuickPane(*(new QQuickToolBarPrivate), parent) { } |