Merge remote-tracking branch 'origin/2.7' into 2.8

src/plugins/android/androidpackagecreationstep.cpp

@@ -338,7 +338,7 @@ void AndroidPackageCreationStep::checkRequiredLibrariesForRun()
     QMetaObject::invokeMethod(this, "setQtLibs",Qt::BlockingQueuedConnection,
                               Q_ARG(QStringList, m_qtLibsWithDependencies));
 
-    QMetaObject::invokeMethod(this, "getBundleInformation");
+    QMetaObject::invokeMethod(this, "getBundleInformation", Qt::BlockingQueuedConnection);
 
     emit updateRequiredLibrariesModels();
 }

src/plugins/projectexplorer/projectexplorer.qbs

@@ -319,8 +319,6 @@ QtcPlugin {
         "images/targetleftbutton.png",
         "images/targetpanel_bottom.png",
         "images/targetpanel_gradient.png",
-        "images/targetremovebutton.png",
-        "images/targetremovebuttondark.png",
         "images/targetrightbutton.png",
         "images/targetrunselected.png",
         "images/targetseparatorbackground.png",

src/plugins/projectexplorer/taskhub.h

@@ -45,10 +45,13 @@ public:
     TaskHub();
     virtual ~TaskHub();
 
+public slots:
     void addCategory(const Core::Id &categoryId, const QString &displayName, bool visible = true);
-    void addTask(Task task);
+    void addTask(ProjectExplorer::Task task);
     void clearTasks(const Core::Id &categoryId = Core::Id());
-    void removeTask(const Task &task);
+    void removeTask(const ProjectExplorer::Task &task);
+
+public:
     void updateTaskFileName(unsigned int id, const QString &fileName);
     void updateTaskLineNumber(unsigned int id, int line);
     void taskMarkClicked(unsigned int id);
@@ -58,6 +61,7 @@ public:
     void requestPopup();
 
     QIcon taskTypeIcon(ProjectExplorer::Task::TaskType t) const;
+
 signals:
     void categoryAdded(const Core::Id &categoryId, const QString &displayName, bool visible);
     void taskAdded(const ProjectExplorer::Task &task);

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -135,8 +135,6 @@ void QbsBuildStep::run(QFutureInterface<bool> &fi)
             this, SLOT(handleProgress(int)));
     connect(m_job, SIGNAL(reportCommandDescription(QString,QString)),
             this, SLOT(handleCommandDescriptionReport(QString,QString)));
-    connect(m_job, SIGNAL(reportWarning(qbs::Error)),
-            this, SLOT(handleWarningReport(qbs::Error)));
     connect(m_job, SIGNAL(reportProcessResult(qbs::ProcessResult)),
             this, SLOT(handleProcessResultReport(qbs::ProcessResult)));
 }
@@ -248,14 +246,6 @@ void QbsBuildStep::handleProgress(int value)
     m_fi->setProgressValue(m_progressBase + value);
 }
 
-void QbsBuildStep::handleWarningReport(const qbs::Error &error)
-{
-    foreach (const qbs::ErrorData &data, error.entries()) {
-        createTaskAndOutput(ProjectExplorer::Task::Warning, data.description(),
-                            data.codeLocation().fileName(), data.codeLocation().line());
-    }
-}
-
 void QbsBuildStep::handleCommandDescriptionReport(const QString &highlight, const QString &message)
 {
     Q_UNUSED(highlight);

src/plugins/qbsprojectmanager/qbsbuildstep.h

@@ -79,7 +79,6 @@ private slots:
     void buildingDone(bool success);
     void handleTaskStarted(const QString &desciption, int max);
     void handleProgress(int value);
-    void handleWarningReport(const qbs::Error &error);
     void handleCommandDescriptionReport(const QString &highlight, const QString &message);
     void handleProcessResultReport(const qbs::ProcessResult &result);
 

src/plugins/qbsprojectmanager/qbslogsink.cpp

@@ -32,6 +32,9 @@
 #include <qbs.h>
 
 #include <coreplugin/messagemanager.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/taskhub.h>
+#include <utils/fileutils.h>
 
 #include <QCoreApplication>
 #include <QMutexLocker>
@@ -46,6 +49,9 @@ namespace Internal {
 
 QbsLogSink::QbsLogSink(QObject *parent) : QObject(parent)
 {
+    ProjectExplorer::TaskHub *hub = ProjectExplorer::ProjectExplorerPlugin::instance()->taskHub();
+    connect(this, SIGNAL(newTask(ProjectExplorer::Task)),
+            hub, SLOT(addTask(ProjectExplorer::Task)), Qt::QueuedConnection);
 }
 
 void QbsLogSink::sendMessages()
@@ -62,6 +68,16 @@ void QbsLogSink::sendMessages()
         mm->printToOutputPane(msg, Core::MessageManager::NoModeSwitch);
 }
 
+void QbsLogSink::doPrintWarning(const qbs::Error &warning)
+{
+    foreach (const qbs::ErrorData &data, warning.entries())
+        emit newTask(ProjectExplorer::Task(ProjectExplorer::Task::Warning,
+                                           data.description(),
+                                           Utils::FileName::fromString(data.codeLocation().fileName()),
+                                           data.codeLocation().line(),
+                                           ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+}
+
 void QbsLogSink::doPrintMessage(qbs::LoggerLevel level, const QString &message, const QString &tag)
 {
     Q_UNUSED(tag);

src/plugins/qbsprojectmanager/qbslogsink.h

@@ -30,6 +30,8 @@
 #ifndef QBSLOGSINK_H
 #define QBSLOGSINK_H
 
+#include <projectexplorer/task.h>
+
 #include <qbs.h>
 
 #include <QMutex>
@@ -45,10 +47,14 @@ class QbsLogSink : public QObject, public qbs::ILogSink
 public:
     QbsLogSink(QObject *parent = 0);
 
+signals:
+    void newTask(const ProjectExplorer::Task &task);
+
 private slots:
     void sendMessages();
 
 private:
+    void doPrintWarning(const qbs::Error &warning);
     void doPrintMessage(qbs::LoggerLevel level, const QString &message, const QString &tag);
 
     QStringList m_messages;

src/plugins/texteditor/texteditor.qbs

@@ -188,7 +188,6 @@ QtcPlugin {
             "ifunctionhintproposalmodel.h",
             "igenericproposalmodel.cpp",
             "igenericproposalmodel.h",
-            "ikeywords.h",
             "keywordscompletionassist.cpp",
             "keywordscompletionassist.h",
             "quickfixassistprocessor.cpp",