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

Conflicts:
	src/corelib/io/qtemporarydir.cpp
One side encapsulated a repeated piece of #if-ery in a local define;
the other added to the #if-ery.  Made its addition to the other's.

	src/corelib/kernel/qeventdispatcher_unix_p.h
One side moved some members into a struct; this collided with a #undef
check that neither side now has.  Discarded the #undef part.

	src/gui/opengl/qopengltexturehelper_p.h
5.7 deleted a bunch of methods; not clear why merge got confused.

	src/tools/moc/moc.cpp
One added a name to the copyright header; another changed its URL.

Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
index 0e774d50c3..d2804ebca6 100644
--- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h
+++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h
@@ -115,7 +115,7 @@ public:
     bool getOfflineMode();
     QStringList getTechnologies();
     QStringList getServices();
-    void requestScan(const QString &type);
+    bool requestScan(const QString &type);
 
     QHash<QString, QConnmanTechnologyInterface *> technologiesMap;
 
@@ -126,7 +126,7 @@ Q_SIGNALS:
     void servicesChanged(const ConnmanMapList&, const QList<QDBusObjectPath> &);
 
     void servicesReady(const QStringList &);
-    void scanFinished();
+    void scanFinished(bool error);
 
 protected:
     void connectNotify(const QMetaMethod &signal);
@@ -211,7 +211,7 @@ public:
 Q_SIGNALS:
     void propertyChanged(const QString &, const QDBusVariant &value);
     void propertyChangedContext(const QString &,const QString &,const QDBusVariant &);
-    void scanFinished();
+    void scanFinished(bool error);
 protected:
     void connectNotify(const QMetaMethod &signal);
     QVariant getProperty(const QString &);