From 99b0d32f3f6e3d7b9e5de087d0b219464c361ba1 Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Mon, 9 Feb 2015 21:30:23 -0500
Subject: [PATCH] use sslConfiguration on socket

A public accessor and mutator was provided for using a QSslConfiguration
with a QAmqpClient, however the configuration was never actually assigned
to the internal socket. This patch fixes that, and removes the needless
storage of a copy of the QSslConfiguration as well
---
 src/qamqpclient.cpp | 5 ++---
 src/qamqpclient_p.h | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/qamqpclient.cpp b/src/qamqpclient.cpp
index d484460..0ccfef8 100644
--- a/src/qamqpclient.cpp
+++ b/src/qamqpclient.cpp
@@ -789,17 +789,16 @@ QString QAmqpClient::errorString() const
 QSslConfiguration QAmqpClient::sslConfiguration() const
 {
     Q_D(const QAmqpClient);
-    return d->sslConfiguration;
+    return d->socket->sslConfiguration();
 }
 
 void QAmqpClient::setSslConfiguration(const QSslConfiguration &config)
 {
     Q_D(QAmqpClient);
-    d->sslConfiguration = config;
-
     if (!config.isNull()) {
         d->useSsl = true;
         d->port = AMQP_SSL_PORT;
+        d->socket->setSslConfiguration(config);
     }
 }
 
diff --git a/src/qamqpclient_p.h b/src/qamqpclient_p.h
index 55c0bf4..9856019 100644
--- a/src/qamqpclient_p.h
+++ b/src/qamqpclient_p.h
@@ -5,7 +5,6 @@
 #include <QSharedPointer>
 #include <QPointer>
 #include <QAbstractSocket>
-#include <QSslConfiguration>
 #include <QSslError>
 
 #include "qamqpglobal.h"
@@ -101,8 +100,6 @@ public:
     QAMQP::Error error;
     QString errorString;
 
-    QSslConfiguration sslConfiguration;
-
     QAmqpClient * const q_ptr;
     Q_DECLARE_PUBLIC(QAmqpClient)