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

VcsBaseClient: Fix build on windows

Browse Source 
Windows does pick ::log in favor of this->log in the lambda.

Change-Id: Ib3037606dfe70de955b10e69e2bc513b99b82fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-22 16:02:32 +01:00
parent 4e60001f83
commit d20833364a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/git/gitclient.cpp
View File

@@ -974,8 +974,8 @@ void GitClient::log(const QString &workingDirectory, const QString &fileName,
VcsBaseEditorWidget *editor = findExistingVCSEditor("logFileName", sourceFile);
if (!editor) {
auto *argWidget = new GitLogArgumentsWidget(settings());
QObject::connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
[=] { log(workingDirectory, fileName, enableAnnotationContextMenu, args); });
connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
[=]() { this->log(workingDirectory, fileName, enableAnnotationContextMenu, args); });
editor = createVcsEditor(editorId, title, sourceFile, CodecLogOutput, "logFileName", sourceFile,
argWidget);
}
@@ -1100,11 +1100,11 @@ void GitClient::blame(const QString &workingDirectory,
if (!editor) {
auto *argWidget = new GitBlameArgumentsWidget(settings());
argWidget->setBaseArguments(args);
QObject::connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
[=] {
const int line = VcsBaseEditor::lineNumberOfCurrentEditor();
blame(workingDirectory, args, fileName, revision, line);
} );
connect(argWidget, &VcsBaseEditorParameterWidget::commandExecutionRequested,
[=] {
const int line = VcsBaseEditor::lineNumberOfCurrentEditor();
blame(workingDirectory, args, fileName, revision, line);
} );
editor = createVcsEditor(editorId, title, sourceFile, CodecSource, "blameFileName", id, argWidget);
}