BuildInfo: Add BuildConfiguration::BuildType

Remove QbsBuildInfo, which only adds the same information over
the normal BuildInfo.

Change QmakeBuildInfo to use the buildType as provided by
its base class.

Change-Id: Iddb86487c85893988f78bbfaf549823a19f13b5b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/projectexplorer/buildinfo.h b/src/plugins/projectexplorer/buildinfo.h
index 8175a0b5a1..6d9d959d58 100644
--- a/src/plugins/projectexplorer/buildinfo.h
+++ b/src/plugins/projectexplorer/buildinfo.h
@@ -33,6 +33,7 @@
 
 #include "projectexplorer_export.h"
 
+#include "buildconfiguration.h"
 #include "task.h"
 
 #include <coreplugin/id.h>
@@ -54,6 +55,14 @@ public:
     QString typeName;
     Utils::FileName buildDirectory;
     Core::Id kitId;
+    BuildConfiguration::BuildType buildType = BuildConfiguration::Unknown;
+
+    bool operator==(const BuildInfo &o)
+    {
+        return displayName == o.displayName && typeName == o.typeName
+                && buildDirectory == o.buildDirectory && kitId == o.kitId
+                && buildType == o.buildType;
+    }
 
     virtual QList<Task> reportIssues(const QString &projectPath,
                                      const QString &buildDir) const