From bde0e93025b6b1812a9055b3050775bedd2ea4e7 Mon Sep 17 00:00:00 2001
From: barton26 <barton2526@gmail.com>
Date: Tue, 19 Jul 2022 16:44:52 -0400
Subject: [PATCH] qt: Prefix makefile variables with QT_

---
 src/Makefile.qt.include | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index d8b029b0d2..16a6d5d863 100755
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -405,7 +405,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/walletmodel.cpp \
   qt/winshutdownmonitor.cpp
 
-RES_ICONS = \
+QT_RES_ICONS = \
   qt/res/icons/add.png \
   qt/res/icons/block.png \
   qt/res/icons/chat.png \
@@ -581,7 +581,7 @@ RES_ICONS = \
   qt/res/icons/icons_dark/chevron_right.svg \
   qt/res/icons/icons_dark/chevron_up.svg
 
-RES_IMAGES = \
+QT_RES_IMAGES = \
   qt/res/images/about.svg \
   qt/res/images/about_light.svg \
   qt/res/images/boinc_logo.svg \
@@ -597,18 +597,18 @@ RES_IMAGES = \
   qt/res/images/ic_solo_inactive.svg \
   qt/res/images/splash3.png
 
-RES_FONTS = \
+QT_RES_FONTS = \
   qt/res/fonts/Inconsolata-Regular.ttf \
   qt/res/fonts/Inter-Bold.otf \
   qt/res/fonts/Inter-Medium.otf \
   qt/res/fonts/Inter-Regular.otf
 
-RES_STYLESHEETS = \
+QT_RES_STYLESHEETS = \
   qt/res/stylesheets/light_stylesheet.qss \
   qt/res/stylesheets/dark_stylesheet.qss
 
 
-GRIDCOIN_RC = qt/res/gridcoinresearch.rc
+GRIDCOIN_QT_RC = qt/res/gridcoinresearch.rc
 
 if USE_QRCODE
 GRIDCOINRESEARCH_QT_CPP += qt/qrcodedialog.cpp
@@ -626,7 +626,7 @@ qt_libgridcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(GRIDCOIN_INCLUDES) $(GRIDCOIN_QT_
 qt_libgridcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
 qt_libgridcoinqt_a_SOURCES = $(GRIDCOINRESEARCH_QT_CPP) $(GRIDCOINRESEARCH_QT_H) $(QT_FORMS_UI) \
-  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_FONTS) $(RES_MOVIES) $(RES_STYLESHEETS)
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(QT_RES_ICONS) $(QT_RES_IMAGES) $(QT_RES_FONTS) $(QT_RES_MOVIES) $(QT_RES_STYLESHEETS)
 
 if TARGET_WINDOWS
 qt_libgridcoinqt_a_SOURCES += $(GRIDCOIN_CORE_H) $(GRIDCOIN_CORE_CPP)
@@ -658,7 +658,7 @@ if TARGET_DARWIN
 endif
 qt_gridcoinresearch_LDADD = qt/libgridcoinqt.a
 if TARGET_WINDOWS
-  qt_gridcoinresearch_SOURCES += $(GRIDCOIN_RC)
+  qt_gridcoinresearch_SOURCES += $(GRIDCOIN_QT_RC)
 else
   qt_gridcoinresearch_LDADD += $(LIBGRIDCOIN_UTIL)
 endif
@@ -695,7 +695,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
 	@rm $(@D)/temp_$(<F)
 
-$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_FONTS) $(RES_MOVIES) $(RES_STYLESHEETS) $(PROTOBUF_H)
+$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(QT_RES_ICONS) $(QT_RES_IMAGES) $(QT_RES_FONTS) $(QT_RES_MOVIES) $(QT_RES_STYLESHEETS) $(PROTOBUF_H)
 	@test -f $(RCC)
 	$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
 	  $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@