Merge branch 'master' into 'master'

Compile for latest MacOS Catalina (10.15.7)

See merge request blackcoin/blackcoin-more!17

contrib/macdeploy/macdeployqtplus

@@ -552,7 +552,8 @@ if len(config.fancy) == 1:
         sys.exit(1)
     
     try:
-        fancy = plistlib.readPlist(p)
+        with open(p, 'rb') as fp:
+            fancy = plistlib.load(fp, fmt=plistlib.FMT_XML)
     except:
         if verbose >= 1:
             sys.stderr.write("Error: Could not parse fancy disk image plist at \"%s\"\n" % (p))

src/qt/trafficgraphwidget.cpp

@@ -6,6 +6,7 @@
 #include "clientmodel.h"
 
 #include <QPainter>
+#include <QPainterPath>
 #include <QColor>
 #include <QTimer>