diff options
| author | kh1 <karsten.heimrich@digia.com> | 2013-02-05 12:16:37 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-02-07 13:58:48 +0100 |
| commit | e8fa991b53f00f4ae5822ea879b64505ceca5b4c (patch) | |
| tree | 490bac14d947e51b1332fe37f683a3c5322caacc /src/libs/installer | |
| parent | 353272c4bb27f538c5a14a8f940f9cf00e9e516c (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
(cherry-picked from commit 0120690e3e9bb610e35c9568565f6a4530a48d2a)
Change-Id: I747a1842c676244276fc88f4e9cef46b017141ad
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/installer')
| -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 41cb313ef..76d7c8f54 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -83,6 +83,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)); |