diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-23 11:44:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 18:37:54 +0100 |
| commit | 841f445c7ffb89e016929a92d1a7af71a85e3e3e (patch) | |
| tree | ac804c9648a3603cc6a801c41b59e7e2942e9af5 /bin | |
| parent | 27112307579d7ce827fa2378b7366f15f8cc7009 (diff) | |
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.<module>.sources variables to point
to the wrong place.
Make it always point to the source directory.
Change-Id: I401cf000f9e3a4ab97d68db40330bb98aec25a9a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |