diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-24 15:48:38 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-25 10:40:39 +0200 |
| commit | 93d171761e07daec7468d9097d407a05e40ede18 (patch) | |
| tree | dd0ce0cfaa1db993aa87730754d85709c25c845e /src/libs/installer | |
| parent | c8a2fcc08a98b1d2f81efb51c0c47087c96e696a (diff) | |
describe why we shouldn't patch QT_INSTALL_CONFIGURATION
Change-Id: I30463b8aa612901c63f8087d6363df727cd35d7f
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer')
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 9699219ec..7920089f1 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -111,7 +111,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 must not be patched. Commenting out to fix QTSDK-429 + // This must not be patched! + // On desktop there should be a correct default path (for example "/etc/xdg"), + // but on some other targets you need to use "-sysconfdir </your/default/config/path" + // while building Qt to get a correct QT_INSTALL_CONFIGURATION value // oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_CONFIGURATION")); // replaceMap.insert( QByteArray("qt_stngpath=%1").replace("%1", oldValue), // QByteArray("qt_stngpath=%1").replace("%1", newQtPath)); |