diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /bin/syncqt.pl | |
parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'bin/syncqt.pl')
-rwxr-xr-x | bin/syncqt.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index ff539f5fe0..83e8350f81 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -812,6 +812,7 @@ foreach my $lib (@modules_to_sync) { my $is_qt = !($module =~ s/^!//); my @dirs = split(/;/, $module); my $dir = $dirs[0]; + shift @dirs if ($dir =~ s/^>//); my $pathtoheaders = ""; $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib}); |