Merge remote-tracking branch 'origin/4.7'

Change-Id: I3c5d7e9e8c589ad4425cd89d61e1f572f5cb7997

src/plugins/valgrind/memchecktool.cpp

@@ -445,6 +445,8 @@ private:
 #ifdef Q_OS_WIN
 class HeobDialog : public QDialog
 {
+    Q_DECLARE_TR_FUNCTIONS(HeobDialog)
+
 public:
     HeobDialog(QWidget *parent);
 
@@ -475,6 +477,8 @@ private:
 
 class HeobData : public QObject
 {
+    Q_DECLARE_TR_FUNCTIONS(HeobData)
+
 public:
     HeobData(MemcheckTool *mcTool, const QString &xmlPath, Kit *kit, bool attach);
     ~HeobData();