diff options
| author | Alessandro Portale <alessandro.portale@digia.com> | 2014-08-30 04:43:37 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@digia.com> | 2014-09-01 07:45:23 +0200 |
| commit | 8e2ccd28b6281b4d14f0e6ed83e00c886177584c (patch) | |
| tree | 481f0b16ef991a0ee35ea0049ab95e5bf85b35ba /src | |
| parent | d8fad00ff956f548db8c2c40d527c4ad9fbbba7f (diff) | |
| download | qt-creator-8e2ccd28b6281b4d14f0e6ed83e00c886177584c.tar.gz | |
VcsBase: Fix compilation with msvc2010
basevcseditorfactory.cpp(78) : error C3499: a lambda that has been
specified to have a void return type cannot return a value
Change-Id: I9f6846a3d55d8e8e8014386a6fd899091f1e379b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/vcsbase/basevcseditorfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index aaa0aca5c7..0afc7980c6 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -64,14 +64,14 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters, setEditorActionHandlers(parameters->context, TextEditorActionHandler::None); - setDocumentCreator([=]() { + setDocumentCreator([=]() -> BaseTextDocument* { auto document = new BaseTextDocument(parameters->id); // if (QLatin1String(parameters->mimeType) != QLatin1String(DiffEditor::Constants::DIFF_EDITOR_MIMETYPE)) document->setMimeType(QLatin1String(parameters->mimeType)); return document; }); - setEditorWidgetCreator([=]() { + setEditorWidgetCreator([=]() -> BaseTextEditorWidget* { auto widget = qobject_cast<VcsBaseEditorWidget *>(editorWidgetCreator()); widget->setDescribeSlot(describeReceiver, describeSlot); widget->setParameters(parameters); |