From 77888d68d5b78d442a18073c663478bae35da246 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 30 Jun 2014 15:43:01 +0200 Subject: [PATCH] Fix the build for Qt5 Merging #3883 broke the Qt5 build, define the color in the standard way. --- src/qt/guiconstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 44e361e1e..696761e23 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -24,7 +24,7 @@ static const int STATUSBAR_ICONSIZE = 16; /* Transaction list -- bare address (without label) */ #define COLOR_BAREADDRESS QColor(140, 140, 140) /* Transaction list -- has conflicting transactions */ -#define COLOR_HASCONFLICTING Qt::white; +#define COLOR_HASCONFLICTING QColor(255, 255, 255) /* Transaction list -- has conflicting transactions - background */ #define COLOR_HASCONFLICTING_BG QColor(192, 0, 0)