diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-05 03:00:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-07 14:18:09 +0200 |
| commit | de9c38dd61ce29f549e2b13871e981209a0fed9e (patch) | |
| tree | 9c1824fc361d7039d297cbf9a56002cea52f8c23 /src/quicktemplates2/qquickmenubar.cpp | |
| parent | 3b5143bb67cdaaff6b0eabedff1034e4add7ec87 (diff) | |
| parent | bf39c3ce5524d151532d89efef40ff1a8e25f4c0 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quicktemplates2/qquickabstractbutton_p_p.h
src/quicktemplates2/qquickcombobox.cpp
src/quicktemplates2/qquickcontainer.cpp
src/quicktemplates2/qquickcontrol.cpp
src/quicktemplates2/qquickcontrol_p_p.h
src/quicktemplates2/qquickdialog_p_p.h
src/quicktemplates2/qquickdialogbuttonbox.cpp
src/quicktemplates2/qquickdialogbuttonbox_p_p.h
src/quicktemplates2/qquickdrawer.cpp
src/quicktemplates2/qquickmenubar.cpp
src/quicktemplates2/qquickmenubar_p_p.h
src/quicktemplates2/qquickpage.cpp
src/quicktemplates2/qquickpage_p_p.h
src/quicktemplates2/qquickpane.cpp
src/quicktemplates2/qquickpane_p_p.h
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
src/quicktemplates2/qquickrangeslider.cpp
src/quicktemplates2/qquickscrollview.cpp
src/quicktemplates2/qquickslider.cpp
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipeview.cpp
src/quicktemplates2/qquicktabbar.cpp
src/quicktemplates2/qquicktextarea_p_p.h
src/quicktemplates2/qquicktextfield_p_p.h
src/quicktemplates2/qquicktheme_p.h
Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4
Diffstat (limited to 'src/quicktemplates2/qquickmenubar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickmenubar.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp index 2d4c7a4f..adeb013f 100644 --- a/src/quicktemplates2/qquickmenubar.cpp +++ b/src/quicktemplates2/qquickmenubar.cpp @@ -76,14 +76,6 @@ QT_BEGIN_NAMESPACE {Focus Management in Qt Quick Controls 2} */ -QQuickMenuBarPrivate::QQuickMenuBarPrivate() - : popupMode(false), - triggering(false), - delegate(nullptr) -{ - changeTypes |= ImplicitWidth | ImplicitHeight; -} - QQuickItem *QQuickMenuBarPrivate::beginCreateItem() { Q_Q(QQuickMenuBar); @@ -294,6 +286,8 @@ void QQuickMenuBarPrivate::menus_clear(QQmlListProperty<QQuickMenu> *prop) QQuickMenuBar::QQuickMenuBar(QQuickItem *parent) : QQuickContainer(*(new QQuickMenuBarPrivate), parent) { + Q_D(QQuickMenuBar); + d->changeTypes |= QQuickItemPrivate::Geometry; setFlag(ItemIsFocusScope); setFocusPolicy(Qt::ClickFocus); } |