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

Replace QtSupport::QtVersionNumber with QVersionNumber

Browse Source 
Task-number: QTCREATORBUG-27786
Change-Id: I71a44709c264829f629c9dfce702076eda297a77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2022-07-04 18:36:40 +02:00
parent 1e8089d5b7
commit a917770053
32 changed files with 107 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -232,7 +232,7 @@ CreateAndroidManifestWizard::CreateAndroidManifestWizard(BuildSystem *buildSyste
const QList<BuildTargetInfo> buildTargets = buildSystem->applicationTargets();
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(buildSystem->kit());
m_copyGradle = version && version->qtVersion() >= QtSupport::QtVersionNumber(5, 4, 0);
m_copyGradle = version && version->qtVersion() >= QVersionNumber(5, 4, 0);
if (buildTargets.isEmpty()) {
// oh uhm can't create anything
@@ -281,7 +281,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
if (!version)
return;
if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
if (version->qtVersion() < QVersionNumber(5, 4, 0)) {
FileUtils::copyRecursively(version->prefix() / "src/android/java/AndroidManifest.xml",
m_directory / "AndroidManifest.xml",
nullptr,