QtSupport: Rename qtkitinformation.{h,cpp} -> qtkitaspect.{h,cpp}

Change-Id: I12229e5e98b468101d32edd35be74bbda0921d89
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/android/androidbuildapkstep.cpp

@@ -29,7 +29,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/fancylineedit.h>

src/plugins/android/androidconfigurations.cpp

@@ -27,7 +27,7 @@
 #include <debugger/debuggerkitinformation.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/algorithm.h>

src/plugins/android/androiddebugsupport.cpp

@@ -17,7 +17,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>

src/plugins/android/androiddeployqtstep.cpp

@@ -30,7 +30,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/async.h>

src/plugins/android/androidmanager.cpp

@@ -28,7 +28,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/buildsystem.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/baseqtversion.h>
 

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -14,7 +14,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/ieditor.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/kitaspects.h>

src/plugins/android/androidpackageinstallationstep.cpp

@@ -19,7 +19,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/hostosinfo.h>
 #include <utils/process.h>

src/plugins/android/androidqmlpreviewworker.cpp

@@ -25,7 +25,7 @@
 #include <qmlprojectmanager/qmlprojectmanagerconstants.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/async.h>
 #include <utils/process.h>

src/plugins/android/androidqtversion.cpp

@@ -12,7 +12,7 @@
 #include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
 

src/plugins/android/androidrunconfiguration.cpp

@@ -13,7 +13,7 @@
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/detailswidget.h>
 #include <utils/process.h>

src/plugins/android/androidrunner.cpp

@@ -18,7 +18,7 @@
 #include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/runconfigurationaspects.h>
 #include <projectexplorer/target.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <utils/url.h>
 
 #include <QHostAddress>

src/plugins/android/androidrunnerworker.cpp

@@ -18,7 +18,7 @@
 #include <projectexplorer/target.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/async.h>
 #include <utils/fileutils.h>

src/plugins/android/createandroidmanifestwizard.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/infolabel.h>
 #include <utils/pathchooser.h>

src/plugins/android/javalanguageserver.cpp

@@ -14,7 +14,7 @@
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/target.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
 #include <utils/temporarydirectory.h>

src/plugins/autotest/autotestunittests.cpp

@@ -20,7 +20,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/environment.h>
 

src/plugins/autotest/loadprojectscenario.cpp

@@ -6,7 +6,7 @@
 #include <cppeditor/cpptoolstestcase.h>
 #include <cppeditor/projectinfo.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 

src/plugins/clangcodemodel/test/clangdtests.cpp

@@ -25,7 +25,7 @@
 #include <utils/environment.h>
 #include <utils/filepath.h>
 #include <utils/textutils.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QElapsedTimer>
 #include <QEventLoop>

src/plugins/clangtools/clangtoolsunittests.cpp

@@ -20,7 +20,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/environment.h>
 #include <utils/fileutils.h>

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -47,7 +47,7 @@
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtbuildaspects.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/categorysortfiltermodel.h>

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -38,7 +38,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljstools/qmljstoolsconstants.h>
 #include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>

src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

@@ -23,7 +23,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/commandline.h>

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -17,7 +17,7 @@
 #include <projectexplorer/projectnodes.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/taskhub.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 using namespace ProjectExplorer;
 using namespace Utils;

src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp

@@ -19,7 +19,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchainmanager.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/process.h>

src/plugins/debugger/debuggerruncontrol.cpp

@@ -49,7 +49,7 @@
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QTcpServer>
 #include <QTimer>

src/plugins/docker/dockerdevice.cpp

@@ -27,7 +27,7 @@
 #include <projectexplorer/toolchainmanager.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionfactory.h>
 #include <qtsupport/qtversionmanager.h>
 

src/plugins/docker/kitdetector.cpp

@@ -13,7 +13,7 @@
 #include <projectexplorer/toolchainmanager.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionfactory.h>
 #include <qtsupport/qtversionmanager.h>
 

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

@@ -12,7 +12,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectexplorertr.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/aspects.h>
 #include <utils/qtcassert.h>

src/plugins/genericprojectmanager/genericproject.cpp

@@ -33,7 +33,7 @@
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/filesystemwatcher.h>

src/plugins/insight/insightmodel.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/filepath.h>
 #include <utils/qtcassert.h>

src/plugins/ios/iosconfigurations.cpp

@@ -26,7 +26,7 @@
 #include <debugger/debuggerkitinformation.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtversionfactory.h>
 

src/plugins/ios/iosdsymbuildstep.cpp

@@ -19,7 +19,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtparser.h>
 
 #include <utils/process.h>

src/plugins/ios/iosqtversion.cpp

@@ -10,7 +10,7 @@
 #include <utils/hostosinfo.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
 

src/plugins/mcusupport/mcukitmanager.cpp

@@ -25,7 +25,7 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/algorithm.h>

src/plugins/mcusupport/mcusupportoptions.cpp

@@ -22,7 +22,7 @@
 #include <utils/algorithm.h>
 #include <utils/filepath.h>
 #include <utils/infobar.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <QMessageBox>

src/plugins/mesonprojectmanager/mesonbuildsystem.cpp

@@ -20,7 +20,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/macroexpander.h>
 #include <utils/qtcassert.h>

src/plugins/perfprofiler/perfdatareader.cpp

@@ -24,7 +24,7 @@
 
 #include <utils/environment.h>
 #include <utils/qtcassert.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QDateTime>
 #include <QDebug>

src/plugins/perfprofiler/perfprofilertool.cpp

@@ -29,7 +29,7 @@
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/fancymainwindow.h>

src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp

@@ -24,7 +24,7 @@
 #include <android/androidconstants.h>
 #include <ios/iosconstants.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QDir>
 #include <QFileInfo>

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -23,7 +23,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/process.h>
 #include <utils/qtcassert.h>

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/projectexplorertr.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/guard.h>

src/plugins/qbsprojectmanager/qbsprofilemanager.cpp

@@ -17,7 +17,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <qmljstools/qmljstoolsconstants.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
 

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -49,7 +49,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljstools/qmljsmodelmanager.h>
 #include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QCoreApplication>
 #include <QElapsedTimer>

src/plugins/qbsprojectmanager/qbsprojectimporter.cpp

@@ -16,7 +16,7 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/toolchain.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <utils/algorithm.h>
 #include <utils/filepath.h>
 #include <utils/hostosinfo.h>

src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp

@@ -9,7 +9,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 namespace QmakeProjectManager {

src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp

@@ -33,7 +33,7 @@
 #include <projectexplorer/toolchain.h>
 
 #include <qtsupport/qtbuildaspects.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/process.h>

src/plugins/qmakeprojectmanager/qmakekitinformation.cpp

@@ -10,7 +10,7 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/guard.h>

src/plugins/qmakeprojectmanager/qmakenodes.cpp

@@ -11,7 +11,7 @@
 #include <projectexplorer/target.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <resourceeditor/resourcenode.h>
 

src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp

@@ -11,7 +11,7 @@
 #include <projectexplorer/target.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <resourceeditor/resourcenode.h>
 

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -45,7 +45,7 @@
 
 #include <qtsupport/profilereader.h>
 #include <qtsupport/qtcppkitinfo.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/algorithm.h>

src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp

@@ -17,7 +17,7 @@
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionfactory.h>
 #include <qtsupport/qtversionmanager.h>

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -27,7 +27,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/qtsupportconstants.h>
 

src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp

@@ -19,7 +19,7 @@
 #include <projectexplorer/targetsetuppage.h>
 #include <projectexplorer/task.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <utils/algorithm.h>

src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

@@ -51,7 +51,7 @@
 #include "projectexplorer/target.h"
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>

src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp

@@ -25,7 +25,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #endif
 
 #include <QVector3D>

src/plugins/qmldesigner/components/edit3d/edit3dview.cpp

@@ -31,7 +31,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/kit.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>

src/plugins/qmldesigner/components/integration/designdocument.cpp

@@ -23,7 +23,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/kit.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <qtsupport/qtversionmanager.h>
 #include <coreplugin/icore.h>

src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

@@ -6,7 +6,7 @@
 
 #include <projectexplorer/target.h>
 #include <utils/smallstring.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QTemporaryFile>
 

src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

@@ -51,7 +51,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QCoreApplication>

src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp

@@ -81,7 +81,7 @@
 #include <utils/theme/theme.h>
 #include <utils/threadutils.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <QDirIterator>
 #include <QFileSystemWatcher>

src/plugins/qmldesigner/generateresource.cpp

@@ -19,7 +19,7 @@
 #include <qmlprojectmanager/qmlprojectmanagerconstants.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/fileutils.h>
 #include <utils/process.h>

src/plugins/qmldesigner/puppetenvironmentbuilder.cpp

@@ -13,7 +13,7 @@
 #include <utils/hostosinfo.h>
 #include <qmlprojectmanager/qmlmultilanguageaspect.h>
 #include <qmlprojectmanager/qmlproject.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversions.h>
 
 #include <QLibraryInfo>

src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp

@@ -13,7 +13,7 @@
 #include <puppetenvironmentbuilder.h>
 #include <qmlpuppetpaths.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qmlprojectmanager/buildsystem/qmlbuildsystem.h>
 
 #include <coreplugin/icore.h>

src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

@@ -20,7 +20,7 @@
 #include <sqlitedatabase.h>
 #include <qmlprojectmanager/qmlproject.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <asynchronousexplicitimagecache.h>
 #include <asynchronousimagecache.h>

src/plugins/qmldesignerbase/utils/qmlpuppetpaths.cpp

@@ -9,7 +9,7 @@
 #include <projectexplorer/kit.h>
 #include <projectexplorer/target.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 namespace QmlDesigner {
 namespace QmlPuppetPaths {

src/plugins/qmljstools/qmljsbundleprovider.cpp

@@ -6,7 +6,7 @@
 #include <coreplugin/icore.h>
 #include <qmljs/qmljsbundle.h>
 #include <qmljs/qmljsconstants.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QDir>

src/plugins/qmljstools/qmljsmodelmanager.cpp

@@ -28,7 +28,7 @@
 #include <qmljs/qmljsbind.h>
 #include <qmljs/qmljsfindexportedcpptypes.h>
 #include <qmljs/qmljsplugindumper.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <texteditor/textdocument.h>
 

src/plugins/qmlpreview/qmlpreviewplugin.cpp

@@ -37,7 +37,7 @@
 
 #include <qmlprojectmanager/qmlmultilanguageaspect.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/baseqtversion.h>
 

src/plugins/qmlpreview/qmlpreviewruncontrol.cpp

@@ -14,7 +14,7 @@
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/filepath.h>
 #include <utils/port.h>

src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp

@@ -15,7 +15,7 @@
 #include <projectexplorer/target.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <qmldebug/qmldebugcommandlinearguments.h>

src/plugins/qmlprofiler/qmlprofilertool.cpp

@@ -40,7 +40,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <texteditor/texteditor.h>
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -4,7 +4,7 @@
 #include "qmlproject.h"
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <QTimer>

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -27,7 +27,7 @@
 #include <qmldesignerbase/qmldesignerbaseplugin.h>
 #include <qmldesignerbase/utils/qmlpuppetpaths.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtsupportconstants.h>
 
 #include <utils/algorithm.h>

src/plugins/qnx/qnxdebugsupport.cpp

@@ -28,7 +28,7 @@
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/fileutils.h>
 #include <utils/pathchooser.h>

src/plugins/qnx/qnxsettingspage.cpp

@@ -24,7 +24,7 @@
 
 #include <qtsupport/baseqtversion.h>
 #include <qtsupport/qtversionmanager.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
 

src/plugins/qtsupport/CMakeLists.txt

@@ -17,7 +17,7 @@ add_qtc_plugin(QtSupport
     qtbuildaspects.cpp qtbuildaspects.h
     qtconfigwidget.cpp qtconfigwidget.h
     qtcppkitinfo.cpp qtcppkitinfo.h
-    qtkitinformation.cpp qtkitinformation.h
+    qtkitaspect.cpp qtkitaspect.h
     qtoptionspage.cpp qtoptionspage.h
     qtoutputformatter.cpp qtoutputformatter.h
     qtparser.cpp qtparser.h

src/plugins/qtsupport/baseqtversion.cpp

@@ -5,7 +5,7 @@
 
 #include "profilereader.h"
 #include "qtconfigwidget.h"
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 #include "qtsupportconstants.h"
 #include "qtsupporttr.h"
 #include "qtversionfactory.h"

src/plugins/qtsupport/exampleslistmodel.cpp

@@ -17,7 +17,7 @@
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <qtsupport/qtversionmanager.h>
 
 #include <utils/algorithm.h>

src/plugins/qtsupport/externaleditors.cpp

@@ -11,7 +11,7 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <designer/designerconstants.h>
 

src/plugins/qtsupport/qscxmlcgenerator.cpp

@@ -4,7 +4,7 @@
 #include "qscxmlcgenerator.h"
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <projectexplorer/target.h>
 
 #include <utils/qtcassert.h>

src/plugins/qtsupport/qtcppkitinfo.cpp

@@ -4,7 +4,7 @@
 #include "qtcppkitinfo.h"
 
 #include "baseqtversion.h"
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 
 namespace QtSupport {
 

src/plugins/qtsupport/qtkitaspect.cpp

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 
 #include "qtparser.h"
 #include "qtsupportconstants.h"

src/plugins/qtsupport/qtoutputformatter.cpp

@@ -3,7 +3,7 @@
 
 #include "qtoutputformatter.h"
 
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 #include "qtsupportconstants.h"
 #include "qttestparser.h"
 

src/plugins/qtsupport/qtprojectimporter.cpp

@@ -3,7 +3,7 @@
 
 #include "qtprojectimporter.h"
 
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 #include "qtversionfactory.h"
 #include "qtversionmanager.h"
 

src/plugins/qtsupport/qtsupport.qbs

@@ -82,8 +82,8 @@ Project {
             "profilereader.h",
             "qscxmlcgenerator.cpp",
             "qscxmlcgenerator.h",
-            "qtkitinformation.cpp",
+            "qtkitaspect.cpp",
-            "qtkitinformation.h",
+            "qtkitaspect.h",
             "qtoptionspage.cpp",
             "qtoptionspage.h",
             "qtoutputformatter.cpp",

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -9,7 +9,7 @@
 #include "gettingstartedwelcomepage.h"
 #include "profilereader.h"
 #include "qscxmlcgenerator.h"
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 #include "qtoptionspage.h"
 #include "qtoutputformatter.h"
 #include "qtsupporttr.h"

src/plugins/qtsupport/uicgenerator.cpp

@@ -4,7 +4,7 @@
 #include "uicgenerator.h"
 
 #include "baseqtversion.h"
-#include "qtkitinformation.h"
+#include "qtkitaspect.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/kitmanager.h>

src/plugins/scxmleditor/scxmleditordocument.cpp

@@ -7,7 +7,7 @@
 
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmanager.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
 

src/plugins/studiowelcome/studiowelcomeplugin.cpp

@@ -28,7 +28,7 @@
 #include <qmlprojectmanager/qmlproject.h>
 
 #include <qtsupport/baseqtversion.h>
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <qmldesigner/components/componentcore/theme.h>
 #include <qmldesigner/dynamiclicensecheck.h>

src/plugins/webassembly/webassemblytoolchain.cpp

@@ -14,7 +14,7 @@
 #include <projectexplorer/projectmacro.h>
 #include <projectexplorer/toolchainmanager.h>
 
-#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtkitaspect.h>
 
 #include <utils/algorithm.h>
 #include <utils/environment.h>