BaseQtVersion: remove qmakeProperty(...) getter

Qt 6 will not use qmake to identify a Qt version, so this can not
be part of the public interface of BaseQtVersion anymore.

Provide getters for the information actually read via qmakeProperty(...).

Use the getters whenever possible.

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

3 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 54a0c5c223..49eb59ac9a 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -76,15 +76,15 @@ static QStringList searchPaths(Kit *kit)
     if (!qtVersion)
         return {};
 
-    const QDir pluginDir(qtVersion->qmakeProperty("QT_INSTALL_PLUGINS"));
+    const QDir pluginDir(qtVersion->pluginPath().toString());
     const QStringList pluginSubDirs = pluginDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
     QStringList searchPaths;
 
     for (const QString &dir : pluginSubDirs)
-        searchPaths << qtVersion->qmakeProperty("QT_INSTALL_PLUGINS") + '/' + dir;
+        searchPaths << qtVersion->pluginPath().toString() + '/' + dir;
 
-    searchPaths << qtVersion->qmakeProperty("QT_INSTALL_LIBS");
+    searchPaths << qtVersion->libraryPath().toString();
     searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/lib").toString();
     searchPaths << qtVersion->qnxTarget().pathAppended(qtVersion->cpuDir() + "/usr/lib").toString();
 
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index aec85826a2..4653d8bad0 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -234,16 +234,16 @@ QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles()
     QTC_ASSERT(qtVersion, return result);
 
     if (Utils::HostOsInfo::isWindowsHost()) {
-        result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS"),
-                                  QString(), QStringList() << QLatin1String("*.so.?")));
-        result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS")
-                                  + QLatin1String("/fonts")));
+        result.append(gatherFiles(qtVersion->libraryPath().toString(),
+                                  QString(),
+                                  QStringList() << QLatin1String("*.so.?")));
+        result.append(gatherFiles(qtVersion->libraryPath().toString() + QLatin1String("/fonts")));
     } else {
-        result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS")));
+        result.append(gatherFiles(qtVersion->libraryPath().toString()));
     }
 
-    result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_PLUGINS")));
-    result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_IMPORTS")));
+    result.append(gatherFiles(qtVersion->pluginPath().toString()));
+    result.append(gatherFiles(qtVersion->importsPath().toString()));
     result.append(gatherFiles(qtVersion->qmlPath().toString()));
 
     return result;
diff --git a/src/plugins/qnx/qnxqtversion.cpp b/src/plugins/qnx/qnxqtversion.cpp
index b096f16a80..3c704bb421 100644
--- a/src/plugins/qnx/qnxqtversion.cpp
+++ b/src/plugins/qnx/qnxqtversion.cpp
@@ -130,7 +130,7 @@ void QnxQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Enviro
     updateEnvironment();
     env.modify(m_qnxEnv);
 
-    env.prependOrSetLibrarySearchPath(qmakeProperty("QT_INSTALL_LIBS", PropertyVariantDev));
+    env.prependOrSetLibrarySearchPath(libraryPath().toString());
 }
 
 Utils::Environment QnxQtVersion::qmakeRunEnvironment() const