diff options
| author | tjenssen <tim.jenssen@digia.com> | 2013-01-11 15:52:05 +0100 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2013-01-11 16:04:34 +0100 |
| commit | 594505538f875cf489f895e86f4d5c531f25ac9e (patch) | |
| tree | 60b76bcaef8b0fbe34f4f816e04cb3d38769d878 | |
| parent | ecb9a04b912bc0f02485d97578718f730a227fbf (diff) | |
Patch QT_INSTALL_CONFIGURATION in qmake executable
For 5.0.1 the QT_INSTALL_CONFIGURATION needs to be patched
(qt_stngpath).
Task-number: QTIFW-200
Change-Id: I95ab9e9eb66f13227e589f68cde6408f0d45b5bd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index f471324b3..567ad12f3 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -103,10 +103,11 @@ static QHash<QByteArray, QByteArray> generatePatchValueHash(const QByteArray &ne replaceHash.insert( QByteArray("qt_trnspath=%1").replace("%1", oldValue), QByteArray("qt_trnspath=%1/translations").replace("%1/", newQtPath + nativeSeperator)); - // This must not be patched. Commenting out to fix QTSDK-429 - // oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_CONFIGURATION")); - // replaceMap.insert( QByteArray("qt_stngpath=%1").replace("%1", oldValue), - // QByteArray("qt_stngpath=%1").replace("%1", newQtPath)); + // this shouldn't be patched on a Qt4 in some cases (see QTSDK-429), + // since Qt 5.0.1 it is inside the Qt directory - so it needs to be patched aswell + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_CONFIGURATION")); + replaceHash.insert( QByteArray("qt_stngpath=%1").replace("%1", oldValue), + QByteArray("qt_stngpath=%1/").replace("%1/", newQtPath)); //examples and demoes can patched outside separately, //but for cosmetic reasons - if the qt version gets no examples later. |