From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Mon, 14 Jul 2014 08:27:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/5.3' into dev
X-Git-Tag: v5.4.0-alpha1~5
X-Git-Url: http://review.tizen.org/git/?p=contrib%2Fqtwebsockets.git;a=commitdiff_plain;h=389547b491985c16d80b7f9de2da972373d7a2f4

Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	src/imports/qmlwebsockets/qqmlwebsocket.h

Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
---

389547b491985c16d80b7f9de2da972373d7a2f4
diff --cc src/imports/qmlwebsockets/qqmlwebsocket.h
index 205f24d,907506b..33d35e7
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@@ -63,8 -63,7 +63,8 @@@ class QQmlWebSocket : public QObject, p
      Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
  
  public:
-     explicit QQmlWebSocket(QObject *parent = Q_NULLPTR);
-     explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = Q_NULLPTR);
+     explicit QQmlWebSocket(QObject *parent = 0);
++    explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = 0);
      virtual ~QQmlWebSocket();
  
      enum Status