mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge pull request #3513
d464edf
[Qt] fix alphabetical ordering in Makefile.am (Philip Kaufmann)
This commit is contained in:
commit
0e469b5167
@ -84,8 +84,8 @@ QT_FORMS_UI = \
|
|||||||
forms/openuridialog.ui \
|
forms/openuridialog.ui \
|
||||||
forms/optionsdialog.ui \
|
forms/optionsdialog.ui \
|
||||||
forms/overviewpage.ui \
|
forms/overviewpage.ui \
|
||||||
forms/receiverequestdialog.ui \
|
|
||||||
forms/receivecoinsdialog.ui \
|
forms/receivecoinsdialog.ui \
|
||||||
|
forms/receiverequestdialog.ui \
|
||||||
forms/rpcconsole.ui \
|
forms/rpcconsole.ui \
|
||||||
forms/sendcoinsdialog.ui \
|
forms/sendcoinsdialog.ui \
|
||||||
forms/sendcoinsentry.ui \
|
forms/sendcoinsentry.ui \
|
||||||
@ -117,10 +117,10 @@ QT_MOC_CPP = \
|
|||||||
moc_optionsmodel.cpp \
|
moc_optionsmodel.cpp \
|
||||||
moc_overviewpage.cpp \
|
moc_overviewpage.cpp \
|
||||||
moc_paymentserver.cpp \
|
moc_paymentserver.cpp \
|
||||||
moc_receiverequestdialog.cpp \
|
|
||||||
moc_qvalidatedlineedit.cpp \
|
moc_qvalidatedlineedit.cpp \
|
||||||
moc_qvaluecombobox.cpp \
|
moc_qvaluecombobox.cpp \
|
||||||
moc_receivecoinsdialog.cpp \
|
moc_receivecoinsdialog.cpp \
|
||||||
|
moc_receiverequestdialog.cpp \
|
||||||
moc_recentrequeststablemodel.cpp \
|
moc_recentrequeststablemodel.cpp \
|
||||||
moc_rpcconsole.cpp \
|
moc_rpcconsole.cpp \
|
||||||
moc_sendcoinsdialog.cpp \
|
moc_sendcoinsdialog.cpp \
|
||||||
@ -137,9 +137,15 @@ QT_MOC_CPP = \
|
|||||||
moc_walletmodel.cpp \
|
moc_walletmodel.cpp \
|
||||||
moc_walletview.cpp
|
moc_walletview.cpp
|
||||||
|
|
||||||
BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
|
BITCOIN_MM = \
|
||||||
|
macdockiconhandler.mm \
|
||||||
|
macnotificationhandler.mm
|
||||||
|
|
||||||
QT_MOC = intro.moc overviewpage.moc rpcconsole.moc bitcoin.moc
|
QT_MOC = \
|
||||||
|
bitcoin.moc \
|
||||||
|
intro.moc \
|
||||||
|
overviewpage.moc \
|
||||||
|
rpcconsole.moc
|
||||||
|
|
||||||
QT_QRC_CPP = qrc_bitcoin.cpp
|
QT_QRC_CPP = qrc_bitcoin.cpp
|
||||||
QT_QRC = bitcoin.qrc
|
QT_QRC = bitcoin.qrc
|
||||||
@ -175,19 +181,19 @@ BITCOIN_QT_H = \
|
|||||||
overviewpage.h \
|
overviewpage.h \
|
||||||
paymentrequestplus.h \
|
paymentrequestplus.h \
|
||||||
paymentserver.h \
|
paymentserver.h \
|
||||||
receivecoinsdialog.h \
|
|
||||||
recentrequeststablemodel.h \
|
|
||||||
receiverequestdialog.h \
|
|
||||||
qvalidatedlineedit.h \
|
qvalidatedlineedit.h \
|
||||||
qvaluecombobox.h \
|
qvaluecombobox.h \
|
||||||
|
receivecoinsdialog.h \
|
||||||
|
receiverequestdialog.h \
|
||||||
|
recentrequeststablemodel.h \
|
||||||
rpcconsole.h \
|
rpcconsole.h \
|
||||||
sendcoinsdialog.h \
|
sendcoinsdialog.h \
|
||||||
sendcoinsentry.h \
|
sendcoinsentry.h \
|
||||||
signverifymessagedialog.h \
|
signverifymessagedialog.h \
|
||||||
splashscreen.h \
|
splashscreen.h \
|
||||||
trafficgraphwidget.h \
|
trafficgraphwidget.h \
|
||||||
transactiondescdialog.h \
|
|
||||||
transactiondesc.h \
|
transactiondesc.h \
|
||||||
|
transactiondescdialog.h \
|
||||||
transactionfilterproxy.h \
|
transactionfilterproxy.h \
|
||||||
transactionrecord.h \
|
transactionrecord.h \
|
||||||
transactiontablemodel.h \
|
transactiontablemodel.h \
|
||||||
@ -198,54 +204,54 @@ BITCOIN_QT_H = \
|
|||||||
walletview.h
|
walletview.h
|
||||||
|
|
||||||
RES_ICONS = \
|
RES_ICONS = \
|
||||||
res/icons/bitcoin.png \
|
res/icons/add.png \
|
||||||
res/icons/address-book.png \
|
res/icons/address-book.png \
|
||||||
res/icons/quit.png \
|
res/icons/bitcoin.ico \
|
||||||
res/icons/send.png \
|
res/icons/bitcoin.png \
|
||||||
res/icons/toolbar.png \
|
res/icons/bitcoin_testnet.ico \
|
||||||
res/icons/connect0_16.png \
|
res/icons/bitcoin_testnet.png \
|
||||||
res/icons/connect1_16.png \
|
|
||||||
res/icons/connect2_16.png \
|
|
||||||
res/icons/connect3_16.png \
|
|
||||||
res/icons/connect4_16.png \
|
|
||||||
res/icons/transaction0.png \
|
|
||||||
res/icons/transaction2.png \
|
|
||||||
res/icons/clock1.png \
|
res/icons/clock1.png \
|
||||||
res/icons/clock2.png \
|
res/icons/clock2.png \
|
||||||
res/icons/clock3.png \
|
res/icons/clock3.png \
|
||||||
res/icons/clock4.png \
|
res/icons/clock4.png \
|
||||||
res/icons/clock5.png \
|
res/icons/clock5.png \
|
||||||
res/icons/configure.png \
|
res/icons/configure.png \
|
||||||
res/icons/receive.png \
|
res/icons/connect0_16.png \
|
||||||
res/icons/editpaste.png \
|
res/icons/connect1_16.png \
|
||||||
res/icons/editcopy.png \
|
res/icons/connect2_16.png \
|
||||||
res/icons/add.png \
|
res/icons/connect3_16.png \
|
||||||
res/icons/bitcoin_testnet.png \
|
res/icons/connect4_16.png \
|
||||||
res/icons/toolbar_testnet.png \
|
res/icons/debugwindow.png \
|
||||||
res/icons/edit.png \
|
res/icons/edit.png \
|
||||||
res/icons/history.png \
|
res/icons/editcopy.png \
|
||||||
res/icons/overview.png \
|
res/icons/editpaste.png \
|
||||||
res/icons/export.png \
|
res/icons/export.png \
|
||||||
res/icons/synced.png \
|
res/icons/filesave.png \
|
||||||
res/icons/remove.png \
|
res/icons/history.png \
|
||||||
res/icons/tx_mined.png \
|
res/icons/key.png \
|
||||||
res/icons/tx_input.png \
|
|
||||||
res/icons/tx_output.png \
|
|
||||||
res/icons/tx_inout.png \
|
|
||||||
res/icons/lock_closed.png \
|
res/icons/lock_closed.png \
|
||||||
res/icons/lock_open.png \
|
res/icons/lock_open.png \
|
||||||
res/icons/key.png \
|
res/icons/overview.png \
|
||||||
res/icons/filesave.png \
|
|
||||||
res/icons/qrcode.png \
|
res/icons/qrcode.png \
|
||||||
res/icons/debugwindow.png \
|
res/icons/quit.png \
|
||||||
res/icons/bitcoin.ico \
|
res/icons/receive.png \
|
||||||
res/icons/bitcoin_testnet.ico
|
res/icons/remove.png \
|
||||||
|
res/icons/send.png \
|
||||||
|
res/icons/synced.png \
|
||||||
|
res/icons/toolbar.png \
|
||||||
|
res/icons/toolbar_testnet.png \
|
||||||
|
res/icons/transaction0.png \
|
||||||
|
res/icons/transaction2.png \
|
||||||
|
res/icons/tx_inout.png \
|
||||||
|
res/icons/tx_input.png \
|
||||||
|
res/icons/tx_output.png \
|
||||||
|
res/icons/tx_mined.png
|
||||||
|
|
||||||
BITCOIN_QT_CPP = \
|
BITCOIN_QT_CPP = \
|
||||||
aboutdialog.cpp \
|
aboutdialog.cpp \
|
||||||
|
bitcoin.cpp \
|
||||||
bitcoinaddressvalidator.cpp \
|
bitcoinaddressvalidator.cpp \
|
||||||
bitcoinamountfield.cpp \
|
bitcoinamountfield.cpp \
|
||||||
bitcoin.cpp \
|
|
||||||
bitcoingui.cpp \
|
bitcoingui.cpp \
|
||||||
bitcoinunits.cpp \
|
bitcoinunits.cpp \
|
||||||
clientmodel.cpp \
|
clientmodel.cpp \
|
||||||
@ -292,7 +298,9 @@ BITCOIN_QT_CPP += \
|
|||||||
walletview.cpp
|
walletview.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
RES_IMAGES = res/images/about.png res/images/splash.png \
|
RES_IMAGES = \
|
||||||
|
res/images/about.png \
|
||||||
|
res/images/splash.png \
|
||||||
res/images/splash_testnet.png
|
res/images/splash_testnet.png
|
||||||
|
|
||||||
RES_MOVIES = res/movies/update_spinner.mng
|
RES_MOVIES = res/movies/update_spinner.mng
|
||||||
|
@ -16,12 +16,13 @@ endif
|
|||||||
|
|
||||||
TEST_QT_H = \
|
TEST_QT_H = \
|
||||||
uritests.h \
|
uritests.h \
|
||||||
paymentservertests.h \
|
paymentrequestdata.h \
|
||||||
paymentrequestdata.h
|
paymentservertests.h
|
||||||
|
|
||||||
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
|
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
|
||||||
|
|
||||||
test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
|
test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
|
||||||
|
|
||||||
test_bitcoin_qt_SOURCES = \
|
test_bitcoin_qt_SOURCES = \
|
||||||
test_main.cpp \
|
test_main.cpp \
|
||||||
uritests.cpp \
|
uritests.cpp \
|
||||||
@ -30,7 +31,9 @@ if ENABLE_WALLET
|
|||||||
test_bitcoin_qt_SOURCES += \
|
test_bitcoin_qt_SOURCES += \
|
||||||
paymentservertests.cpp
|
paymentservertests.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
|
||||||
|
|
||||||
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
|
||||||
if ENABLE_WALLET
|
if ENABLE_WALLET
|
||||||
test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
|
||||||
@ -40,4 +43,3 @@ test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
|
|||||||
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user