diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2012-11-26 09:18:07 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2012-11-26 09:02:08 +0100 |
| commit | afa15f21cd25e722da9349ff0eba72b8ab1fe9b1 (patch) | |
| tree | 5a9996e59033cf970ffd3c167792ef524023805c | |
| parent | dc28650995695d844a0667d247fbcebfbb49595e (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.
Change-Id: I2467db71c62c8c44c054d0a23114542b6814ef02
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>
| -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 0ea72c48a..28cdedbbc 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -59,6 +59,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)); @@ -83,6 +87,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)); |