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/qquickdialogbuttonbox_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/qquickdialogbuttonbox_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox_p_p.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h index 5633d880..5d64918a 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h @@ -58,8 +58,6 @@ class QQuickDialogButtonBoxPrivate : public QQuickContainerPrivate Q_DECLARE_PUBLIC(QQuickDialogButtonBox) public: - QQuickDialogButtonBoxPrivate(); - static QQuickDialogButtonBoxPrivate *get(QQuickDialogButtonBox *box) { return box->d_func(); @@ -80,11 +78,11 @@ public: QQuickAbstractButton *createStandardButton(QPlatformDialogHelper::StandardButton button); void removeStandardButtons(); - Qt::Alignment alignment; - QQuickDialogButtonBox::Position position; - QPlatformDialogHelper::StandardButtons standardButtons; - QQuickDialogButtonBox::ButtonLayout buttonLayout; - QQmlComponent *delegate; + Qt::Alignment alignment = 0; + QQuickDialogButtonBox::Position position = QQuickDialogButtonBox::Footer; + QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; + QQuickDialogButtonBox::ButtonLayout buttonLayout = QQuickDialogButtonBox::UnknownLayout; + QQmlComponent *delegate = nullptr; }; class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate @@ -92,13 +90,6 @@ class QQuickDialogButtonBoxAttachedPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QQuickDialogButtonBoxAttached) public: - QQuickDialogButtonBoxAttachedPrivate() - : buttonBox(nullptr), - buttonRole(QPlatformDialogHelper::InvalidRole), - standardButton(QPlatformDialogHelper::NoButton) - { - } - static QQuickDialogButtonBoxAttachedPrivate *get(QQuickDialogButtonBoxAttached *q) { return q->d_func(); @@ -106,9 +97,9 @@ public: void setButtonBox(QQuickDialogButtonBox *box); - QQuickDialogButtonBox *buttonBox; - QPlatformDialogHelper::ButtonRole buttonRole; - QPlatformDialogHelper::StandardButton standardButton; + QQuickDialogButtonBox *buttonBox = nullptr; + QPlatformDialogHelper::ButtonRole buttonRole = QPlatformDialogHelper::InvalidRole; + QPlatformDialogHelper::StandardButton standardButton = QPlatformDialogHelper::NoButton; }; QT_END_NAMESPACE |