File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change 1- @ echo off
1+ @ echo on
22@ setlocal
33
44set BASEDIR = %~dp0
@@ -16,11 +16,20 @@ if not "%TFENV%" == "" (
1616 call " ..\..\..\tfenv.bat"
1717)
1818
19+ for %%I in (nmake.exe) do if exist %%~$path:I set NMAKE = %%~$path:I
1920for %%I in (qmake.exe) do if exist %%~$path:I set QMAKE = %%~$path:I
2021for %%I in (cmake.exe) do if exist %%~$path:I set CMAKE = %%~$path:I
2122for %%I in (sqlite3.exe) do if exist %%~$path:I set SQLITE = %%~$path:I
2223if " %SQLITE% " == " " for %%I in (sqlite3-bin.exe) do if exist %%~$path:I set SQLITE = %%~$path:I
2324
25+ if " %NMAKE% " == " " (
26+ echo;
27+ echo nmake.exe command not found.
28+ call :CleanUp
29+ pause
30+ exit /B 1
31+ )
32+
2433if " %QMAKE% " == " " (
2534 echo;
2635 echo qmake.exe command not found.
@@ -29,6 +38,7 @@ if "%QMAKE%" == "" (
2938 exit /B 1
3039)
3140
41+
3242cd /D %BASEDIR%
3343rd /Q /S %APPNAME%
3444tspawn new %APPNAME%
Original file line number Diff line number Diff line change @@ -196,6 +196,8 @@ void ServerManager::setupEnvironment(QProcess *process)
196196 tSystemDebug (" export %s=%s" , " LD_PRELOAD" , qPrintable (preload));
197197 }
198198 process->setProcessEnvironment (env);
199+ #else
200+ Q_UNUSED (process);
199201#endif
200202}
201203
You can’t perform that action at this time.
0 commit comments