equal
deleted
inserted
replaced
658 channelMode = QProcess::ForwardedChannels; |
658 channelMode = QProcess::ForwardedChannels; |
659 } |
659 } |
660 |
660 |
661 make.setProcessChannelMode(channelMode); |
661 make.setProcessChannelMode(channelMode); |
662 |
662 |
663 #if defined(Q_OS_WIN) && !defined(Q_CC_MINGW) |
|
664 make.start(QLatin1String("nmake.exe"), args); |
|
665 make.waitForStarted(); |
|
666 #else |
|
667 static const char makes[] = |
663 static const char makes[] = |
668 # ifdef Q_CC_MINGW |
664 "nmake.exe\0" //for visual c++ |
669 "mingw32-make.exe\0" |
665 "mingw32-make.exe\0" //for mingw |
670 # endif |
|
671 "gmake\0" |
666 "gmake\0" |
672 "make\0"; |
667 "make\0"; |
673 for (const char *p = makes; *p; p += strlen(p) + 1) { |
668 for (const char *p = makes; *p; p += strlen(p) + 1) { |
674 make.start(QLatin1String(p), args); |
669 make.start(QLatin1String(p), args); |
675 if (make.waitForStarted()) |
670 if (make.waitForStarted()) |
676 break; |
671 break; |
677 } |
672 } |
678 #endif |
|
679 |
673 |
680 if (make.state() != QProcess::Running) { |
674 if (make.state() != QProcess::Running) { |
681 exitCode = 255; |
675 exitCode = 255; |
682 std_err += "make: "; |
676 std_err += "make: "; |
683 std_err += make.errorString().toLocal8Bit(); |
677 std_err += make.errorString().toLocal8Bit(); |