blob: 6db3ed9639fb78f5c06d82656bd9de1083ea2da5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 12eddfa96ad7e18f1a04745b6b4c0ba9d9a2e2f5 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Thu, 10 Mar 2011 16:23:01 +0100
Subject: [PATCH] Load the sync.profile after setting the variables.
---
qtbase/bin/syncqt | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt
index 4c996cc..e6ef527 100755
--- a/qtbase/bin/syncqt
+++ b/qtbase/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 <module directory> 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
--
1.7.3.4
|
