Merge remote-tracking branch 'origin/3.3'

Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e

src/libs/qmljs/qmljsinterpreter.cpp

@@ -1388,17 +1388,17 @@ void CppQmlTypesLoader::parseQmlTypeDescriptions(const QByteArray &contents,
                                                  QString *errorMessage,
                                                  QString *warningMessage, const QString &fileName)
 {
-    if (!contents.isEmpty()) {
-        unsigned char c = contents.at(0);
-        switch (c) {
-        case 0xfe:
-        case 0xef:
-        case 0xff:
-        case 0xee:
-        case 0x00:
-            qWarning() << fileName << "seems not to be encoded in UTF8 or has a BOM.";
-        default: break;
-        }
+    if (contents.isEmpty())
+        return;
+    unsigned char c = contents.at(0);
+    switch (c) {
+    case 0xfe:
+    case 0xef:
+    case 0xff:
+    case 0xee:
+    case 0x00:
+        qWarning() << fileName << "seems not to be encoded in UTF8 or has a BOM.";
+    default: break;
     }
 
     errorMessage->clear();

src/libs/qmljs/qmljsmodelmanagerinterface.cpp

@@ -629,6 +629,11 @@ ModelManagerInterface::ProjectInfo ModelManagerInterface::projectInfoForPath(QSt
     return res;
 }
 
+bool ModelManagerInterface::isIdle() const
+{
+    return m_synchronizer.futures().isEmpty();
+}
+
 void ModelManagerInterface::emitDocumentChangedOnDisk(Document::Ptr doc)
 { emit documentChangedOnDisk(doc); }
 

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -182,6 +182,7 @@ public:
     void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc);
     void updateQrcFile(const QString &path);
     ProjectInfo projectInfoForPath(QString path) const;
+    bool isIdle() const ;
 
     PathsAndLanguages importPaths() const;
     QmlJS::QmlLanguageBundles activeBundles() const;

src/libs/qmljs/qmljstypedescriptionreader.cpp

@@ -497,7 +497,7 @@ ComponentVersion TypeDescriptionReader::readNumericVersionBinding(UiScriptBindin
     ComponentVersion invalidVersion;
 
     if (!ast || !ast->statement) {
-        addError(ast->colonToken, tr("Expected numeric literal after colon."));
+        addError((ast ? ast->colonToken : SourceLocation()), tr("Expected numeric literal after colon."));
         return invalidVersion;
     }