Merge remote-tracking branch 'origin/5.9' into dev

Change-Id: I61ab3d0bd8cc02f640c60c037226eace09ec09ba

7 files changed, 24 insertions, 20 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index de04116a6b..f766f0e4c8 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1961,7 +1961,7 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int
     // with the correct QML context.
 
     // Look for IDs first.
-    for (const IdMapping &mapping : qAsConst(_idObjects))
+    for (const IdMapping &mapping : qAsConst(_idObjects)) {
         if (name == mapping.name) {
             if (_function->isQmlBinding)
                 _function->idObjectDependencies.insert(mapping.idIndex);
@@ -1979,8 +1979,9 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int
             result->isReadOnly = true; // don't allow use as lvalue
             return result;
         }
+    }
 
-    {
+    if (name.at(0).isUpper()) {
         QQmlTypeNameCache::Result r = imports->query(name);
         if (r.isValid()) {
             if (r.scriptIndex != -1) {
diff --git a/src/qml/compiler/qqmlpropertyvalidator_p.h b/src/qml/compiler/qqmlpropertyvalidator_p.h
index d0bd314461..e37b8141f4 100644
--- a/src/qml/compiler/qqmlpropertyvalidator_p.h
+++ b/src/qml/compiler/qqmlpropertyvalidator_p.h
@@ -69,8 +69,8 @@ private:
 
     bool canCoerce(int to, QQmlPropertyCache *fromMo) const;
 
-    QVector<QQmlCompileError> recordError(const QV4::CompiledData::Location &location, const QString &description) const Q_REQUIRED_RESULT;
-    QVector<QQmlCompileError> recordError(const QQmlCompileError &error) const Q_REQUIRED_RESULT;
+    Q_REQUIRED_RESULT QVector<QQmlCompileError> recordError(const QV4::CompiledData::Location &location, const QString &description) const;
+    Q_REQUIRED_RESULT QVector<QQmlCompileError> recordError(const QQmlCompileError &error) const;
     QString stringAt(int index) const { return qmlUnit->stringAt(index); }
 
     QQmlEnginePrivate *enginePrivate;
diff --git a/src/qml/configure.json b/src/qml/configure.json
index 2c4887365f..257bedecbc 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -15,17 +15,20 @@
     "features": {
         "qml-interpreter": {
             "label": "QML interpreter",
-            "purpose": "Support for the QML interpreter",
+            "purpose": "Provides the QML interpreter.",
+            "section": "QML",
             "output": [ "privateFeature" ]
         },
         "qml-network": {
             "label": "QML network support",
-            "purpose": "Provides network transparency for QML",
+            "purpose": "Provides network transparency.",
+            "section": "QML",
             "output": [ "publicFeature" ]
         },
         "qml-profiler": {
             "label": "Command line QML Profiler",
-            "purpose": "The QML Profiler retrieves QML tracing data from an application.",
+            "purpose": "Supports retrieving QML tracing data from an application.",
+            "section": "QML",
             "condition": [
                 "features.commandlineparser",
                 "features.localserver",
diff --git a/src/qml/jsruntime/qv4alloca_p.h b/src/qml/jsruntime/qv4alloca_p.h
index c21878fa42..1e9f83a90e 100644
--- a/src/qml/jsruntime/qv4alloca_p.h
+++ b/src/qml/jsruntime/qv4alloca_p.h
@@ -58,7 +58,7 @@
 #elif QT_CONFIG(alloca_malloc_h)
 #  include <malloc.h>
 // This does not matter unless compiling in strict standard mode.
-#  ifdef Q_OS_WIN
+#  ifdef Q_CC_MSVC
 #    define alloca _alloca
 #  endif
 #else
diff --git a/src/qml/jsruntime/qv4string_p.h b/src/qml/jsruntime/qv4string_p.h
index df0394d4cb..2f34dd6139 100644
--- a/src/qml/jsruntime/qv4string_p.h
+++ b/src/qml/jsruntime/qv4string_p.h
@@ -175,10 +175,6 @@ struct Q_QML_PRIVATE_EXPORT String : public Managed {
     }
     uint toUInt(bool *ok) const;
 
-    Q_DECL_DEPRECATED void makeIdentifier(ExecutionEngine *) {
-        makeIdentifier();
-    }
-
     void makeIdentifier() const {
         if (d()->identifier)
             return;
diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h
index 6704e55b52..387c28a945 100644
--- a/src/qml/qtqmlglobal.h
+++ b/src/qml/qtqmlglobal.h
@@ -40,18 +40,20 @@
 #ifndef QTQMLGLOBAL_H
 #define QTQMLGLOBAL_H
 
+#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
+#  define QT_QML_BOOTSTRAPPED
+#endif
+
 #include <QtCore/qglobal.h>
-#include <QtQml/qtqml-config.h>
-#if QT_CONFIG(qml_network)
-#include <QtNetwork/qtnetworkglobal.h>
+#ifndef QT_QML_BOOTSTRAPPED
+#  include <QtQml/qtqml-config.h>
+#  if QT_CONFIG(qml_network)
+#    include <QtNetwork/qtnetworkglobal.h>
+#  endif
 #endif
 
 QT_BEGIN_NAMESPACE
 
-#if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB)
-#  define QT_QML_BOOTSTRAPPED
-#endif
-
 #if !defined(QT_QML_BOOTSTRAPPED) && !defined(QT_STATIC)
 #  if defined(QT_BUILD_QML_LIB)
 #    define Q_QML_EXPORT Q_DECL_EXPORT
diff --git a/src/qml/qtqmlglobal_p.h b/src/qml/qtqmlglobal_p.h
index 3314e73d19..4c0ba338d8 100644
--- a/src/qml/qtqmlglobal_p.h
+++ b/src/qml/qtqmlglobal_p.h
@@ -52,8 +52,10 @@
 //
 
 #include <QtCore/private/qglobal_p.h>
-#include <QtQml/private/qtqml-config_p.h>
 #include <QtQml/qtqmlglobal.h>
+#ifndef QT_QML_BOOTSTRAPPED
+#  include <QtQml/private/qtqml-config_p.h>
+#endif
 
 #define Q_QML_PRIVATE_EXPORT Q_QML_EXPORT