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/qquickcontainer_p_p.h | |
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/qquickcontainer_p_p.h')
-rw-r--r-- | src/quicktemplates2/qquickcontainer_p_p.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 28190f07..16e9c9f6 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_p.h @@ -59,8 +59,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickCon Q_DECLARE_PUBLIC(QQuickContainer) public: - QQuickContainerPrivate(); - static QQuickContainerPrivate *get(QQuickContainer *container) { return container->d_func(); @@ -95,15 +93,15 @@ public: void updateContentWidth(); void updateContentHeight(); - bool hasContentWidth; - bool hasContentHeight; - qreal contentWidth; - qreal contentHeight; + bool hasContentWidth = false; + bool hasContentHeight = false; + qreal contentWidth = 0; + qreal contentHeight = 0; QObjectList contentData; - QQmlObjectModel *contentModel; - int currentIndex; - bool updatingCurrent; - QQuickItemPrivate::ChangeTypes changeTypes; + QQmlObjectModel *contentModel = nullptr; + int currentIndex = -1; + bool updatingCurrent = false; + QQuickItemPrivate::ChangeTypes changeTypes = Destroyed | Parent | SiblingOrder; }; QT_END_NAMESPACE |