AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syncqt: fixed QT_MODULE_BASE when build path != install path

Browse Source 
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>
This commit is contained in:
Rohan McGovern 2011-11-23 11:44:47 +10:00 committed by Qt by Nokia
parent 2711230757
commit 841f445c7f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/syncqt
View File

@ -1238,7 +1238,7 @@ foreach my $lib (@modules_to_sync) {
my $modulepriname = basename($modulepri); my $modulepriname = basename($modulepri);
make_path($module_fwd, $lib, $verbose_level); make_path($module_fwd, $lib, $verbose_level);
my $moduleprifwd = "$module_fwd/$modulepriname"; 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; my $mod_component_base = $developer_build ? $qtbasedir : $out_basedir;
open MODULE_PRI_FILE, ">$moduleprifwd" or die("Could not open $moduleprifwd for writing"); open MODULE_PRI_FILE, ">$moduleprifwd" or die("Could not open $moduleprifwd for writing");
print MODULE_PRI_FILE "QT_MODULE_BASE = $mod_base\n"; print MODULE_PRI_FILE "QT_MODULE_BASE = $mod_base\n";