1 files changed, 4 insertions, 1 deletions
diff --git a/src/QXmppClient.h b/src/QXmppClient.h
index f7de191f..4d3bc7c7 100644
--- a/src/QXmppClient.h
+++ b/src/QXmppClient.h
@@ -108,7 +108,7 @@ public:
     void connectToServer(const QXmppConfiguration&,
                          const QXmppPresence& initialPresence = 
                          QXmppPresence());
-    void disconnect();
+    void disconnectFromServer();
     bool isConnected() const;
 
     QXmppPresence clientPresence() const;
@@ -158,6 +158,9 @@ public:
     QAbstractSocket::SocketError Q_DECL_DEPRECATED getSocketError();
     QXmppStanza::Error::Condition Q_DECL_DEPRECATED getXmppStreamError();
 
+    /// was clashing with QObject::disconnect use disconnectFromServer() instead
+    void Q_DECL_DEPRECATED disconnect();
+
     // deprecated methods, use setClientPresence(QXmppPresence) instead.
     void Q_DECL_DEPRECATED setClientPresence(const QString& statusText);
     void Q_DECL_DEPRECATED setClientPresence(QXmppPresence::Type presenceType);