Skip to content

Commit 054be73

Browse files
committed
Merge pull request #3493
9a2305a qt: Stop shutdown detection timer during shutdown (Wladimir J. van der Laan) 35ecf85 qt: Remove global references in bitcoin.cpp (Wladimir J. van der Laan) 55fe4de qt: Show window while shutting down (Wladimir J. van der Laan) 202d853 qt: Move initialization/shutdown to a thread (Wladimir J. van der Laan)
2 parents 6a0e237 + 9a2305a commit 054be73

File tree

6 files changed

+409
-141
lines changed

6 files changed

+409
-141
lines changed

src/qt/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \
108108

109109
BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
110110

111-
QT_MOC = intro.moc overviewpage.moc rpcconsole.moc
111+
QT_MOC = intro.moc overviewpage.moc rpcconsole.moc bitcoin.moc
112112

113113
QT_QRC_CPP = qrc_bitcoin.cpp
114114
QT_QRC = bitcoin.qrc

0 commit comments

Comments
 (0)