Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I58f3843f7dffd69b3924b652b8401ce5de2021ba

6 files changed, 5 insertions, 6 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 7546991..d8ad525 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,4 @@
 load(qt_build_config)
 CONFIG += warning_clean
-CONFIG += qt_example_installs
 
 MODULE_VERSION = 1.7.0
diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3
index 4e49b12..71c4ad4 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 6e18461..dfcab5e 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index 4d67bac..6bf924c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.
diff --git a/dist/packages/com.digia.enginio/meta/LICENSE.LGPL b/dist/packages/com.digia.enginio/meta/LICENSE.LGPL
index 73cee11..58c2f62 100644
--- a/dist/packages/com.digia.enginio/meta/LICENSE.LGPL
+++ b/dist/packages/com.digia.enginio/meta/LICENSE.LGPL
@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/src/enginio_plugin/enginioqmlclient_p_p.h b/src/enginio_plugin/enginioqmlclient_p_p.h
index e253205..a5ca531 100644
--- a/src/enginio_plugin/enginioqmlclient_p_p.h
+++ b/src/enginio_plugin/enginioqmlclient_p_p.h
@@ -57,7 +57,7 @@ public:
     static EnginioQmlClientPrivate* get(EnginioClientConnection *client) { return static_cast<EnginioQmlClientPrivate*>(EnginioClientConnectionPrivate::get(client)); }
     static EnginioQmlClient* get(EnginioClientConnectionPrivate *client) { return static_cast<EnginioQmlClient*>(client->q_ptr); }
 
-    virtual void init();
+    virtual void init() Q_DECL_OVERRIDE;
     virtual void emitSessionTerminated() const Q_DECL_OVERRIDE;
     virtual void emitSessionAuthenticated(EnginioReplyState *reply) Q_DECL_OVERRIDE;
     virtual void emitSessionAuthenticationError(EnginioReplyState *reply) Q_DECL_OVERRIDE;