From d744b24fab64e24eb11658e6eb617e7b5980ad40 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Fri, 1 Jun 2012 20:40:29 +1000
Subject: QNetworkReply: Change abort() function into a slot

It is useful for abort() to be a slot for connecting cancel and timeout
signals.

Change-Id: Ib0146d66fffe3f57b683dfbce0863e378b8c076d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
---
 src/network/access/qnetworkreply.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index e514779a0a..cc3a41af4e 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -104,7 +104,6 @@ public:
     };
 
     ~QNetworkReply();
-    virtual void abort() = 0;
 
     // reimplemented from QIODevice
     virtual void close();
@@ -143,6 +142,7 @@ public:
 #endif
 
 public Q_SLOTS:
+    virtual void abort() = 0;
     virtual void ignoreSslErrors();
 
 Q_SIGNALS:
-- 
cgit v1.2.3