Merge remote-tracking branch 'origin/4.1'

 Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f

6 files changed, 37 insertions, 24 deletions

diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp
index 9e5a08a1ac..c0f468d073 100644
--- a/src/plugins/autotest/qtest/qttestoutputreader.cpp
+++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp
@@ -195,7 +195,7 @@ void QtTestOutputReader::processOutput(const QByteArray &outputLine)
                 m_lineNumber = attributes.value(QStringLiteral("line")).toInt();
             } else if (currentTag == QStringLiteral("BenchmarkResult")) {
                 const QXmlStreamAttributes &attributes = m_xmlReader.attributes();
-                const QString metric = attributes.value(QStringLiteral("metrics")).toString();
+                const QString metric = attributes.value(QStringLiteral("metric")).toString();
                 const double value = attributes.value(QStringLiteral("value")).toDouble();
                 const int iterations = attributes.value(QStringLiteral("iterations")).toInt();
                 m_description = constructBenchmarkInformation(metric, value, iterations);
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 0d4afff535..2e4a013368 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1782,7 +1782,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
     m_modeWindow = createModeWindow(Constants::MODE_DEBUG, m_mainWindow);
     m_mode->setWidget(m_modeWindow);
 
-    m_plugin->addAutoReleasedObject(new DebugModeContext(m_mainWindow));
+    m_plugin->addAutoReleasedObject(new DebugModeContext(m_modeWindow));
 
     m_plugin->addObject(m_mode);
 
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index fb758cc025..cfda1684ff 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -178,6 +178,8 @@ void MacroManager::MacroManagerPrivate::removeMacro(const QString &name)
 
     // Remove macro from the map
     Macro *macro = macros.take(name);
+    if (macro == currentMacro)
+        currentMacro = 0;
     delete macro;
 }
 
diff --git a/src/plugins/projectexplorer/waitforstopdialog.cpp b/src/plugins/projectexplorer/waitforstopdialog.cpp
index 1bd57372b4..e7006ecdbd 100644
--- a/src/plugins/projectexplorer/waitforstopdialog.cpp
+++ b/src/plugins/projectexplorer/waitforstopdialog.cpp
@@ -39,6 +39,7 @@ WaitForStopDialog::WaitForStopDialog(QList<ProjectExplorer::RunControl *> runCon
     m_runControls(runControls)
 {
     setWindowTitle(tr("Waiting for Applications to Stop"));
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
     auto layout = new QVBoxLayout();
     setLayout(layout);
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 28fb062310..445e4302f0 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -494,22 +494,6 @@ void QbsProject::handleQbsParsingDone(bool success)
         m_qbsUpdateFutureInterface->reportCanceled();
     }
 
-    bool hasTargetArtifacts = false;
-    if (dataChanged) {
-        qCDebug(qbsPmLog) << "Project data changed.";
-        foreach (const qbs::ProductData &product, m_projectData.allProducts()) {
-            if (!product.targetArtifacts().isEmpty()) {
-                hasTargetArtifacts = true;
-                break;
-            }
-        }
-        if (!hasTargetArtifacts) {
-            qCDebug(qbsPmLog) << "No target artifacts present, executing rules";
-            m_qbsProjectParser->startRuleExecution();
-            return;
-        }
-    }
-
     m_qbsProjectParser->deleteLater();
     m_qbsProjectParser = 0;
     m_qbsUpdateFutureInterface->reportFinished();
diff --git a/src/plugins/qmlprofiler/tests/flamegraphmodel_test.cpp b/src/plugins/qmlprofiler/tests/flamegraphmodel_test.cpp
index c8a6beaeae..660bd3e4a8 100644
--- a/src/plugins/qmlprofiler/tests/flamegraphmodel_test.cpp
+++ b/src/plugins/qmlprofiler/tests/flamegraphmodel_test.cpp
@@ -111,8 +111,9 @@ void FlameGraphModelTest::testIndex()
 
 void FlameGraphModelTest::testCounts()
 {
-    QCOMPARE(model.rowCount(), 1);
+    QCOMPARE(model.rowCount(), 2);
     QCOMPARE(model.rowCount(model.index(0, 0)), 1);
+    QCOMPARE(model.rowCount(model.index(1, 0)), 1);
     QCOMPARE(model.columnCount(), 1);
 }
 
@@ -122,40 +123,65 @@ void FlameGraphModelTest::testData()
         FlameGraphModel::tr("JavaScript"),
         FlameGraphModel::tr("Signal"),
         FlameGraphModel::tr("Binding"),
-        FlameGraphModel::tr("Create"),
-        FlameGraphModel::tr("Compile"),
+        FlameGraphModel::tr("Create")
     });
 
     QModelIndex index = model.index(0, 0);
+    QModelIndex index2 = model.index(1, 0);
     QCOMPARE(model.data(index, FlameGraphModel::TypeIdRole).toInt(), 0);
+    QCOMPARE(model.data(index2, FlameGraphModel::TypeIdRole).toInt(), 4);
     QCOMPARE(model.data(index, FlameGraphModel::TypeRole).toString(),
              FlameGraphModel::tr("JavaScript"));
+    QCOMPARE(model.data(index2, FlameGraphModel::TypeRole).toString(),
+             FlameGraphModel::tr("Compile"));
     QCOMPARE(model.data(index, FlameGraphModel::DurationRole).toLongLong(), 20);
+    QCOMPARE(model.data(index2, FlameGraphModel::DurationRole).toLongLong(), 12);
     QCOMPARE(model.data(index, FlameGraphModel::CallCountRole).toInt(), 1);
+    QCOMPARE(model.data(index2, FlameGraphModel::CallCountRole).toInt(), 1);
     QCOMPARE(model.data(index, FlameGraphModel::DetailsRole).toString(),
              QLatin1String("funcfunc"));
+    QCOMPARE(model.data(index2, FlameGraphModel::DetailsRole).toString(),
+             QLatin1String("funcfunc"));
     QCOMPARE(model.data(index, FlameGraphModel::FilenameRole).toString(),
              QLatin1String("somefile.js"));
+    QCOMPARE(model.data(index2, FlameGraphModel::FilenameRole).toString(),
+             QLatin1String("somefile.js"));
     QCOMPARE(model.data(index, FlameGraphModel::LineRole).toInt(), 0);
+    QCOMPARE(model.data(index2, FlameGraphModel::LineRole).toInt(), 4);
     QCOMPARE(model.data(index, FlameGraphModel::ColumnRole).toInt(), 20);
+    QCOMPARE(model.data(index2, FlameGraphModel::ColumnRole).toInt(), 16);
     QCOMPARE(model.data(index, FlameGraphModel::NoteRole).toString(), QString("dings"));
+    QCOMPARE(model.data(index2, FlameGraphModel::NoteRole).toString(), QString());
     QCOMPARE(model.data(index, FlameGraphModel::TimePerCallRole).toLongLong(), 20);
-    QCOMPARE(model.data(index, FlameGraphModel::TimeInPercentRole).toInt(), 100);
+    QCOMPARE(model.data(index2, FlameGraphModel::TimePerCallRole).toLongLong(), 12);
+    QCOMPARE(model.data(index, FlameGraphModel::TimeInPercentRole).toInt(), 62);
+    QCOMPARE(model.data(index2, FlameGraphModel::TimeInPercentRole).toInt(), 37);
     QCOMPARE(model.data(index, FlameGraphModel::RangeTypeRole).toInt(),
              static_cast<int>(Javascript));
+    QCOMPARE(model.data(index2, FlameGraphModel::RangeTypeRole).toInt(),
+             static_cast<int>(Compiling));
     QCOMPARE(model.data(index, FlameGraphModel::LocationRole).toString(),
              QLatin1String("somefile.js:0"));
+    QCOMPARE(model.data(index2, FlameGraphModel::LocationRole).toString(),
+             QLatin1String("somefile.js:4"));
     QVERIFY(!model.data(index, -10).isValid());
+    QVERIFY(!model.data(index2, -10).isValid());
     QVERIFY(!model.data(QModelIndex(), FlameGraphModel::LineRole).isValid());
 
-    for (int i = 1; i < 10; ++i) {
+    for (int i = 1; i < 8; ++i) {
         index = model.index(0, 0, index);
         QCOMPARE(model.data(index, FlameGraphModel::TypeRole).toString(),
                  typeRoles[i % typeRoles.length()]);
         QCOMPARE(model.data(index, FlameGraphModel::NoteRole).toString(),
                  (i % typeRoles.length() == 0) ? QString("dings") : QString());
     }
-    QCOMPARE(model.data(index, FlameGraphModel::CallCountRole).toInt(), 2);
+    QCOMPARE(model.data(index, FlameGraphModel::CallCountRole).toInt(), 1);
+
+    index2 = model.index(0, 0, index2);
+    QCOMPARE(model.data(index2, FlameGraphModel::TypeRole).toString(),
+             FlameGraphModel::tr("Compile"));
+    QCOMPARE(model.data(index2, FlameGraphModel::NoteRole).toString(), QString());
+    QCOMPARE(model.data(index2, FlameGraphModel::CallCountRole).toInt(), 2);
 }
 
 void FlameGraphModelTest::testRoleNames()