BEE Backport bacula/src/qt-console/tray-monitor/task.h

This commit is the result of the squash of the following main commits:

Author: Henrique <henrique.faria@baculasystems.com>
Date:   Wed Oct 30 11:22:54 2019 -0300

    tray-monitor: fixed compilation for linux and windows

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Wed Jun 26 14:46:25 2019 +0200

    traymonitor: Fix restoreclient option

Author: Henrique Faria <henrique.faria@baculasystems.com>
Date:   Tue Dec 18 10:56:09 2018 +0100

    android: Port bacula tray-monitor for Android

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Feb 29 13:38:03 2016 +0100

    Add new tray monitor

diff --git a/bacula/src/qt-console/tray-monitor/task.h b/bacula/src/qt-console/tray-monitor/task.h
index d025528d737d595566b9be54ca42b932cf6eb4d4..6f197db978efba572b15ec03da34a7182d7f8d93 100644 (file)
--- a/bacula/src/qt-console/tray-monitor/task.h
+++ b/bacula/src/qt-console/tray-monitor/task.h
@@ -25,6 +25,10 @@
 #include <QStandardItemModel>
 #include "tray_conf.h"
 
+#ifdef Q_OS_ANDROID
+#include "config-storage.h"
+#endif
+
 enum {
    TASK_NONE,
    TASK_STATUS,
@@ -74,6 +78,7 @@ public:
        QString dirIds;
        QString hardlinks;
        QString client;
+       QString restoreclient;
        QString where;
        QString replace;
        QString comment;