From e4f86893a899ee86cfa6d238f891bec04977c966 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Fri, 22 Mar 2013 14:40:55 +0100 Subject: fix merge issues, make console window work again --- main.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 7c82d6d8..4239d70f 100644 --- a/main.cpp +++ b/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(); } -- cgit v1.2.3