From 43aa104e948c45bb8d6aa61100d7a3cb4635e197 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 22 Aug 2012 20:12:50 +0200 Subject: [PATCH] fix non-global s/// QString::replace(QRegExp) pretty much always detaches, so the equality check was bogus. Change-Id: Iee9043c1ee3083edaf289886ac11b3e3a501d623 Reviewed-by: Daniel Teske --- src/shared/proparser/qmakeevaluator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 1872965436c..801a2278353 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -329,7 +329,7 @@ static void replaceInList(ProStringList *varlist, QString val = varit->toQString(tmp); QString copy = val; // Force detach and have a reference value val.replace(regexp, replace); - if (!val.isSharedWith(copy)) { + if (!val.isSharedWith(copy) && val != copy) { if (val.isEmpty()) { varit = varlist->erase(varit); } else {