diff options
| author | Iikka Eklund <iikka.eklund@digia.com> | 2013-08-09 15:52:13 +0300 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-08-26 14:05:34 +0200 |
| commit | fe992358dbd449fbdc303af38907e62098daad44 (patch) | |
| tree | cc42646b696237a035a36a08c068c8a64250b523 | |
| parent | f84cbe8da86dac7daf75cacbb3b68127bdff761a (diff) | |
Update files-to-patch-* for 5.2
"host-bin/" added for b2qt and files-to-patch-macx-emb-arm
added for iOS.
Change-Id: I982648dbd9983eb8617a066c65c171742d59f2b0
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
4 files changed, 16 insertions, 0 deletions
diff --git a/src/libs/installer/resources/files-to-patch-linux-emb-arm b/src/libs/installer/resources/files-to-patch-linux-emb-arm index c01fe17a1..f6a4b59b7 100644 --- a/src/libs/installer/resources/files-to-patch-linux-emb-arm +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -1,6 +1,9 @@ bin/qmake bin/lrelease bin/qdoc +host-bin/qmake +host-bin/lrelease +host-bin/qdoc %% *.la *.prl diff --git a/src/libs/installer/resources/files-to-patch-macx-emb-arm b/src/libs/installer/resources/files-to-patch-macx-emb-arm new file mode 100644 index 000000000..c01fe17a1 --- /dev/null +++ b/src/libs/installer/resources/files-to-patch-macx-emb-arm @@ -0,0 +1,9 @@ +bin/qmake +bin/lrelease +bin/qdoc +%% +*.la +*.prl +*.pc + + diff --git a/src/libs/installer/resources/files-to-patch-windows-emb-arm b/src/libs/installer/resources/files-to-patch-windows-emb-arm index f0c1c3c73..674adaff6 100644 --- a/src/libs/installer/resources/files-to-patch-windows-emb-arm +++ b/src/libs/installer/resources/files-to-patch-windows-emb-arm @@ -1,6 +1,9 @@ bin/qmake.exe bin/lrelease.exe bin/qdoc.exe +host-bin/qmake.exe +host-bin/lrelease.exe +host-bin/qdoc.exe %% *.la *.prl diff --git a/src/libs/installer/resources/patch_file_lists.qrc b/src/libs/installer/resources/patch_file_lists.qrc index fe4b77046..e898b9b23 100644 --- a/src/libs/installer/resources/patch_file_lists.qrc +++ b/src/libs/installer/resources/patch_file_lists.qrc @@ -8,5 +8,6 @@ <file>files-to-patch-macx-qt5</file> <file>files-to-patch-linux-emb-arm</file> <file>files-to-patch-windows-emb-arm</file> + <file>files-to-patch-macx-emb-arm</file> </qresource> </RCC> |