From d6805e71fff2ff3eb671e67782502534f544a383 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Thu, 10 Mar 2011 16:23:01 +0100 Subject: [PATCH] Load the sync.profile after setting the variables. --- bin/syncqt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/syncqt b/bin/syncqt index 4c996cc197..e6ef527b91 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -718,6 +718,16 @@ die "Cannot automatically detect/use provided path to QtBase's build directory!\ # if we have no $basedir we cannot be sure which sources you want, so die die "Could not find any sync.profile for your module!\nPass to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); +my @ignore_headers = (); +my $class_lib_map_contents = ""; +our @ignore_for_master_contents = (); +our @ignore_for_include_check = (); +our @ignore_for_qt_begin_header_check = (); +our @ignore_for_qt_begin_namespace_check = (); +our @ignore_for_qt_module_check = (); +my %colliding_headers = (); +my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir + # load the module's sync.profile here, before we can loadSyncProfile(\$basedir, \$out_basedir); @@ -729,15 +739,6 @@ $isunix = checkUnix; #cache checkUnix mkpath "$out_basedir/include", !$quiet; mkpath "$out_basedir/include/Qt", !$quiet; -my @ignore_headers = (); -my $class_lib_map_contents = ""; -our @ignore_for_master_contents = (); -our @ignore_for_include_check = (); -our @ignore_for_qt_begin_header_check = (); -our @ignore_for_qt_begin_namespace_check = (); -our @ignore_for_qt_module_check = (); -my %colliding_headers = (); -my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir foreach my $lib (@modules_to_sync) { #iteration info