diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-23 17:40:16 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-24 14:01:06 +0000 |
| commit | 8288ca1251fd49b10457b8f97e02e26f22c6ad31 (patch) | |
| tree | cd02f81ae2774c5d8db59cfe924722150599f2b4 /src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp | |
| parent | dea722a20cb66910b264d03a670ece7b3eb80fc9 (diff) | |
make more use of BaseQtVersion::qmakeProperty()
... instead of peeking into versionInfo().
in fact, make versionInfo() private, to avoid subsequent deterioration
as happened before (after 5e596e89d).
some other functions that use it in its interface also become private.
this fixes several breakages related to working with non-installed
prefix builds of qt.
Change-Id: Ib67de79323c9e38f3de48a09854b155de9eef5b2
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp')
| -rw-r--r-- | src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index 7d70354c83..65dbfc6a9d 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -234,18 +234,17 @@ QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles() QTC_ASSERT(qtVersion, return result); if (Utils::HostOsInfo::isWindowsHost()) { - result.append(gatherFiles(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_LIBS")), - QString(), QStringList() << QLatin1String("*.so.?"))); - result.append(gatherFiles(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_LIBS")) - + QLatin1String("/fonts"))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS"), + QString(), QStringList() << QLatin1String("*.so.?"))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS") + + QLatin1String("/fonts"))); } else { - result.append(gatherFiles( - qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_LIBS")))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_LIBS"))); } - result.append(gatherFiles(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_PLUGINS")))); - result.append(gatherFiles(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_IMPORTS")))); - result.append(gatherFiles(qtVersion->versionInfo().value(QLatin1String("QT_INSTALL_QML")))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_PLUGINS"))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_IMPORTS"))); + result.append(gatherFiles(qtVersion->qmakeProperty("QT_INSTALL_QML"))); return result; } |