summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorSergio Martins <iamsergio@gmail.com>2014-07-08 11:11:52 +0100
committerSérgio Martins <sergio.martins@kdab.com>2014-07-11 14:36:23 +0200
commitca03374390c4d5f4e8f2156f3b2038f984ed39d4 (patch)
tree1c6782aff0bcea1853eef3566771933b87198dca /src/imports
parent00f77bdc5beb62e980216cfee906ab7aa1d1c4f7 (diff)
downloadqtwebsockets-ca03374390c4d5f4e8f2156f3b2038f984ed39d4.tar.gz
Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2
Otherwise Q_NULLPTR appears in documentation, which is inconsistent. Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/qmlwebsockets/qqmlwebsocket.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 2e02f33..907506b 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -63,7 +63,7 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus
Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
public:
- explicit QQmlWebSocket(QObject *parent = Q_NULLPTR);
+ explicit QQmlWebSocket(QObject *parent = 0);
virtual ~QQmlWebSocket();
enum Status