diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-10-20 14:01:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-10-20 14:02:02 +0200 |
| commit | 96c409c919b97c8c645f7e42b35c6e5c2d2e2160 (patch) | |
| tree | dd1e9cf692a0a0dc1fedaee83bc3ff83523f27f6 /src/qt/test/addressbooktests.cpp | |
| parent | 6746a8951923513590dd241912cb67100f6e0aac (diff) | |
| parent | fadffae17f31507a3d79a7b7f1cef71660767e0d (diff) | |
| download | bitcoin-96c409c919b97c8c645f7e42b35c6e5c2d2e2160.tar.xz | |
Merge #14527: qa: Revert "Make qt wallet test compatible with qt4"
fadffae17f31507a3d79a7b7f1cef71660767e0d Revert "Make qt wallet test compatible with qt4" (MarcoFalke)
Pull request description:
This removes the file added in #10098
Tree-SHA512: 4aa887ec02aec943f3d74f469c935acf57e43ddbea6f979bb37d3a14670571fa2276cf578e8978de92b5854d8b462f24e5e0addfb27b92fbedf90726eb5d985e
Diffstat (limited to 'src/qt/test/addressbooktests.cpp')
| -rw-r--r-- | src/qt/test/addressbooktests.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index 3525846044..e6777c068d 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -6,15 +6,14 @@ #include <qt/addressbookpage.h> #include <qt/addresstablemodel.h> #include <qt/editaddressdialog.h> -#include <qt/callback.h> #include <qt/optionsmodel.h> #include <qt/platformstyle.h> #include <qt/qvalidatedlineedit.h> #include <qt/walletmodel.h> #include <key.h> -#include <pubkey.h> #include <key_io.h> +#include <pubkey.h> #include <wallet/wallet.h> #include <QApplication> |