diff options
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 348d52e48..e1b4dc993 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -106,6 +106,22 @@ static QMap<QByteArray, QByteArray> generatePatchValueMap(const QByteArray &newQ replaceMap.insert( QByteArray("qt_demopath=%1").replace("%1", oldValue), QByteArray("qt_demopath=%1/demos").replace("%1/", newQtPath + nativeSeperator)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_TESTS")); + replaceMap.insert(QByteArray("qt_tstspath=%1").replace("%1", oldValue), + QByteArray("qt_tstspath=%1/tests").replace("%1/", newQtPath + nativeSeperator)); + + oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_PREFIX")); + replaceMap.insert(QByteArray("qt_hpfxpath=%1").replace("%1", oldValue), + QByteArray("qt_hpfxpath=%1/").replace("%1/", newQtPath)); + + oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_BINS")); + replaceMap.insert( QByteArray("qt_hbinpath=%1").replace("%1", oldValue), + QByteArray("qt_hbinpath=%1/bin").replace("%1/", newQtPath + nativeSeperator)); + + oldValue = qmakeValueHash.value(QLatin1String("QT_HOST_DATA")); + replaceMap.insert(QByteArray("qt_hdatpath=%1").replace("%1", oldValue), + QByteArray("qt_hdatpath=%1/").replace("%1/", newQtPath)); + return replaceMap; } |