From 36a15a87de2b954b1cef24acd4a8cd4ef5aef6cd Mon Sep 17 00:00:00 2001 From: Felix Barz Date: Sat, 6 Jul 2019 20:28:48 +0200 Subject: [PATCH] syncqt: Fix module header install target creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified a regular expression in syncqt.pl so that the special case of a class beginning with another class does not lead to the exclusion of the first one. This affects the generation of the install target for generated class headers of Qt modules. Now the expression verifies the class names are not identical. Fixes: QTBUG-71323 Change-Id: I210b4d4c3ed64cf189594b95b10aa0e8495a19d2 Reviewed-by: Jörg Bornemann --- bin/syncqt.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 7793811c9f0..8226edfb76f 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -1092,7 +1092,7 @@ foreach my $lib (@modules_to_sync) { # } my $class_header = "$class "; $pri_install_gfiles .= $class_header - unless ($shadow || $pri_install_gfiles =~ $class_header); + unless ($shadow || $pri_install_gfiles =~ m/\b$class_header/); $injection .= ":$class"; }