diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2013-01-25 11:11:18 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2013-01-25 12:42:32 +0100 |
| commit | 6a5da8292b2c64a3ad53d6c572aee1944f054533 (patch) | |
| tree | 055aa162d11822a1c3667badab1999e1891661e5 | |
| parent | 625ea83fa6cf7fbfa102302ff6fd47a15dec028c (diff) | |
Revert "Patch QT_INSTALL_CONFIGURATION in qmake executable"
This reverts commit 594505538f875cf489f895e86f4d5c531f25ac9e.
QT_INSTALL_CONFIGURATION should not be patched. Qt5 should be
configured with -sysconfdir to get this right.
Change-Id: Ib40bb3b2c25fca45ae6a92ac5fad2efd2dbdfc93
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 567ad12f3..f471324b3 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -103,11 +103,10 @@ 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 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)); + // 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)); //examples and demoes can patched outside separately, //but for cosmetic reasons - if the qt version gets no examples later. |