Merge remote-tracking branch 'origin/7.0'

Conflicts:
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp

Change-Id: Icda34067bb89d066a3e7eb47f8cca1d62dc3ae0d

src/libs/qmljs/parser/qmljsast_p.h

@@ -43,9 +43,11 @@
 
 #include <QtCore/qversionnumber.h>
 
-QT_QML_BEGIN_NAMESPACE
-
+QT_BEGIN_NAMESPACE
 class QString;
+QT_END_NAMESPACE
+
+QT_QML_BEGIN_NAMESPACE
 
 namespace QmlJS {
 class Parser;