1 files changed, 19 insertions, 50 deletions
diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp
index 88f7776f2..76f278aed 100644
--- a/src/dialogs/qquickdialog.cpp
+++ b/src/dialogs/qquickdialog.cpp
@@ -5,36 +5,28 @@
 **
 ** This file is part of the QtQuick.Dialogs module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -210,8 +202,9 @@ QT_BEGIN_NAMESPACE
 */
 QQuickDialog::QQuickDialog(QObject *parent)
     : QQuickAbstractDialog(parent)
+    , m_enabledButtons(Ok)
+    , m_clickedButton(NoButton)
 {
-    connect(this, SIGNAL(buttonClicked()), this, SLOT(clicked()));
 }
 
 
@@ -234,6 +227,13 @@ QJSValue QQuickDialog::__standardButtonsRightModel()
     return m_standardButtonsRightModel;
 }
 
+void QQuickDialog::setVisible(bool v)
+{
+    if (v)
+        m_clickedButton == NoButton;
+    QQuickAbstractDialog::setVisible(v);
+}
+
 void QQuickDialog::updateStandardButtons()
 {
     if (m_standardButtonsRightModel.isUndefined()) {
@@ -371,37 +371,6 @@ void QQuickDialog::click(QQuickAbstractDialog::StandardButton button)
             QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(button))));
 }
 
-void QQuickDialog::clicked() {
-    switch (QPlatformDialogHelper::buttonRole(static_cast<QPlatformDialogHelper::StandardButton>(m_clickedButton))) {
-    case QPlatformDialogHelper::AcceptRole:
-        accept();
-        break;
-    case QPlatformDialogHelper::RejectRole:
-        reject();
-        break;
-    case QPlatformDialogHelper::DestructiveRole:
-        emit discard();
-        break;
-    case QPlatformDialogHelper::HelpRole:
-        emit help();
-        break;
-    case QPlatformDialogHelper::YesRole:
-        emit yes();
-        break;
-    case QPlatformDialogHelper::NoRole:
-        emit no();
-        break;
-    case QPlatformDialogHelper::ApplyRole:
-        emit apply();
-        break;
-    case QPlatformDialogHelper::ResetRole:
-        emit reset();
-        break;
-    default:
-        qWarning("StandardButton %d has no role", m_clickedButton);
-    }
-}
-
 void QQuickDialog::accept() {
     // enter key is treated like OK
     if (m_clickedButton == NoButton)