From fa71ef5a2ccfa4666db9338c4ba8f34d19f2faf1 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Sat, 22 Oct 2016 20:46:33 +0200
Subject: QQuickDialog: simplify the button box handling

Just fill in the footer with a button box by default from the styles.
This makes the next step easier, to provide also a default title bar
in the header.

Task-number: QTBUG-56711
Change-Id: I621a61f29f9ba2fe4b7e907d81da5988133a98c8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/quicktemplates2/qquickdialog_p_p.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/quicktemplates2/qquickdialog_p_p.h')

diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates2/qquickdialog_p_p.h
index a893690d..e5ac7066 100644
--- a/src/quicktemplates2/qquickdialog_p_p.h
+++ b/src/quicktemplates2/qquickdialog_p_p.h
@@ -53,7 +53,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQmlComponent;
 class QQuickDialogButtonBox;
 
 class QQuickDialogPrivate : public QQuickPopupPrivate
@@ -61,17 +60,14 @@ class QQuickDialogPrivate : public QQuickPopupPrivate
     Q_DECLARE_PUBLIC(QQuickDialog)
 
 public:
-    QQuickDialogPrivate() : buttonBox(nullptr), buttonBoxComponent(nullptr) { }
+    QQuickDialogPrivate() : buttonBox(nullptr) { }
 
     static QQuickDialogPrivate *get(QQuickDialog *dialog)
     {
         return dialog->d_func();
     }
 
-    void createButtonBox();
-
     QQuickDialogButtonBox *buttonBox;
-    QQmlComponent *buttonBoxComponent;
     QScopedPointer<QQuickPageLayout> layout;
     QPlatformDialogHelper::StandardButtons standardButtons;
 };
-- 
cgit v1.2.3