Coco: Fix build for qbs and older Qt

Amends 090b540487.

Change-Id: Idea8c873da56dfabcbcc97fb0853a5ff6de0dea4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/coco/coco.qbs

@@ -25,7 +25,6 @@ QtcPlugin {
         "cocobuild/cococmakesettings.h",
         "cocobuild/cocoprojectwidget.cpp",
         "cocobuild/cocoprojectwidget.h",
-        "cocobuild/cocoprojectwidget.ui",
         "cocobuild/cocoqmakesettings.cpp",
         "cocobuild/cocoqmakesettings.h",
         "cocobuild/modificationfile.cpp",
@@ -55,7 +54,6 @@ QtcPlugin {
         "settings/globalsettings.h",
         "settings/globalsettingspage.cpp",
         "settings/globalsettingspage.h",
-        "settings/globalsettingspage.ui",
     ]
 }
 

src/plugins/coco/cocobuild/buildsettings.cpp

@@ -8,6 +8,7 @@
 #include "cocoqmakesettings.h"
 #include "modificationfile.h"
 
+#include <projectexplorer/buildsystem.h>
 #include <projectexplorer/target.h>
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>

src/plugins/coco/cocobuild/cmakemodificationfile.cpp

@@ -3,7 +3,7 @@
 
 #include "cmakemodificationfile.h"
 
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>

src/plugins/coco/cocobuild/cocobuildstep.cpp

@@ -3,13 +3,12 @@
 
 #include "cocobuildstep.h"
 
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
-#include "cocotr.h"
+#include "../cocotr.h"
+#include "../settings/cocoinstallation.h"
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <settings/cocoinstallation.h>
-#include <settings/globalsettingspage.h>
 #include <solutions/tasking/tasktree.h>
 #include <utils/layoutbuilder.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>

src/plugins/coco/cocobuild/cococmakesettings.cpp

@@ -3,9 +3,9 @@
 
 #include "cococmakesettings.h"
 
-#include "cocobuild/cocoprojectwidget.h"
+#include "../cocotr.h"
-#include "cocotr.h"
+#include "../common.h"
-#include "common.h"
+#include "cocoprojectwidget.h"
 
 #include <cmakeprojectmanager/cmakebuildconfiguration.h>
 #include <cmakeprojectmanager/cmakebuildsystem.h>

src/plugins/coco/cocobuild/cococmakesettings.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "cocobuild/buildsettings.h"
+#include "buildsettings.h"
-#include "cocobuild/cmakemodificationfile.h"
+#include "cmakemodificationfile.h"
 
 #include <QObject>
 #include <QStringList>

src/plugins/coco/cocobuild/cocoprojectwidget.cpp

@@ -3,11 +3,11 @@
 
 #include "cocoprojectwidget.h"
 
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
+#include "../common.h"
+#include "../settings/globalsettingspage.h"
 #include "buildsettings.h"
-#include "cocopluginconstants.h"
-#include "cocotr.h"
-#include "common.h"
-#include "settings/globalsettingspage.h"
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/buildsystem.h>

src/plugins/coco/cocobuild/cocoprojectwidget.h

@@ -3,9 +3,10 @@
 
 #pragma once
 
+#include "../settings/cocoinstallation.h"
 #include "buildsettings.h"
-#include "projectexplorer/buildconfiguration.h"
+
-#include "settings/cocoinstallation.h"
+#include <projectexplorer/buildconfiguration.h>
 #include <utils/aspects.h>
 #include <utils/layoutbuilder.h>
 

src/plugins/coco/cocobuild/cocoqmakesettings.cpp

@@ -3,10 +3,10 @@
 
 #include "cocoqmakesettings.h"
 
-#include "cocobuild/cocoprojectwidget.h"
+#include "../cocobuild/cocoprojectwidget.h"
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
-#include "cocotr.h"
+#include "../cocotr.h"
-#include "common.h"
+#include "../common.h"
 
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/project.h>

src/plugins/coco/cocobuild/cocoqmakesettings.h

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "../settings/cocoinstallation.h"
 #include "buildsettings.h"
 #include "qmakefeaturefile.h"
-#include "settings/cocoinstallation.h"
 
 #include <utils/commandline.h>
 #include <utils/environment.h>

src/plugins/coco/cocobuild/qmakefeaturefile.cpp

@@ -3,7 +3,7 @@
 
 #include "qmakefeaturefile.h"
 
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
 
 #include <QFile>
 #include <QRegularExpression>
@@ -14,12 +14,6 @@ namespace Coco::Internal {
 static const char assignment[] = "COVERAGE_OPTIONS = \\\n";
 static const char tweaksLine[] = "# User-supplied settings follow here:\n";
 
-static void cutTail(QStringList &list)
-{
-    while (!list.isEmpty() && list.last().trimmed().isEmpty())
-        list.removeLast();
-}
-
 QMakeFeatureFile::QMakeFeatureFile() {}
 
 QString QMakeFeatureFile::fileName() const

src/plugins/coco/settings/cocoinstallation.cpp

@@ -3,8 +3,8 @@
 
 #include "cocoinstallation.h"
 
-#include "cocotr.h"
+#include "../cocotr.h"
-#include "common.h"
+#include "../common.h"
 #include "globalsettings.h"
 
 #include <utils/fileutils.h>

src/plugins/coco/settings/cocoprojectsettingswidget.cpp

@@ -3,8 +3,8 @@
 
 #include "cocoprojectsettingswidget.h"
 
-#include "cocobuild/cocoprojectwidget.h"
+#include "../cocobuild/cocoprojectwidget.h"
-#include "cocopluginconstants.h"
+#include "../cocopluginconstants.h"
 
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
 #include <projectexplorer/buildconfiguration.h>

src/plugins/coco/settings/globalsettings.cpp

@@ -3,8 +3,8 @@
 
 #include "globalsettings.h"
 
+#include "../cocopluginconstants.h"
 #include "cocoinstallation.h"
-#include "cocopluginconstants.h"
 
 #include <coreplugin/icore.h>
 #include <utils/filepath.h>

src/plugins/coco/settings/globalsettingspage.cpp

@@ -3,9 +3,9 @@
 
 #include "globalsettingspage.h"
 
+#include "../cocopluginconstants.h"
+#include "../cocotr.h"
 #include "cocoinstallation.h"
-#include "cocopluginconstants.h"
-#include "cocotr.h"
 #include "globalsettings.h"
 
 #include <utils/fancylineedit.h>