diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-08 17:43:48 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-12 10:21:01 +0000 |
| commit | 24b3a32197f20858cd564f3c37d9d12b757a5205 (patch) | |
| tree | f85dea3b7f94131eacae44a90986a859bc98e485 | |
| parent | 4c63abf360836581a1f89a48b18d5b470bb644a3 (diff) | |
| download | qttools-24b3a32197f20858cd564f3c37d9d12b757a5205.tar.gz | |
androiddeployqt: fix possible infinite loop.
Change-Id: Id9965521f69c999a417d2b1f54b49b145dd4f32c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index 4e0414ee0..4fcebb28b 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -1076,6 +1076,9 @@ bool updateFile(const QString &fileName, const QHash<QString, QString> &replacem bool hasReplacements = false; QHash<QString, QString>::const_iterator it; for (it = replacements.constBegin(); it != replacements.constEnd(); ++it) { + if (it.key() == it.value()) + continue; // Nothing to actually replace + forever { int index = contents.indexOf(it.key().toUtf8()); if (index >= 0) { |