Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ibe2ec06eabd5a60a5f9a98008eba6079fac048bd

3 files changed, 2 insertions, 51 deletions

diff --git a/src/dialogs/qquickabstractdialog.cpp b/src/dialogs/qquickabstractdialog.cpp
index 005d1015..847fb697 100644
--- a/src/dialogs/qquickabstractdialog.cpp
+++ b/src/dialogs/qquickabstractdialog.cpp
@@ -295,7 +295,7 @@ int QQuickAbstractDialog::height() const
 void QQuickAbstractDialog::setX(int arg)
 {
     m_hasAspiredPosition = true;
-    m_sizeAspiration.setX(arg);
+    m_sizeAspiration.moveLeft(arg);
     if (helper()) {
         // TODO
     } else if (m_dialogWindow) {
@@ -310,7 +310,7 @@ void QQuickAbstractDialog::setX(int arg)
 void QQuickAbstractDialog::setY(int arg)
 {
     m_hasAspiredPosition = true;
-    m_sizeAspiration.setY(arg);
+    m_sizeAspiration.moveTop(arg);
     if (helper()) {
         // TODO
     } else if (m_dialogWindow) {
diff --git a/src/dialogs/qquickmessagedialog.cpp b/src/dialogs/qquickmessagedialog.cpp
index f5ff79af..4732a706 100644
--- a/src/dialogs/qquickmessagedialog.cpp
+++ b/src/dialogs/qquickmessagedialog.cpp
@@ -97,7 +97,6 @@ QT_BEGIN_NAMESPACE
 QQuickMessageDialog::QQuickMessageDialog(QObject *parent)
     : QQuickAbstractMessageDialog(parent)
 {
-    connect(this, SIGNAL(buttonClicked()), this, SLOT(clicked()));
 }
 
 
@@ -121,53 +120,6 @@ QQuickMessageDialog::~QQuickMessageDialog()
     \l Window or an \l Item.
 */
 
-
-void QQuickMessageDialog::clicked() {
-    switch (m_clickedButton) {
-    // This mapping from buttons to roles is the same as
-    // documented for enum QMessageBox::StandardButton
-    case Ok:
-    case Open:
-    case Save:
-    case SaveAll:
-    case Retry:
-    case Ignore:
-        accept();
-        break;
-    case Cancel:
-    case Close:
-    case Abort:
-        reject();
-        break;
-    case Discard:
-        emit discard();
-        close();
-        break;
-    case Help:
-        emit help();
-        break;
-    case Yes:
-    case YesToAll:
-        emit yes();
-        close();
-        break;
-    case No:
-    case NoToAll:
-        emit no();
-        close();
-        break;
-    case Apply:
-        emit apply();
-        break;
-    case Reset:
-    case RestoreDefaults:
-        emit reset();
-        break;
-    default:
-        qWarning("StandardButton %d has no role", m_clickedButton);
-    }
-}
-
 void QQuickMessageDialog::accept() {
     // enter key is treated like OK
     if (m_clickedButton == NoButton)
diff --git a/src/dialogs/qquickmessagedialog_p.h b/src/dialogs/qquickmessagedialog_p.h
index 80a0b04d..a20b8677 100644
--- a/src/dialogs/qquickmessagedialog_p.h
+++ b/src/dialogs/qquickmessagedialog_p.h
@@ -73,7 +73,6 @@ protected:
 protected Q_SLOTS:
     virtual void accept();
     virtual void reject();
-    void clicked();
 
 private:
     Q_DISABLE_COPY(QQuickMessageDialog)