Merge remote-tracking branch 'origin/4.9'

Change-Id: I873266bc23680ea02aaff6387790f2a834335113
2019-02-05 09:02:01 +01:00
parent 107028dd19 9561fd9f45
commit 66226453a1
20 changed files with 112 additions and 60 deletions
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -591,8 +591,9 @@ void Client::handleCodeActionResponse(const CodeActionRequest::Response &respons
            for (const Utils::variant<Command, CodeAction> &item : *list) {
                if (auto action = Utils::get_if<CodeAction>(&item))
                    updateCodeActionRefactoringMarker(this, *action, uri);
-                else if (auto command = Utils::get_if<Command>(&item))
-                    ; // todo
+                else if (auto command = Utils::get_if<Command>(&item)) {
+                    Q_UNUSED(command); // todo
+                }
            }
        }
    }