feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VcsCommand: Do not use QueuedConnection for the output proxy

Browse Source 
This causes messages reordering. For example:

Amended "9036e2103c".

08:55 Executing in ...: git commit -F /tmp/QtCreator.i12936 --amend

Change-Id: Ifb3466cdd0c441b7597339451661b416dcdc1fb4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-01-25 09:09:10 +02:00
committed by Orgad Shaneh
parent 203644bf28
commit 7e37ddd416
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -44,20 +44,15 @@ VcsCommand::VcsCommand(const QString &workingDirectory,
VcsOutputWindow *outputWindow = VcsOutputWindow::instance(); VcsOutputWindow *outputWindow = VcsOutputWindow::instance();
connect(proxy, &Utils::OutputProxy::append, connect(proxy, &Utils::OutputProxy::append,
outputWindow, [](const QString &txt) { VcsOutputWindow::append(txt); }, outputWindow, [](const QString &txt) { VcsOutputWindow::append(txt); });
Qt::QueuedConnection);
connect(proxy, &Utils::OutputProxy::appendSilently, connect(proxy, &Utils::OutputProxy::appendSilently,
outputWindow, &VcsOutputWindow::appendSilently, outputWindow, &VcsOutputWindow::appendSilently);
Qt::QueuedConnection);
connect(proxy, &Utils::OutputProxy::appendError, connect(proxy, &Utils::OutputProxy::appendError,
outputWindow, &VcsOutputWindow::appendError, outputWindow, &VcsOutputWindow::appendError);
Qt::QueuedConnection);
connect(proxy, &Utils::OutputProxy::appendCommand, connect(proxy, &Utils::OutputProxy::appendCommand,
outputWindow, &VcsOutputWindow::appendCommand, outputWindow, &VcsOutputWindow::appendCommand);
Qt::QueuedConnection);
connect(proxy, &Utils::OutputProxy::appendMessage, connect(proxy, &Utils::OutputProxy::appendMessage,
outputWindow, &VcsOutputWindow::appendMessage, outputWindow, &VcsOutputWindow::appendMessage);
Qt::QueuedConnection);
return proxy; return proxy;
}); });