Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>2020-05-20 11:48:46 +0300
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>2020-05-20 11:48:46 +0300
commite9a82dff7798d2cb15dcf13680c4c39783ed480b (patch)
tree78809ac610584014298400600ff291efe764380b /src/gui/systray.h
parent9bfcdbae3a8ad5925217fd367b0a622cd9aaf180 (diff)
parent7c5dbdd0045738601c85a7e245643425af2c83b4 (diff)
Merge remote-tracking branch 'origin/master' into traywindow-listview-actions
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Diffstat (limited to 'src/gui/systray.h')
-rw-r--r--src/gui/systray.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/systray.h b/src/gui/systray.h
index e8683df7d..52c731896 100644
--- a/src/gui/systray.h
+++ b/src/gui/systray.h
@@ -22,6 +22,7 @@
#include "tray/UserModel.h"
class QIcon;
+class QQmlApplicationEngine;
namespace OCC {
@@ -79,9 +80,7 @@ private:
Systray();
bool _isOpen;
bool _syncIsPaused;
- QQmlEngine *_trayEngine;
- QQmlComponent *_trayComponent;
- QQmlContext *_trayContext;
+ QQmlApplicationEngine *_trayEngine;
};
} // namespace OCC