Skip to content

Commit 748178f

Browse files
author
MarcoFalke
committed
Merge #19394: build: Remove unused RES_IMAGES
53361dd [build] Remove unused RES_IMAGES (Bushstar) Pull request description: Remove RES_IMAGES. Seems to be unused since 2015 in the commit below. bitcoin/bitcoin@98c222b#diff-9a4f3a253de77bf90b107bdf5283ebc3R317 The src/qt/res/images to which it was used with is no longer present either. ACKs for top commit: hebasto: ACK 53361dd, tested on Linux Mint 20 (x86_64). Tree-SHA512: d2f09ae225a4c6c171e1aae4c4a444064dc0502e96130e04ccb718f9fcf611a287c56630dec3e9a8937b5e29040d931a237da36180d2343c23cef30359e46323
2 parents fb87f6d + 53361dd commit 748178f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/Makefile.qt.include

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,6 @@ if ENABLE_WALLET
276276
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
277277
endif # ENABLE_WALLET
278278

279-
RES_IMAGES =
280-
281279
RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
282280

283281
BITCOIN_RC = qt/res/bitcoin-qt-res.rc
@@ -290,7 +288,7 @@ qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
290288
qt_libbitcoinqt_a_OBJCXXFLAGS = $(AM_OBJCXXFLAGS) $(QT_PIE_FLAGS)
291289

292290
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
293-
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
291+
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(RES_ICONS) $(RES_MOVIES)
294292
if TARGET_DARWIN
295293
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
296294
endif
@@ -361,7 +359,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
361359
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
362360
@rm $(@D)/temp_$(<F)
363361

364-
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
362+
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_MOVIES)
365363
@test -f $(RCC)
366364
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
367365
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@

0 commit comments

Comments
 (0)