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

Conflicts:
	.qmake.conf

Change-Id: Ie164bbaaa8c78c13d75c85d0edcc2ea4d76fe738

13 files changed, 37 insertions, 7 deletions

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 ff55798..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
 
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_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf
index f887f9f..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