Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp

Change-Id: If742bcd843cf75cf55e07b489ecb7211f0cd9058

src/plugins/projectexplorer/projecttreewidget.cpp

@@ -498,6 +498,7 @@ void ProjectTreeWidget::setCurrentItem(Node *node)
         }
     } else {
         m_view->clearSelection();
+        m_view->setCurrentIndex({});
     }
 }
 

src/plugins/qmldesigner/components/debugview/debugview.cpp

@@ -235,6 +235,11 @@ void DebugView::selectedNodesChanged(const QList<ModelNode> &selectedNodes /*sel
 
         message << lineBreak;
 
+        for (const SignalHandlerProperty &property : selectedNode.signalProperties())
+            message << property << lineBreak;
+
+        message << lineBreak;
+
         if (selectedNode.metaInfo().isValid()) {
             for (const NodeMetaInfo &metaInfo : selectedNode.metaInfo().classHierarchy())
                 message << metaInfo.typeName() << lineBreak;

src/plugins/qtsupport/profilereader.cpp

@@ -34,6 +34,16 @@
 using namespace ProjectExplorer;
 using namespace QtSupport;
 
+static QString format(const QString &fileName, int lineNo, const QString &msg)
+{
+    if (lineNo > 0)
+        return QString::fromLatin1("%1(%2): %3").arg(fileName, QString::number(lineNo), msg);
+    else if (!fileName.isEmpty())
+        return QString::fromLatin1("%1: %2").arg(fileName, msg);
+    else
+        return msg;
+}
+
 ProMessageHandler::ProMessageHandler(bool verbose, bool exact)
     : m_verbose(verbose)
     , m_exact(exact)
@@ -54,8 +64,12 @@ void ProMessageHandler::message(int type, const QString &msg, const QString &fil
 {
     if ((type & CategoryMask) == ErrorMessage && ((type & SourceMask) == SourceParser || m_verbose)) {
         // parse error in qmake files
-        TaskHub::addTask(
-            BuildSystemTask(Task::Error, msg, Utils::FilePath::fromString(fileName), lineNo));
+        if (m_exact) {
+            TaskHub::addTask(
+                BuildSystemTask(Task::Error, msg, Utils::FilePath::fromString(fileName), lineNo));
+        } else {
+            appendMessage(format(fileName, lineNo, msg));
+        }
     }
 }
 
@@ -64,9 +78,9 @@ void ProMessageHandler::fileMessage(int type, const QString &msg)
     // message(), warning() or error() calls in qmake files
     if (!m_verbose)
         return;
-    if (type == QMakeHandler::ErrorMessage)
+    if (m_exact && type == QMakeHandler::ErrorMessage)
         TaskHub::addTask(BuildSystemTask(Task::Error, msg));
-    else if (type == QMakeHandler::WarningMessage)
+    else if (m_exact && type == QMakeHandler::WarningMessage)
         TaskHub::addTask(BuildSystemTask(Task::Warning, msg));
     else
         appendMessage(msg);

src/plugins/qtsupport/qttestparser.cpp

@@ -49,7 +49,7 @@ namespace Internal {
 
 OutputLineParser::Result QtTestParser::handleLine(const QString &line, OutputFormat type)
 {
-    if (type != StdOutFormat)
+    if (type != StdOutFormat && type != DebugFormat)
         return Status::NotHandled;
 
     const QString theLine = rightTrimmed(line);

src/plugins/texteditor/texteditor.cpp

@@ -3682,7 +3682,7 @@ void TextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block, co
             .toTextCharFormat(C_SEARCH_RESULT).background().color().darker(120);
 
     while (idx < text.length()) {
-        const QRegularExpressionMatch match = m_searchExpr.match(text, idx + 1);
+        const QRegularExpressionMatch match = m_searchExpr.match(text, idx + l + 1);
         if (!match.hasMatch())
             break;
         idx = match.capturedStart();