Changeset View
Changeset View
Standalone View
Standalone View
modules/ksb/Application.pm
| Show First 20 Lines • Show All 2436 Lines • ▼ Show 20 Line(s) | 2429 | for my $prog (keys %requiredPrograms) { | |||
|---|---|---|---|---|---|
| 2437 | # qmake is not necessarily named 'qmake' | 2437 | # qmake is not necessarily named 'qmake' | ||
| 2438 | if (!$programPath && $prog eq 'qmake') { | 2438 | if (!$programPath && $prog eq 'qmake') { | ||
| 2439 | $programPath = ksb::BuildSystem::QMake::absPathToQMake(); | 2439 | $programPath = ksb::BuildSystem::QMake::absPathToQMake(); | ||
| 2440 | } | 2440 | } | ||
| 2441 | 2441 | | |||
| 2442 | if (!$programPath) { | 2442 | if (!$programPath) { | ||
| 2443 | # Don't complain about Qt if we're building it... | 2443 | # Don't complain about Qt if we're building it... | ||
| 2444 | if ($prog eq 'qmake' && ( | 2444 | if ($prog eq 'qmake' && ( | ||
| 2445 | grep { $_->buildSystemType() eq 'Qt' } (@buildModules)) || | 2445 | grep { $_->buildSystemType() eq 'Qt' || | ||
| 2446 | $_->buildSystemType() eq 'Qt5' } (@buildModules)) || | ||||
| 2446 | pretending() | 2447 | pretending() | ||
| 2447 | ) | 2448 | ) | ||
| 2448 | { | 2449 | { | ||
| 2449 | next; | 2450 | next; | ||
| 2450 | } | 2451 | } | ||
| 2451 | 2452 | | |||
| 2452 | $wasError = 1; | 2453 | $wasError = 1; | ||
| 2453 | my $reqPackage = $requiredPackages{$prog} || $prog; | 2454 | my $reqPackage = $requiredPackages{$prog} || $prog; | ||
| ▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines | |||||