blob: 7a73aa4dcdebb620570a74e2bcd834a08c9afaa9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
--- trayitem.h.old 2018-07-25 16:26:43.000000000 -0400
+++ trayitem.h 2020-01-22 11:02:25.406496065 -0500
@@ -21,6 +21,9 @@
#ifndef _TRAYITEM_H
#define _TRAYITEM_H
+#pragma push_macro("None")
+#undef None
+
#include <QAction>
#include <QEvent>
#include <QIcon>
@@ -32,6 +35,10 @@
#include "xlibutil.h"
+#ifndef None
+#pragma pop_macro("None")
+#endif
+
#define DEFAULT_CustomIcon QString()
#define DEFAULT_BalloonTimeout 4000 // 4 seconds
#define DEFAULT_SkipTaskbar false
|