Skip to content

Commit eb04bad

Browse files
committed
scripted-diff: Prefix makefile variables with QT_
Improves consistency and readability if future QML variables are added. -BEGIN VERIFY SCRIPT- sed -i \ -e 's/RES_ANIMATION/QT_RES_ANIMATION/g' \ -e 's/RES_FONTS/QT_RES_FONTS/g' \ -e 's/RES_ICONS/QT_RES_ICONS/g' \ -e 's/BITCOIN_RC/BITCOIN_QT_RC/g' \ src/Makefile.qt.include -END VERIFY SCRIPT-
1 parent 15587b4 commit eb04bad

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/Makefile.qt.include

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ BITCOIN_QT_H = \
168168
qt/walletview.h \
169169
qt/winshutdownmonitor.h
170170

171-
RES_FONTS = \
171+
QT_RES_FONTS = \
172172
qt/res/fonts/RobotoMono-Bold.ttf
173173

174-
RES_ICONS = \
174+
QT_RES_ICONS = \
175175
qt/res/icons/add.png \
176176
qt/res/icons/address-book.png \
177177
qt/res/icons/bitcoin.ico \
@@ -287,9 +287,9 @@ if ENABLE_WALLET
287287
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
288288
endif # ENABLE_WALLET
289289

290-
RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
290+
QT_RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png)
291291

292-
BITCOIN_RC = qt/res/bitcoin-qt-res.rc
292+
BITCOIN_QT_RC = qt/res/bitcoin-qt-res.rc
293293

294294
BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER
295295

@@ -299,7 +299,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
299299
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
300300

301301
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
302-
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_FONTS) $(RES_ICONS) $(RES_ANIMATION)
302+
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
303303
if TARGET_DARWIN
304304
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
305305
endif
@@ -321,7 +321,7 @@ bitcoin_qt_cxxflags = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
321321

322322
bitcoin_qt_sources = qt/main.cpp
323323
if TARGET_WINDOWS
324-
bitcoin_qt_sources += $(BITCOIN_RC)
324+
bitcoin_qt_sources += $(BITCOIN_QT_RC)
325325
endif
326326
bitcoin_qt_ldadd = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
327327
if ENABLE_WALLET
@@ -371,7 +371,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
371371
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale --format-version 1 $(@D)/temp_$(<F) > $@
372372
@rm $(@D)/temp_$(<F)
373373

374-
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_FONTS) $(RES_ICONS) $(RES_ANIMATION)
374+
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
375375
@test -f $(RCC)
376376
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
377377

0 commit comments

Comments
 (0)