Merge remote-tracking branch 'origin/4.2'

Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
2016-11-21 10:25:45 +02:00
parent 6a061b2a35 97c9213358
commit 6d1d1a4416
36 changed files with 488 additions and 308 deletions
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -177,7 +177,7 @@ public:
    void setChangeNumber(int changeNumber);

 protected:
-    void reload();
+    void reload() override;

 private slots:
    void slotTextualDiffOutputReceived(const QString &contents);