mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Fix copy'n'paste and code move bugs
Change-Id: I9e8d059648c54cf2ffde7674d9f049d4821dbb0a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
This commit is contained in:
committed by
Qt by Nokia
parent
9be91b36b5
commit
9fa0f5ddf4
4
build
4
build
@@ -422,9 +422,9 @@ sub build_project
|
||||
my $install_command = $self->{'instcmds'}->{$module};
|
||||
if (!defined $build_command) {
|
||||
if (!-e "$module/Makefile") {
|
||||
$self->exeLowPriv("cd $module && qmake -r") && die "'cd $module && $build_command' failed: $?";
|
||||
$self->exeLowPriv("cd $module && qmake -r") && die "'cd $module && qmake -r' failed: $?";
|
||||
}
|
||||
$build_command = "$self->{MAKE} $self->{MAKEOPTS}" if (!defined $build_command);
|
||||
$build_command = "$self->{MAKE} $self->{MAKEOPTS}";
|
||||
}
|
||||
$self->exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?";
|
||||
$install_command = "$self->{MAKE} install" if (!defined $install_command);
|
||||
|
||||
Reference in New Issue
Block a user