From 656e0d3422cec625417b1eaac4e4421e15b8a73f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 22 Nov 2011 21:41:06 +0100 Subject: [PATCH] syncqt: Don't generate deprecated forwarding headers anymore The forwarding headers in 'include/Qt' were deprectated in Qt 4. This is Qt 5, so time to remove them. Change-Id: I4bf3797475b91f58af1761ed4165b552613299b3 Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- bin/syncqt | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/bin/syncqt b/bin/syncqt index 3fd9316..36e6680 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -832,9 +832,6 @@ my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate; $isunix = checkUnix; #cache checkUnix -# create path -make_path("$out_basedir/include/Qt", "", $verbose_level); - foreach my $lib (@modules_to_sync) { #iteration info my $dir = $modules{$lib}; @@ -1024,31 +1021,6 @@ foreach my $lib (@modules_to_sync) { my @headers; if ($public_header) { @headers = ( "$out_basedir/include/$lib/$header" ); - - # write forwarding headers to include/Qt - if ($lib ne "phonon" && $subdir =~ /^$quoted_basedir\/src/) { - my $file_name = "$out_basedir/include/Qt/$header"; - my $file_op = '>'; - my $header_content = ''; - if (exists $colliding_headers{$file_name}) { - $file_op = '>>'; - } else { - $colliding_headers{$file_name} = 1; - my $warning_msg = 'Inclusion of header files from include/Qt is deprecated.'; - $header_content = "#ifndef QT_NO_QT_INCLUDE_WARN\n" . - " #if defined(__GNUC__)\n" . - " #warning \"$warning_msg\"\n" . - " #elif defined(_MSC_VER)\n" . - " #pragma message(\"WARNING: $warning_msg\")\n" . - " #endif\n". - "#endif\n\n"; - } - $header_content .= '#include "' . "../$lib/$header" . "\"\n"; - open HEADERFILE, $file_op, $file_name or die "unable to open '$file_name' : $!\n"; - print HEADERFILE $header_content; - close HEADERFILE; - } - foreach my $full_class (@classes) { my $header_base = basename($header); # Strip namespaces: -- 2.7.4