fix merge issues, make console window work again
This commit is contained in:
parent
cd1fdbbbc2
commit
e4f86893a8
9 changed files with 164 additions and 152 deletions
1
main.cpp
1
main.cpp
|
@ -72,6 +72,7 @@ private slots:
|
|||
//if (instance->getShowConsole())
|
||||
console->show();
|
||||
connect(proc, SIGNAL(ended()), SLOT(onTerminated()));
|
||||
connect(proc, SIGNAL(log(QString,MessageLevel::Enum)), console, SLOT(write(QString,MessageLevel::Enum)));
|
||||
proc->launch();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue