Merge remote-tracking branch 'origin/13.0'

Change-Id: I4817ff528f92dcb2ffb00c92ca1039f1ae31c7f1

src/plugins/android/androidsettingswidget.cpp

@@ -257,7 +257,7 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
 
     jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first());
 
-    if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredJavaMajorVersion) {
+    if (jdkVersion.isNull() /* || jdkVersion.majorVersion() != requiredJavaMajorVersion */ ) {
         return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)")
                                    .arg(requiredJavaMajorVersion)
                                    .arg(stdOut)

src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

@@ -1354,12 +1354,10 @@ void CMakeBuildSystem::updateProjectData()
         return QtMajorVersion::None;
     };
 
-    QtMajorVersion qtVersion = kitInfo.projectPartQtVersion;
-    if (qtVersion == QtMajorVersion::None)
-        qtVersion = qtVersionFromCMake({{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}},
-                                        {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}},
-                                        {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}
-                                       });
+    QtMajorVersion qtVersion = qtVersionFromCMake(
+        {{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}},
+         {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}},
+         {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}});
 
     QString errorMessage;
     RawProjectParts rpps = m_reader.createRawProjectParts(errorMessage);
@@ -1368,7 +1366,7 @@ void CMakeBuildSystem::updateProjectData()
     qCDebug(cmakeBuildSystemLog) << "Raw project parts created." << errorMessage;
 
     for (RawProjectPart &rpp : rpps) {
-        rpp.setQtVersion(qtVersion); // TODO: Check if project actually uses Qt.
+        rpp.setQtVersion(qtVersion);
         const FilePath includeFileBaseDir = buildConfiguration()->buildDirectory();
         QStringList cxxFlags = rpp.flagsForCxx.commandLineFlags;
         QStringList cFlags = rpp.flagsForC.commandLineFlags;

src/plugins/python/pythonsettings.cpp

@@ -404,7 +404,6 @@ static const QStringList &plugins()
                                      "pydocstyle",
                                      "pyflakes",
                                      "pylint",
-                                     "rope_completion",
                                      "yapf"};
     return plugins;
 }
@@ -610,7 +609,6 @@ static QString defaultPylsConfiguration()
         plugins.insert("pydocstyle", disabled);
         plugins.insert("pyflakes", enabled);
         plugins.insert("pylint", disabled);
-        plugins.insert("rope_completion", enabled);
         plugins.insert("yapf", enabled);
         QJsonObject pylsp;
         pylsp.insert("plugins", plugins);