diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-09-30 14:34:31 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-01 11:46:43 +0000 |
| commit | b489bfd6155a150c337085ad4ac040973391ac8e (patch) | |
| tree | 94a1c079d01c6aaa087c16316ec45543d4bc53d6 /src/plugins/qnx/qnxdebugsupport.cpp | |
| parent | fc2e22dad247445ed4134afbbaff7d9960fd18e2 (diff) | |
| download | qt-creator-b489bfd6155a150c337085ad4ac040973391ac8e.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qnx/qnxdebugsupport.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxdebugsupport.cpp | 6 |
1 files changed, 3 insertions, 3 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(); |