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

Conflicts:
	src/quickwidgets/qquickwidget.cpp

Change-Id: I3e2326bc86a9d3adaafbe3830b75ce9afa81c45b

4 files changed, 7 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index be482b4639..040089db20 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -777,8 +777,8 @@ QObject *QQmlComponent::create(QQmlContext *context)
 
 /*!
     This method provides advanced control over component instance creation.
-    In general, programmers should use QQmlComponent::create() to create a
-    component.
+    In general, programmers should use QQmlComponent::create() to create object
+    instances.
 
     Create an object instance from this component. Returns 0 if creation
     failed. \a publicContext specifies the context within which to create the object
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 9c5e48ae32..0c003790dd 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -912,7 +912,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine()
 
   Note that the \l {Qt Quick 1} version is called QDeclarativeEngine.
 
-  \sa QQmlComponent, QQmlContext
+  \sa QQmlComponent, QQmlContext, {QML Global Object}
 */
 
 /*!
diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h
index b56f74198c..90ac1dd777 100644
--- a/src/qml/qml/qqmlinfo.h
+++ b/src/qml/qml/qqmlinfo.h
@@ -48,7 +48,11 @@ namespace QtQml {
     Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error);
     Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors);
 }
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_CLANG("-Wheader-hygiene")
+// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application.
 using namespace QtQml;
+QT_WARNING_POP
 
 class QQmlInfoPrivate;
 class Q_QML_EXPORT QQmlInfo : public QDebug
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 8666c0db01..043113bc31 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -314,10 +314,6 @@ struct Node : public Object
     static ReturnedValue create(ExecutionEngine *v4, NodeImpl *);
 
     bool isNull() const;
-
-private:
-    Node &operator=(const Node &);
-    Node(const Node &o);
 };
 
 Heap::Node::Node(NodeImpl *data)