Skip to content

Commit 7e4a70d

Browse files
committed
qml: Fix qt_libbitcoinqt_a_SOURCES
The correct dependency is QML_QRC_CPP which already depends on QML_QRC and QML_RES_QML and probably others later on.
1 parent fff306e commit 7e4a70d

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

src/Makefile.qt.include

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,6 @@ endif
328328

329329
nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
330330

331-
if BUILD_WITH_QML
332-
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_QML_BASE_CPP) $(QML_QRC) $(QML_RES_FONTS) $(QML_RES_QML)
333-
nodist_qt_libbitcoinqt_a_SOURCES += $(QML_QRC_CPP)
334-
endif # BUILD_WITH_QML
335-
336331
# forms/foo.h -> forms/ui_foo.h
337332
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
338333

@@ -406,6 +401,9 @@ if BUILD_WITH_QML
406401
$(QML_QRC_CPP): $(QML_QRC) $(QML_RES_FONTS) $(QML_RES_QML)
407402
@test -f $(RCC)
408403
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) --name bitcoin_qml --format-version 1 $< > $@
404+
405+
qt_libbitcoinqt_a_SOURCES += $(BITCOIN_QML_BASE_CPP) $(QML_QRC_CPP)
406+
nodist_qt_libbitcoinqt_a_SOURCES += $(QML_QRC_CPP)
409407
endif # BUILD_WITH_QML
410408

411409
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_bitcoin_locale.qrc

0 commit comments

Comments
 (0)