diff options
Diffstat (limited to 'bin/syncqt')
| -rwxr-xr-x | bin/syncqt | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/bin/syncqt b/bin/syncqt index 63dfba3b42..15814df3f9 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,9 +1,8 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl ############################################################################# ## ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) +## Contact: http://www.qt-project.org/ ## ## This file is part of the build configuration tools of the Qt Toolkit. ## @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# @@ -51,6 +51,7 @@ use Cwd; use Cwd 'abs_path'; use Config; use strict; +use warnings; use English qw(-no_match_vars ); # set output basedir to be where ever syncqt is run from @@ -303,11 +304,16 @@ sub classNames { push @symbols, "QMutable" . $1 . "Iterator"; } + our $publicclassregexp; foreach my $symbol (@symbols) { $symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces); - push @ret, $symbol - if ($symbol =~ /^Q[^:]*$/ # no-namespace, starting with Q - || $symbol =~ /^Phonon::/); # or in the Phonon namespace + + if ($symbol =~ /^Q[^:]*$/ # no-namespace, starting with Q + || $symbol =~ /^Phonon::/) { # or in the Phonon namespace + push @ret, $symbol; + } elsif (defined($publicclassregexp)) { + push @ret, $symbol if ($symbol =~ $publicclassregexp); + } } } } @@ -693,10 +699,6 @@ while ( @ARGV ) { } elsif($arg eq "-qtdir") { $var = "qtdir"; $val = shift @ARGV; - } elsif($arg eq "-base-dir") { - # skip, it's been dealt with at the top of the file - shift @ARGV; - next; } elsif($arg eq "-generator") { $var = "makefile_generator"; $val = shift @ARGV; @@ -801,13 +803,9 @@ while ( @ARGV ) { } } -# if the $qtbasedir neither has 'qtbase' somewhere in its path, nor a -# '.qmake.cache' file in its directory, we assume it's not a valid path -# (remember that a yet-to-be-built qtbase doesn't have this file either, -# thus the 'qtbase' path check!) die "Cannot automatically detect/use provided path to QtBase's build directory!\n" . "QTDIR detected/provided: " . (defined $qtbasedir ? $qtbasedir : "-none-") . "\n" . - "Please -qtdir option to provide the correct path.\nsyncqt failed" + "Please use the -qtdir option to provide the correct path.\nsyncqt failed" if (!$qtbasedir || !-d "$qtbasedir/mkspecs"); # if we have no $basedir we cannot be sure which sources you want, so die @@ -1341,7 +1339,6 @@ if($check_includes) { my $iheader = $subdir . "/" . $header; if($public_header) { if(open(F, "<$iheader")) { - my $qt_module_found = 0; my $qt_begin_header_found = 0; my $qt_end_header_found = 0; my $qt_begin_namespace_found = 0; @@ -1376,8 +1373,6 @@ if($check_includes) { $qt_begin_namespace_found = 1; } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) { $qt_end_namespace_found = 1; - } elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) { - $qt_module_found = 1; } } if ($header_skip_qt_begin_header_test == 0) { @@ -1400,11 +1395,6 @@ if($check_includes) { } } - if ($header_skip_qt_module_test == 0) { - if ($qt_module_found == 0) { - print "$lib: WARNING: $iheader does not include QT_MODULE\n"; - } - } close(F); } } |