aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2019-04-05 12:17:04 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2019-04-05 14:12:56 +0000
commitcf86a13aaf79400cbb8cfc051d91fd65bf496781 (patch)
tree1eb48ea0f47a5b0c2dd1a632a34554e6ab93fbc7
parentbd74e19f10d7002530ba271cb95dc7166bcc0d55 (diff)
Ignore replacement of qMove by std::move
Change-Id: I45845f8e3929624a2889dfaf4b6aec8ce52339b6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-rwxr-xr-xpackaging-tools/resetboring.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/packaging-tools/resetboring.py b/packaging-tools/resetboring.py
index c48537280..6d4b9be28 100755
--- a/packaging-tools/resetboring.py
+++ b/packaging-tools/resetboring.py
@@ -674,8 +674,11 @@ class Selector(object): # Select interesting changes, discard boring.
# 5.10: common switch from while (0) to while (false)
# 5.12: Q_DECL_EQ_DELETE -> = delete
+ # 5.14: qMove -> std::move
for swap in ((('while', '(', '0', ')'), ('while', '(', 'false', ')')),
- (('Q_DECL_EQ_DELETE', ';'), ('=', 'delete', ';'))):
+ (('Q_DECL_EQ_DELETE', ';'), ('=', 'delete', ';')),
+ (('qMove',), ('std', '::', 'move')),
+ ):
def find(words, after=swap[1]):
try:
ind = 0