Skip to content

Commit 1782a87

Browse files
committed
Make a modified copy of qrc file for VPATH builds
1 parent 1b5581e commit 1782a87

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/Makefile.qt.include

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ QT_MOC = \
102102

103103
QT_QRC_CPP = qt/qrc_bitcoin.cpp
104104
QT_QRC = qt/bitcoin.qrc
105+
QT_QRC_BUILD = qt/qrc_bitcoin_build.qrc
105106
QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
106107
QT_QRC_LOCALE = qt/bitcoin_locale.qrc
107108

@@ -379,11 +380,14 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
379380
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin_locale --format-version 1 $(@D)/temp_$(<F) > $@
380381
@rm $(@D)/temp_$(<F)
381382

382-
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
383+
$(QT_QRC_BUILD): $(QT_QRC)
384+
$(SED) -e 's:\(res\/\(icons\|animation\|fonts\)/\):$(abs_srcdir)/qt/\1:' <"$<" >"$@"
385+
386+
$(QT_QRC_CPP): $(QT_QRC_BUILD) $(QT_FORMS_H) $(QT_RES_FONTS) $(QT_RES_ICONS) $(QT_RES_ANIMATION)
383387
@test -f $(RCC) || (echo "rcc $(RCC) not found, but is required for generating qrc cpp files"; exit 1)
384388
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin --format-version 1 $< > $@
385389

386-
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc
390+
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc $(QT_QRC_BUILD)
387391

388392
CLEANFILES += $(CLEAN_QT)
389393

0 commit comments

Comments
 (0)