Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

src/plugins/autotest/testcodeparser.cpp

@@ -288,6 +288,9 @@ static QString testClass(const CppTools::CppModelManager *modelManager, const QS
 {
     const QByteArray &fileContent = getFileContent(fileName);
     CPlusPlus::Document::Ptr document = modelManager->document(fileName);
+    if (document.isNull())
+        return QString();
+
     const QList<CPlusPlus::Document::MacroUse> macros = document->macroUses();
 
     foreach (const CPlusPlus::Document::MacroUse &macro, macros) {
@@ -604,6 +607,8 @@ static void performParse(QFutureInterface<TestParseResult> &futureInterface,
     QmlJS::Snapshot qmlSnapshot = QmlJSTools::Internal::ModelManager::instance()->snapshot();
 
     foreach (const QString &file, list) {
+        if (futureInterface.isCanceled())
+            return;
         if (file.endsWith(QLatin1String(".qml"))) {
             checkQmlDocumentForTestCode(futureInterface, qmlSnapshot.document(file));
         } else if (snapshot.contains(file)) {
@@ -693,6 +698,7 @@ bool TestCodeParser::postponed(const QStringList &fileList)
             m_partialUpdatePostponed = false;
             m_postponedFiles.clear();
             m_fullUpdatePostponed = true;
+            Core::ProgressManager::instance()->cancelTasks(Constants::TASK_PARSE);
         } else {
             // partial parse triggered, but full parse is postponed already, ignoring this
             if (m_fullUpdatePostponed)