Merge branch 'master' into 'master'

Compile for latest MacOS Catalina (10.15.7)

See merge request blackcoin/blackcoin-more!17
This commit is contained in:
lateminer
2021-02-19 10:37:45 +00:00
2 changed files with 3 additions and 1 deletions

View File

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

View File

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