Merge branch 'origin/5.7' into dev

Change-Id: I7201e93cbd1bd0f605950f573fd79a6214909201

23 files changed, 48 insertions, 20 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 4a6e2fe..d295f1b 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.8.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/doc/enginio_global.qdocconf b/doc/enginio_global.qdocconf
index 62c7f63..e057003 100644
--- a/doc/enginio_global.qdocconf
+++ b/doc/enginio_global.qdocconf
@@ -1,2 +1 @@
-navigation.homepage = "Enginio Manual"
-buildversion = "Enginio $QT_VERSION Reference Documentation"
\ No newline at end of file
+navigation.landingpage = "Enginio Manual"
diff --git a/examples/enginio/enginio.pro b/examples/enginio/enginio.pro
index eb699a0..ae1323c 100644
--- a/examples/enginio/enginio.pro
+++ b/examples/enginio/enginio.pro
@@ -6,3 +6,6 @@ qtHaveModule(widgets) {
       SUBDIRS += quick
   }
 }
+
+EXAMPLE_FILES += \
+    common
diff --git a/examples/enginio/quick/image-gallery/image-gallery.pro b/examples/enginio/quick/image-gallery/image-gallery.pro
index 7cac108..d65d496 100644
--- a/examples/enginio/quick/image-gallery/image-gallery.pro
+++ b/examples/enginio/quick/image-gallery/image-gallery.pro
@@ -13,3 +13,6 @@ OTHER_FILES += *.qml
 
 RESOURCES += \
     gallery.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/image-gallery
+INSTALLS += target
diff --git a/examples/enginio/quick/image-gallery/image_gallery80.png b/examples/enginio/quick/image-gallery/image_gallery80.png
deleted file mode 100644
index 6ad8096..0000000
--- a/examples/enginio/quick/image-gallery/image_gallery80.png
+++ /dev/null
diff --git a/examples/enginio/quick/quick.pro b/examples/enginio/quick/quick.pro
index 6433bbc..8c9886d 100644
--- a/examples/enginio/quick/quick.pro
+++ b/examples/enginio/quick/quick.pro
@@ -5,3 +5,6 @@ SUBDIRS += \
     socialtodos \
     todos \
     users \
+
+EXAMPLE_FILES += \
+    main.cpp
diff --git a/examples/enginio/quick/socialtodos/socialtodos.pro b/examples/enginio/quick/socialtodos/socialtodos.pro
index e27f082..8b25667 100644
--- a/examples/enginio/quick/socialtodos/socialtodos.pro
+++ b/examples/enginio/quick/socialtodos/socialtodos.pro
@@ -19,3 +19,9 @@ OTHER_FILES += \
     socialtodos.qml
 
 RESOURCES += socialtodos.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/socialtodos
+INSTALLS += target
+
+EXAMPLE_FILES += \
+    backendconfig
diff --git a/examples/enginio/quick/todos/todos.pro b/examples/enginio/quick/todos/todos.pro
index 7e1e486..db26da7 100644
--- a/examples/enginio/quick/todos/todos.pro
+++ b/examples/enginio/quick/todos/todos.pro
@@ -11,3 +11,6 @@ mac: CONFIG -= app_bundle
 
 OTHER_FILES += todo.qml
 RESOURCES += todo.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/todos
+INSTALLS += target
diff --git a/examples/enginio/quick/users/users.pro b/examples/enginio/quick/users/users.pro
index 12fef03..cfe6a2b 100644
--- a/examples/enginio/quick/users/users.pro
+++ b/examples/enginio/quick/users/users.pro
@@ -10,4 +10,7 @@ SOURCES += ../main.cpp
 mac: CONFIG -= app_bundle
 
 OTHER_FILES += users.qml Browse.qml Login.qml Register.qml
-RESOURCES += users.qrc
\ No newline at end of file
+RESOURCES += users.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/quick/users
+INSTALLS += target
diff --git a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro
index dd20cf2..d3a5b53 100644
--- a/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro
+++ b/examples/enginio/widgets/cloudaddressbook/cloudaddressbook.pro
@@ -16,3 +16,6 @@ HEADERS += \
 
 FORMS += \
     mainwindow.ui
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/cloudaddressbook
+INSTALLS += target
diff --git a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro
index fad9ce1..008b11c 100644
--- a/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro
+++ b/examples/enginio/widgets/image-gallery-cpp/image-gallery-cpp.pro
@@ -15,3 +15,6 @@ HEADERS += \
     mainwindow.h \
     imageobject.h \
     imagemodel.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/image-gallery-cpp
+INSTALLS += target
diff --git a/examples/enginio/widgets/todos-cpp/todos-cpp.pro b/examples/enginio/widgets/todos-cpp/todos-cpp.pro
index 3862441..84547c0 100644
--- a/examples/enginio/widgets/todos-cpp/todos-cpp.pro
+++ b/examples/enginio/widgets/todos-cpp/todos-cpp.pro
@@ -13,3 +13,6 @@ SOURCES += \
 HEADERS += \
     mainwindow.h \
     todosmodel.h \
+
+target.path = $$[QT_INSTALL_EXAMPLES]/enginio/widgets/todos-cpp
+INSTALLS += target
diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf
index aa9b3b4..c021df2 100644
--- a/src/enginio_client/doc/qtenginio.qdocconf
+++ b/src/enginio_client/doc/qtenginio.qdocconf
@@ -21,7 +21,7 @@ exampledirs += \
                ../../../tests/auto \
 
 # Specify example install dir under QT_INSTALL_EXAMPLES
-examplesinstallpath = qtenginio/enginio/widgets
+examplesinstallpath = enginio/widgets
 
 depends += qtcore qtgui qtwidgets qtnetwork qtquick qtenginioqml qtenginiooverview
 
@@ -49,4 +49,4 @@ qhp.QtEnginio.subprojects.examples.indexTitle = Enginio C++ Classes and Examples
 qhp.QtEnginio.subprojects.examples.selectors = fake:example
 qhp.QtEnginio.subprojects.examples.sortPages = true
 
-navigation.landingpage = "Enginio C++ Classes and Examples"
+navigation.cppclassespage         = "Enginio C++ Classes and Examples"
diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro
index f3a158d..f53bde7 100644
--- a/src/enginio_client/enginio_client.pro
+++ b/src/enginio_client/enginio_client.pro
@@ -1,7 +1,8 @@
 TARGET = Enginio
+MODULE = enginio
+
 QT = core-private network
 DEFINES += ENGINIOCLIENT_LIBRARY
-MODULE = enginio
 
 QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf
 OTHER_FILES += \
@@ -10,8 +11,6 @@ OTHER_FILES += \
 
 include(../src.pri)
 
-load(qt_module)
-
 SOURCES += \
     enginiobackendconnection.cpp \
     enginioclient.cpp \
@@ -43,5 +42,6 @@ HEADERS += \
     enginiooauth2authentication.h \
     enginioreplystate.h
 
-
 DEFINES +=  "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\""
+
+load(qt_module)
diff --git a/src/enginio_client/enginioclient.h b/src/enginio_client/enginioclient.h
index b0dc8f7..2083b80 100644
--- a/src/enginio_client/enginioclient.h
+++ b/src/enginio_client/enginioclient.h
@@ -53,7 +53,7 @@ class ENGINIOCLIENT_EXPORT EnginioClient : public EnginioClientConnection
 
     Q_DECLARE_PRIVATE(EnginioClient)
 public:
-    explicit EnginioClient(QObject *parent = 0);
+    explicit EnginioClient(QObject *parent = Q_NULLPTR);
     ~EnginioClient();
 
     Q_INVOKABLE EnginioReply *customRequest(const QUrl &url, const QByteArray &httpOperation, const QJsonObject &data = QJsonObject());
diff --git a/src/enginio_client/enginiomodel.h b/src/enginio_client/enginiomodel.h
index 8b64daa..d949077 100644
--- a/src/enginio_client/enginiomodel.h
+++ b/src/enginio_client/enginiomodel.h
@@ -57,7 +57,7 @@ class ENGINIOCLIENT_EXPORT EnginioModel
     Q_PROPERTY(QJsonObject query READ query WRITE setQuery NOTIFY queryChanged)
 
 public:
-    explicit EnginioModel(QObject *parent = 0);
+    explicit EnginioModel(QObject *parent = Q_NULLPTR);
     ~EnginioModel();
 
     EnginioClient *client() const Q_REQUIRED_RESULT;
diff --git a/src/enginio_client/enginiooauth2authentication.h b/src/enginio_client/enginiooauth2authentication.h
index f276652..c8a724f 100644
--- a/src/enginio_client/enginiooauth2authentication.h
+++ b/src/enginio_client/enginiooauth2authentication.h
@@ -48,7 +48,7 @@ class ENGINIOCLIENT_EXPORT EnginioOAuth2Authentication : public EnginioIdentity
     Q_DECLARE_PRIVATE(EnginioOAuth2Authentication)
 
 public:
-    explicit EnginioOAuth2Authentication(QObject *parent = 0);
+    explicit EnginioOAuth2Authentication(QObject *parent = Q_NULLPTR);
     ~EnginioOAuth2Authentication();
 
     QString user() const Q_REQUIRED_RESULT;
diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf
index fb69034..5d3f4c5 100644
--- a/src/enginio_plugin/doc/qtenginioqml.qdocconf
+++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf
@@ -22,7 +22,7 @@ exampledirs += \
                ../../../tests/auto \
 
 # Specify example install dir under QT_INSTALL_EXAMPLES
-examplesinstallpath = qtenginio/enginio/quick
+examplesinstallpath = enginio/quick
 
 depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview
 
@@ -50,4 +50,4 @@ qhp.QtEnginioQml.subprojects.examples.indexTitle = Enginio QML Types and Example
 qhp.QtEnginioQml.subprojects.examples.selectors = fake:example
 qhp.QtEnginioQml.subprojects.examples.sortPages = true
 
-navigation.landingpage               = "Enginio QML Types and Examples"
+navigation.qmltypespage              = "Enginio QML Types and Examples"
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;