summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket.h
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-04-30 19:14:06 +0100
committerQt by Nokia <qt-info@nokia.com>2012-05-04 03:11:17 +0200
commitbb234e238c777b1a708912765d6899bf9061bcb8 (patch)
treef24059635af2e1ce223b6931cec5990bf6035c0d /src/network/socket/qabstractsocket.h
parent42d4639fd95b098ff087afa9fc325adf906e2f55 (diff)
Rename QAbstractSocket::PauseOnNotify -> PauseOnSslErrors
Although we created an enum for pause modes to make 5.x binary compatible with 5.0, the enum value is not well named. In 5.1, we propose to add PauseOnProxyAuthentication to the enum. PauseOnNotify is not clear what it means, while PauseOnSslErrors is. Any new notification in a minor release would need a new enum value otherwise applications would get pauses they did not expect. Task-number: QTBUG-19032 Change-Id: I4dbb7467663b37ca7f0551d24a31bc013968bedc Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/network/socket/qabstractsocket.h')
-rw-r--r--src/network/socket/qabstractsocket.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index 7a9f70b47e..dedde9649a 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -127,7 +127,7 @@ public:
Q_DECLARE_FLAGS(BindMode, BindFlag)
enum PauseMode {
PauseNever = 0x0,
- PauseOnNotify = 0x1
+ PauseOnSslErrors = 0x1
};
Q_DECLARE_FLAGS(PauseModes, PauseMode)