diff options
| author | Andreas Holzammer <andreas.holzammer.qnx@kdab.com> | 2012-04-24 16:17:43 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-04-25 12:40:13 +0200 |
| commit | c6821e8dc0b1c4724f158d4714b7b25e60bd6638 (patch) | |
| tree | 8fe99f866b858bd21d44cd41ed4199d13ba08996 /src/libs/installer/qtpatchoperation.cpp | |
| parent | 9358fb8540feacf9b57d23e8341d6eb354267e99 (diff) | |
Fix patching of qmake for Qt5
Change-Id: I0a039905c2b37105974270414478d6909325d2ad
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/installer/qtpatchoperation.cpp')
| -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; } |