From 84e4eb6746e9e2596d8e45201308d2251c07e4f0 Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 5 Feb 2013 12:25:04 +0100 Subject: Patch QT_INSTALL_ARCHDATA and QT_INSTALL_QML in qmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Reviewed-by: Maurice Kalinowski Reviewed-by: Tim Jenssen Reviewed-by: Iikka Eklund --- src/libs/installer/qtpatchoperation.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/libs/installer/qtpatchoperation.cpp') 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 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 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)); -- cgit v1.2.3