From 841f445c7ffb89e016929a92d1a7af71a85e3e3e Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 23 Nov 2011 11:44:47 +1000 Subject: syncqt: fixed QT_MODULE_BASE when build path != install path QT_MODULE_BASE is exclusively used to refer to the top-level source directory of a module. However, in non-developer-build mode (used only when the build path is not equal to the install path), syncqt would incorrectly set the value of QT_MODULE_BASE to the build directory. This caused all $$QT..sources variables to point to the wrong place. Make it always point to the source directory. Change-Id: I401cf000f9e3a4ab97d68db40330bb98aec25a9a Reviewed-by: Oswald Buddenhagen Reviewed-by: Marius Storm-Olsen --- bin/syncqt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/syncqt') diff --git a/bin/syncqt b/bin/syncqt index 566b6e1531..34d518d7a2 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1238,7 +1238,7 @@ foreach my $lib (@modules_to_sync) { my $modulepriname = basename($modulepri); make_path($module_fwd, $lib, $verbose_level); my $moduleprifwd = "$module_fwd/$modulepriname"; - my $mod_base = $developer_build ? $basedir : $out_basedir; + my $mod_base = $basedir; my $mod_component_base = $developer_build ? $qtbasedir : $out_basedir; open MODULE_PRI_FILE, ">$moduleprifwd" or die("Could not open $moduleprifwd for writing"); print MODULE_PRI_FILE "QT_MODULE_BASE = $mod_base\n"; -- cgit v1.2.3