diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-25 12:50:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-25 12:50:29 +0200 |
commit | 9e04c60ac070348f8208fb0254e62d6e593320c3 (patch) | |
tree | cd038cf2612faf8dadeae5fb8b807b66e2291026 /bin/syncqt | |
parent | bfa8d15e15fdeb0bbfb6575e37be1c32445ab7cc (diff) | |
parent | 04d0a9626ce61b2e05a40f9562c2bcf12e234639 (diff) |
Merge "Merge branch 'master' into refactor" into refactor
Diffstat (limited to 'bin/syncqt')
-rwxr-xr-x | bin/syncqt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt index 0dcbc4d58e..4eab929b30 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -777,8 +777,8 @@ 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 <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); -my @ignore_headers = (); my $class_lib_map_contents = ""; +our @ignore_headers = (); our @ignore_for_master_contents = (); our @ignore_for_include_check = (); our @ignore_for_qt_begin_header_check = (); @@ -900,7 +900,7 @@ foreach my $lib (@modules_to_sync) { # FIXME: this creates a file in the source location for shadow-builds my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h"; my $modulehexstring = sprintf("0x%02X%02X%02X", int($module_major_version), int($module_minor_version), int($module_patch_version)); - open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader"; + open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader" or die "Can't open $moduleversionheader for writing"; print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n"; print MODULE_VERSION_HEADER_FILE "#ifndef QT_". uc($lib) . "_VERSION_H\n"; print MODULE_VERSION_HEADER_FILE "#define QT_". uc($lib) . "_VERSION_H\n"; |