Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt: Prefix makefile variables with QT_ #2547

Merged
merged 1 commit into from
Jul 20, 2022
Merged

qt: Prefix makefile variables with QT_ #2547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Makefile.qt.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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' > $@
Expand Down