Merge "Merge remote-tracking branch 'origin/1.0' into 1.1" into refs/staging/1.1

2 files changed, 26 insertions, 4 deletions

diff --git a/dist/changes-1.0.6 b/dist/changes-1.0.6
new file mode 100644
index 0000000..97a8f05
--- /dev/null
+++ b/dist/changes-1.0.6
@@ -0,0 +1,22 @@
+Enginio 1.0.6 is a bug-fix release. It maintains both forward and backward
+compatibility(source and binary) with Enginio 1.0 series.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+    http://qt-project.org/doc/qt-5/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+    http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - Fixed static build on Windows
diff --git a/src/enginio_client/enginioidentity.cpp b/src/enginio_client/enginioidentity.cpp
index 56b8b90..31f38e1 100644
--- a/src/enginio_client/enginioidentity.cpp
+++ b/src/enginio_client/enginioidentity.cpp
@@ -224,11 +224,11 @@ public:
 
   To authenticate an instance of EnginioClient called \a client such code may be used:
   \code
-    EnginioOAuth2Authentication identity;
-    identity.setUser(_user);
-    identity.setPassword(_user);
+    EnginioOAuth2Authentication *identity = new EnginioOAuth2Authentication(client);
+    identity->setUser(_user);
+    identity->setPassword(_password);
 
-    client.setIdentity(&identity);
+    client->setIdentity(identity);
   \endcode
 
   Setting the identity will trigger an asynchronous request, resulting in EnginioClient::authenticationState()