diff options
| author | kh1 <karsten.heimrich@digia.com> | 2013-02-05 12:25:04 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-02-07 13:57:54 +0100 |
| commit | 84e4eb6746e9e2596d8e45201308d2251c07e4f0 (patch) | |
| tree | c64a2e7a59bf1ab0c6731ac8ffe102946ac8400a /src | |
| parent | 886fe99c6a5aa97f09cd2bbe2fe19d752cb6cf79 (diff) | |
Patch QT_INSTALL_ARCHDATA and QT_INSTALL_QML in qmake
QT_INSTALL_ARCHDATA and QT_INSTALL_QML added into qmake. Patch these as
well.
(cherry-picked from commit afa15f21cd25e722da9349ff0eba72b8ab1fe9b1)
Change-Id: Id2fbde58d70c7525e51be22a7370f1fbcbe6cf59
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 5084aac93..41cb313ef 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -67,6 +67,10 @@ static QHash<QByteArray, QByteArray> generatePatchValueHash(const QByteArray &ne replaceHash.insert(QByteArray("qt_prfxpath=%1").replace("%1", oldValue), QByteArray("qt_prfxpath=%1/").replace("%1/", newQtPath)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_ARCHDATA")); + replaceHash.insert(QByteArray("qt_adatpath=%1").replace("%1", oldValue), + QByteArray("qt_adatpath=%1/").replace("%1/", newQtPath)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DOCS")); replaceHash.insert(QByteArray("qt_docspath=%1").replace("%1", oldValue), QByteArray("qt_docspath=%1/doc").replace("%1/", newQtPath + nativeSeperator)); @@ -91,6 +95,10 @@ static QHash<QByteArray, QByteArray> generatePatchValueHash(const QByteArray &ne replaceHash.insert(QByteArray("qt_impspath=%1").replace("%1", oldValue), QByteArray("qt_impspath=%1/imports").replace("%1/", newQtPath + nativeSeperator)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_QML")); + replaceHash.insert(QByteArray("qt_qml2path=%1").replace("%1", oldValue), + QByteArray("qt_qml2path=%1/qml").replace("%1/", newQtPath + nativeSeperator)); + oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_DATA")); replaceHash.insert( QByteArray("qt_datapath=%1").replace("%1", oldValue), QByteArray("qt_datapath=%1/").replace("%1/", newQtPath + nativeSeperator)); |