diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-01 15:46:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-01 15:48:50 +0200 |
| commit | e5681a4fa8ebd24f8e15e6a705429bd57624e729 (patch) | |
| tree | 7c985720ca56c427fd175099b78a6aa800e7be6a /src/qt | |
| parent | 8d5abd480b9ef11057b88f2a0a7cd00b1293a236 (diff) | |
| parent | 65adc3a8934a4470614a2eae26095f6397423b9f (diff) | |
| download | bitcoin-e5681a4fa8ebd24f8e15e6a705429bd57624e729.tar.xz | |
Merge pull request #3986
65adc3a qt: Don't require db_cxx.h when wallet disabled (Wladimir J. van der Laan)
4babd08 doc: Add note about memory reqs for compilation (Wladimir J. van der Laan)
25333a2 build: improve missing boost error reporting (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/Makefile.am | 2 | ||||
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 3bbc8516a0..dd0aa1f3f9 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -276,7 +276,6 @@ BITCOIN_QT_CPP = \ qvalidatedlineedit.cpp \ qvaluecombobox.cpp \ rpcconsole.cpp \ - signverifymessagedialog.cpp \ splashscreen.cpp \ trafficgraphwidget.cpp \ utilitydialog.cpp @@ -298,6 +297,7 @@ BITCOIN_QT_CPP += \ recentrequeststablemodel.cpp \ sendcoinsdialog.cpp \ sendcoinsentry.cpp \ + signverifymessagedialog.cpp \ transactiondesc.cpp \ transactiondescdialog.cpp \ transactionfilterproxy.cpp \ diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index d8e21c4aa6..0db4308bf6 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -25,7 +25,9 @@ #include "rpcserver.h" #include "ui_interface.h" #include "util.h" +#ifdef ENABLE_WALLET #include "wallet.h" +#endif #include <stdint.h> |