Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

1 files changed, 7 insertions, 7 deletions

diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 3a9ddfd990..90382c7fe5 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -248,10 +248,10 @@ public:
 
 
     QXmlStreamReader();
-    QXmlStreamReader(QIODevice *device);
-    QXmlStreamReader(const QByteArray &data);
-    QXmlStreamReader(const QString &data);
-    QXmlStreamReader(const char * data);
+    explicit QXmlStreamReader(QIODevice *device);
+    explicit QXmlStreamReader(const QByteArray &data);
+    explicit QXmlStreamReader(const QString &data);
+    explicit QXmlStreamReader(const char * data);
     ~QXmlStreamReader();
 
     void setDevice(QIODevice *device);
@@ -361,9 +361,9 @@ class Q_CORE_EXPORT QXmlStreamWriter
     QDOC_PROPERTY(int autoFormattingIndent READ autoFormattingIndent WRITE setAutoFormattingIndent)
 public:
     QXmlStreamWriter();
-    QXmlStreamWriter(QIODevice *device);
-    QXmlStreamWriter(QByteArray *array);
-    QXmlStreamWriter(QString *string);
+    explicit QXmlStreamWriter(QIODevice *device);
+    explicit QXmlStreamWriter(QByteArray *array);
+    explicit QXmlStreamWriter(QString *string);
     ~QXmlStreamWriter();
 
     void setDevice(QIODevice *device);