feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rename QtSupport::BaseQtVersion to QtVersion

Browse Source 
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-01-21 16:06:36 +01:00
parent 6cec0e2033
commit 25f5771aa4
113 changed files with 636 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp
View File

@@ -207,7 +207,7 @@ void QmlProfilerDetailsRewriter::documentReady(QmlJS::Document::Ptr doc)
void QmlProfilerDetailsRewriter::populateFileFinder(const ProjectExplorer::Target *target)
{
QtSupport::BaseQtVersion::populateQmlFileFinder(&m_projectFinder, target);
QtSupport::QtVersion::populateQmlFileFinder(&m_projectFinder, target);
}
} // namespace Internal

2
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -205,7 +205,7 @@ static QUrl localServerUrl(RunControl *runControl)
{
QUrl serverUrl;
Kit *kit = runControl->kit();
const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
const QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
if (version) {
if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0))
serverUrl = Utils::urlFromLocalSocket();