diff options
| author | tjenssen <tim.jenssen@digia.com> | 2012-12-03 14:29:59 +0100 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2012-12-03 14:44:08 +0100 |
| commit | 0120690e3e9bb610e35c9568565f6a4530a48d2a (patch) | |
| tree | 57351f926848c6b4b411cff919b2c79dd5c5ab7d | |
| parent | f2870fa599329b9813f32653a55caa4a5154ce6f (diff) | |
QT_INSTALL_LIBEXECS need to be patched
- added the QT_INSTALL_LIBEXECS (qt_lbexpath) as one of the to be patched
values on qmake and other binaries
Change-Id: I62f70bb6a9df7ab457f050af8e1adff38e0dc200
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 28cdedbbc..7c47b2c9c 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -75,6 +75,10 @@ static QHash<QByteArray, QByteArray> generatePatchValueHash(const QByteArray &ne replaceHash.insert(QByteArray("qt_libspath=%1").replace("%1", oldValue), QByteArray("qt_libspath=%1/lib").replace("%1/", newQtPath + nativeSeperator)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_LIBEXECS")); + replaceHash.insert(QByteArray("qt_lbexpath=%1").replace("%1", oldValue), + QByteArray("qt_lbexpath=%1/lib").replace("%1/", newQtPath + nativeSeperator)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_BINS")); replaceHash.insert(QByteArray("qt_binspath=%1").replace("%1", oldValue), QByteArray("qt_binspath=%1/bin").replace("%1/", newQtPath + nativeSeperator)); |