Canonicalize some includes

Our canonical style is
    #include <utils/fileutils.h>
rather than
    #include "utils/fileutils.h"
Which makes sense, as such headers will never be found in the local
directory.

Change-Id: I4ca46e90d6c4d19d4b1f235f4c79caad864ef222
Reviewed-by: hjk <hjk@qt.io>

34 files changed, 63 insertions, 60 deletions

diff --git a/src/libs/languageserverprotocol/lsptypes.cpp b/src/libs/languageserverprotocol/lsptypes.cpp
index 286732d16b..b3e695a9c7 100644
--- a/src/libs/languageserverprotocol/lsptypes.cpp
+++ b/src/libs/languageserverprotocol/lsptypes.cpp
@@ -26,7 +26,7 @@
 #include "lsptypes.h"
 #include "lsputils.h"
 
-#include "utils/mimetypes/mimedatabase.h"
+#include <utils/mimetypes/mimedatabase.h>
 
 #include <QHash>
 #include <QTextBlock>
diff --git a/src/libs/modelinglib/qmt/infrastructure/qmtassert.h b/src/libs/modelinglib/qmt/infrastructure/qmtassert.h
index 3417671fcf..81d22c1afe 100644
--- a/src/libs/modelinglib/qmt/infrastructure/qmtassert.h
+++ b/src/libs/modelinglib/qmt/infrastructure/qmtassert.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "utils/qtcassert.h"
+#include <utils/qtcassert.h>
 
 #define QMT_CHECK(condition) QTC_CHECK(condition)
 #define QMT_ASSERT(condition, action) QTC_ASSERT(condition, action)
diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
index 5f70cb77da..9d1640ff6a 100644
--- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
+++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.cpp
@@ -32,7 +32,7 @@
 
 #include "qmt/infrastructure/qmtassert.h"
 #include "qmt/style/style.h"
-#include "utils/algorithm.h"
+#include <utils/algorithm.h>
 
 #include <QHash>
 #include <QPainter>
diff --git a/src/libs/qmldebug/qmlenginecontrolclient.cpp b/src/libs/qmldebug/qmlenginecontrolclient.cpp
index 2bc1d54302..cddcc13b0e 100644
--- a/src/libs/qmldebug/qmlenginecontrolclient.cpp
+++ b/src/libs/qmldebug/qmlenginecontrolclient.cpp
@@ -25,7 +25,7 @@
 
 #include "qmlenginecontrolclient.h"
 #include "qpacketprotocol.h"
-#include "utils/qtcassert.h"
+#include <utils/qtcassert.h>
 
 #include <functional>
 
diff --git a/src/plugins/android/adbcommandswidget.cpp b/src/plugins/android/adbcommandswidget.cpp
index 287652203b..282f4c7644 100644
--- a/src/plugins/android/adbcommandswidget.cpp
+++ b/src/plugins/android/adbcommandswidget.cpp
@@ -25,7 +25,7 @@
 #include "adbcommandswidget.h"
 #include "ui_adbcommandswidget.h"
 
-#include "utils/utilsicons.h"
+#include <utils/utilsicons.h>
 
 #include <QGroupBox>
 #include <QItemSelectionModel>
diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 77f4959015..73a0c961b9 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -26,11 +26,11 @@
 
 #include "androidtoolmanager.h"
 
-#include "coreplugin/icore.h"
-#include "utils/algorithm.h"
-#include "utils/qtcassert.h"
-#include "utils/runextensions.h"
-#include "utils/synchronousprocess.h"
+#include <coreplugin/icore.h>
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+#include <utils/runextensions.h>
+#include <utils/synchronousprocess.h>
 
 #include <QApplication>
 #include <QFileInfo>
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index 54d9837e2a..f911e908c6 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -28,11 +28,11 @@
 #include "androidmanager.h"
 #include "androidtoolmanager.h"
 
-#include "utils/algorithm.h"
-#include "utils/qtcassert.h"
-#include "utils/runextensions.h"
-#include "utils/synchronousprocess.h"
-#include "utils/qtcprocess.h"
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+#include <utils/runextensions.h>
+#include <utils/synchronousprocess.h>
+#include <utils/qtcprocess.h>
 
 #include <QFutureWatcher>
 #include <QLoggingCategory>
diff --git a/src/plugins/android/androidsdkmanager.h b/src/plugins/android/androidsdkmanager.h
index 4ef83e0a07..35b9dd96ad 100644
--- a/src/plugins/android/androidsdkmanager.h
+++ b/src/plugins/android/androidsdkmanager.h
@@ -24,9 +24,10 @@
 ****************************************************************************/
 #pragma once
 
-#include "utils/fileutils.h"
 #include "androidsdkpackage.h"
 
+#include <utils/fileutils.h>
+
 #include <QObject>
 #include <QFuture>
 
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp
index c2a37d0718..391e04500a 100644
--- a/src/plugins/android/androidsdkmanagerwidget.cpp
+++ b/src/plugins/android/androidsdkmanagerwidget.cpp
@@ -29,11 +29,11 @@
 #include "androidsdkmanager.h"
 #include "androidsdkmodel.h"
 
-#include "utils/runextensions.h"
-#include "utils/outputformatter.h"
-#include "utils/runextensions.h"
-#include "utils/qtcassert.h"
-#include "utils/utilsicons.h"
+#include <utils/runextensions.h>
+#include <utils/outputformatter.h>
+#include <utils/runextensions.h>
+#include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QDialogButtonBox>
 #include <QLabel>
diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index 1b3b1a5af3..b72810688b 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -26,9 +26,9 @@
 #include "androidmanager.h"
 #include "androidsdkmanager.h"
 
-#include "utils/algorithm.h"
-#include "utils/qtcassert.h"
-#include "utils/utilsicons.h"
+#include <utils/algorithm.h>
+#include <utils/qtcassert.h>
+#include <utils/utilsicons.h>
 
 #include <QIcon>
 
diff --git a/src/plugins/android/androidsdkpackage.cpp b/src/plugins/android/androidsdkpackage.cpp
index 64de3dcfce..127aa97a2e 100644
--- a/src/plugins/android/androidsdkpackage.cpp
+++ b/src/plugins/android/androidsdkpackage.cpp
@@ -24,7 +24,7 @@
 ****************************************************************************/
 #include "androidsdkpackage.h"
 
-#include "utils/algorithm.h"
+#include <utils/algorithm.h>
 
 namespace Android {
 
diff --git a/src/plugins/android/androidsdkpackage.h b/src/plugins/android/androidsdkpackage.h
index 09415bd19a..beca0472dd 100644
--- a/src/plugins/android/androidsdkpackage.h
+++ b/src/plugins/android/androidsdkpackage.h
@@ -22,7 +22,7 @@
 ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
-#include "utils/fileutils.h"
+#include <utils/fileutils.h>
 
 #include <QList>
 #include <QObject>
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp
index 0186444e99..b547145772 100644
--- a/src/plugins/android/androidtoolmanager.cpp
+++ b/src/plugins/android/androidtoolmanager.cpp
@@ -26,11 +26,11 @@
 
 #include "androidmanager.h"
 
-#include "utils/algorithm.h"
-#include "utils/environment.h"
-#include "utils/qtcassert.h"
-#include "utils/runextensions.h"
-#include "utils/synchronousprocess.h"
+#include <utils/algorithm.h>
+#include <utils/environment.h>
+#include <utils/qtcassert.h>
+#include <utils/runextensions.h>
+#include <utils/synchronousprocess.h>
 
 #include <QLoggingCategory>
 
diff --git a/src/plugins/android/androidtoolmanager.h b/src/plugins/android/androidtoolmanager.h
index 0e2fb5bc40..76cff1881e 100644
--- a/src/plugins/android/androidtoolmanager.h
+++ b/src/plugins/android/androidtoolmanager.h
@@ -24,9 +24,10 @@
 ****************************************************************************/
 #pragma once
 
-#include "utils/fileutils.h"
 #include "androidconfigurations.h"
 
+#include <utils/fileutils.h>
+
 #include <QStringList>
 
 #include <memory>
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp
index d42390ef8d..f1efb479a4 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.cpp
+++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp
@@ -27,7 +27,7 @@
 #include "gtestresult.h"
 #include "../testtreemodel.h"
 #include "../testtreeitem.h"
-#include "utils/hostosinfo.h"
+#include <utils/hostosinfo.h>
 
 #include <QDir>
 #include <QFileInfo>
diff --git a/src/plugins/cmakeprojectmanager/treescanner.h b/src/plugins/cmakeprojectmanager/treescanner.h
index c14e6ad384..bf9872f6df 100644
--- a/src/plugins/cmakeprojectmanager/treescanner.h
+++ b/src/plugins/cmakeprojectmanager/treescanner.h
@@ -28,7 +28,7 @@
 #include "projectexplorer/projectnodes.h"
 
 #include <utils/mimetypes/mimedatabase.h>
-#include "utils/fileutils.h"
+#include <utils/fileutils.h>
 
 #include <QObject>
 #include <QFuture>
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index 531d01ccdb..1cd13c42c2 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -25,8 +25,8 @@
 
 #pragma once
 
-#include "coreplugin/core_global.h"
-#include "coreplugin/icontext.h"
+#include "../core_global.h"
+#include "../icontext.h"
 
 #include <QObject>
 
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index 7d6dfb2862..2b692a206e 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -25,10 +25,10 @@
 
 #pragma once
 
-#include "coreplugin/core_global.h"
-#include "coreplugin/coreconstants.h"
-#include "coreplugin/icontext.h"
-#include <coreplugin/actionmanager/command.h>
+#include "../core_global.h"
+#include "../coreconstants.h"
+#include "../icontext.h"
+#include "command.h"
 
 #include <QObject>
 #include <QList>
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
index acc2a68edc..293e9c64d1 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "coreplugin/externaltool.h"
+#include "../externaltool.h"
 
 #include <QWidget>
 #include <QAbstractItemModel>
diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h
index 245c140f06..a3fae51ff6 100644
--- a/src/plugins/coreplugin/editormanager/editorview.h
+++ b/src/plugins/coreplugin/editormanager/editorview.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "coreplugin/id.h"
+#include "../id.h"
 
 #include <utils/dropsupport.h>
 
diff --git a/src/plugins/coreplugin/fileutils.h b/src/plugins/coreplugin/fileutils.h
index 26d05744b3..c7746251c1 100644
--- a/src/plugins/coreplugin/fileutils.h
+++ b/src/plugins/coreplugin/fileutils.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "coreplugin/core_global.h"
+#include "core_global.h"
 
 QT_BEGIN_NAMESPACE
 class QWidget;
diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h
index 1cd97d95cf..807f2f5166 100644
--- a/src/plugins/coreplugin/generatedfile.h
+++ b/src/plugins/coreplugin/generatedfile.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "coreplugin/id.h"
+#include "id.h"
 
 #include <QSharedDataPointer>
 #include <QList>
diff --git a/src/plugins/coreplugin/patchtool.h b/src/plugins/coreplugin/patchtool.h
index 9047bce7fb..674b23001f 100644
--- a/src/plugins/coreplugin/patchtool.h
+++ b/src/plugins/coreplugin/patchtool.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "coreplugin/core_global.h"
+#include "core_global.h"
 
 #include <QString>
 
diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index e45e749ee0..a3b43d1183 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -36,7 +36,7 @@
 #include "qmakeprojectmanager/qmakebuildinfo.h"
 #include "qmakeprojectmanager/qmakeprojectmanagerconstants.h"
 
-#include "utils/algorithm.h"
+#include <utils/algorithm.h>
 
 using namespace QmakeProjectManager;
 using namespace ProjectExplorer;
diff --git a/src/plugins/ios/iosbuildsettingswidget.h b/src/plugins/ios/iosbuildsettingswidget.h
index 2173affe6c..e8641fefcb 100644
--- a/src/plugins/ios/iosbuildsettingswidget.h
+++ b/src/plugins/ios/iosbuildsettingswidget.h
@@ -24,7 +24,7 @@
 ****************************************************************************/
 #pragma once
 
-#include "coreplugin/id.h"
+#include <coreplugin/id.h>
 #include "projectexplorer/namedwidget.h"
 
 #include <QWidget>
diff --git a/src/plugins/ios/iossimulatorfactory.cpp b/src/plugins/ios/iossimulatorfactory.cpp
index e90bd76570..163bfac1b4 100644
--- a/src/plugins/ios/iossimulatorfactory.cpp
+++ b/src/plugins/ios/iossimulatorfactory.cpp
@@ -28,7 +28,7 @@
 #include "iosconstants.h"
 #include "iossimulator.h"
 
-#include "utils/qtcassert.h"
+#include <utils/qtcassert.h>
 
 namespace Ios {
 namespace Internal {
diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 0312b168b5..59e0226190 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -33,8 +33,8 @@
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
-#include "utils/runextensions.h"
-#include "utils/synchronousprocess.h"
+#include <utils/runextensions.h>
+#include <utils/synchronousprocess.h>
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/plugins/ios/simulatorcontrol.cpp b/src/plugins/ios/simulatorcontrol.cpp
index 4273882db1..cdf2a3da6a 100644
--- a/src/plugins/ios/simulatorcontrol.cpp
+++ b/src/plugins/ios/simulatorcontrol.cpp
@@ -26,10 +26,10 @@
 #include "simulatorcontrol.h"
 #include "iosconfigurations.h"
 
-#include "utils/algorithm.h"
-#include "utils/runextensions.h"
-#include "utils/qtcassert.h"
-#include "utils/synchronousprocess.h"
+#include <utils/algorithm.h>
+#include <utils/runextensions.h>
+#include <utils/qtcassert.h>
+#include <utils/synchronousprocess.h>
 
 #ifdef Q_OS_MAC
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/src/plugins/ios/simulatorcontrol.h b/src/plugins/ios/simulatorcontrol.h
index 4b4bc305a6..c21469cd17 100644
--- a/src/plugins/ios/simulatorcontrol.h
+++ b/src/plugins/ios/simulatorcontrol.h
@@ -24,9 +24,10 @@
 ****************************************************************************/
 #pragma once
 
+#include <utils/fileutils.h>
+
 #include <QObject>
 #include <QFuture>
-#include "utils/fileutils.h"
 #include <QDebug>
 #include <memory>
 
diff --git a/src/plugins/modeleditor/editordiagramview.h b/src/plugins/modeleditor/editordiagramview.h
index 0a939ab7ff..df6d8a6a3b 100644
--- a/src/plugins/modeleditor/editordiagramview.h
+++ b/src/plugins/modeleditor/editordiagramview.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "qmt/diagram_widgets_ui/diagramview.h"
-#include "utils/dropsupport.h"
+#include <utils/dropsupport.h>
 
 namespace ModelEditor {
 namespace Internal {
diff --git a/src/plugins/modeleditor/extpropertiesmview.cpp b/src/plugins/modeleditor/extpropertiesmview.cpp
index a0c19b7141..f09cbf0588 100644
--- a/src/plugins/modeleditor/extpropertiesmview.cpp
+++ b/src/plugins/modeleditor/extpropertiesmview.cpp
@@ -29,7 +29,7 @@
 #include "qmt/project/project.h"
 #include "qmt/project_controller/projectcontroller.h"
 
-#include "utils/pathchooser.h"
+#include <utils/pathchooser.h>
 
 #include <QLabel>
 #include <QFileInfo>
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index 9d23f80fb1..cfa23b3219 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -26,7 +26,7 @@
 #include "remotelinuxenvironmentaspect.h"
 
 #include "remotelinuxenvironmentaspectwidget.h"
-#include "utils/algorithm.h"
+#include <utils/algorithm.h>
 
 namespace RemoteLinux {
 
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index b204b023e5..32595b0398 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "texteditor_global.h"
-#include "utils/filesearch.h"
+#include <utils/filesearch.h>
 
 #include <coreplugin/find/ifindfilter.h>
 #include <coreplugin/find/searchresultwindow.h>
diff --git a/src/plugins/texteditor/codeassist/documentcontentcompletion.cpp b/src/plugins/texteditor/codeassist/documentcontentcompletion.cpp
index 44572146f1..437afcbdb6 100644
--- a/src/plugins/texteditor/codeassist/documentcontentcompletion.cpp
+++ b/src/plugins/texteditor/codeassist/documentcontentcompletion.cpp
@@ -32,7 +32,7 @@
 #include "iassistprocessor.h"
 #include "../snippets/snippetassistcollector.h"
 
-#include "utils/runextensions.h"
+#include <utils/runextensions.h>
 
 #include <QElapsedTimer>
 #include <QRegularExpression>