mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
Merge bitcoin/bitcoin#25338: scripted-diff: Avoid incompatibility with CMake AUTOUIC feature
018d70b587
scripted-diff: Avoid incompatibility with CMake AUTOUIC feature (Hennadii Stepanov) Pull request description: Working on [migration](https://github.com/hebasto/bitcoin/pull/3) from Autotools to CMake build system, I found that our current code base needs to be adjusted. CMake [allows](https://cmake.org/cmake/help/latest/prop_tgt/AUTOUIC.html) to > handle the Qt `uic` code generator automatically When using this feature, statements like `#include "ui_<ui_base>.h"` are processed in a special way. The `node/ui_interface.h` unintentionally breaks this feature. Of course, it is possible to provide a list of source files to be excluded from `AUTOUIC`. But, unfortunately, this approach does not work for the `qt/sendcoinsdialog.cpp` source file, where there are bothb71d37da2c/src/qt/sendcoinsdialog.cpp (L10)
andb71d37da2c/src/qt/sendcoinsdialog.cpp (L24)
ACKs for top commit: MarcoFalke: cr ACK018d70b587
ryanofsky: Code review ACK018d70b587
furszy: Code review ACK018d70b5
Tree-SHA512: 4fc83f2e5a82c8ab15c3c3d68f48b9863c47b96c0a66b6276b9b4dfc6063abffd73a16382acfe116553487b3ac697dbde2d9ada1b92010c5d8f8c6aa06f56428
This commit is contained in:
commit
38c63e3683
24 changed files with 28 additions and 28 deletions
|
@ -198,7 +198,7 @@ BITCOIN_CORE_H = \
|
|||
node/minisketchwrapper.h \
|
||||
node/psbt.h \
|
||||
node/transaction.h \
|
||||
node/ui_interface.h \
|
||||
node/interface_ui.h \
|
||||
node/utxo_snapshot.h \
|
||||
noui.h \
|
||||
outputtype.h \
|
||||
|
@ -375,7 +375,7 @@ libbitcoin_node_a_SOURCES = \
|
|||
node/minisketchwrapper.cpp \
|
||||
node/psbt.cpp \
|
||||
node/transaction.cpp \
|
||||
node/ui_interface.cpp \
|
||||
node/interface_ui.cpp \
|
||||
noui.cpp \
|
||||
policy/fees.cpp \
|
||||
policy/packages.cpp \
|
||||
|
@ -877,7 +877,7 @@ libbitcoinkernel_la_SOURCES = \
|
|||
logging.cpp \
|
||||
node/blockstorage.cpp \
|
||||
node/chainstate.cpp \
|
||||
node/ui_interface.cpp \
|
||||
node/interface_ui.cpp \
|
||||
policy/feerate.cpp \
|
||||
policy/fees.cpp \
|
||||
policy/packages.cpp \
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include <banman.h>
|
||||
|
||||
#include <netaddress.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <sync.h>
|
||||
#include <util/system.h>
|
||||
#include <util/time.h>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <interfaces/chain.h>
|
||||
#include <interfaces/init.h>
|
||||
#include <node/context.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <noui.h>
|
||||
#include <shutdown.h>
|
||||
#include <util/check.h>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <chainparamsbase.h>
|
||||
#include <compat.h>
|
||||
#include <netbase.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <rpc/protocol.h> // For HTTP status codes
|
||||
#include <shutdown.h>
|
||||
#include <sync.h>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <chainparams.h>
|
||||
#include <index/base.h>
|
||||
#include <node/blockstorage.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <shutdown.h>
|
||||
#include <tinyformat.h>
|
||||
#include <util/syscall_sandbox.h>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include <node/chainstate.h>
|
||||
#include <node/context.h>
|
||||
#include <node/miner.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <policy/fees.h>
|
||||
#include <policy/policy.h>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <clientversion.h>
|
||||
#include <fs.h>
|
||||
#include <logging.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <tinyformat.h>
|
||||
#include <util/system.h>
|
||||
#include <util/time.h>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <net_permissions.h>
|
||||
#include <netaddress.h>
|
||||
#include <netbase.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <protocol.h>
|
||||
#include <random.h>
|
||||
#include <scheduler.h>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
|
||||
#include <util/translation.h>
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_NODE_UI_INTERFACE_H
|
||||
#define BITCOIN_NODE_UI_INTERFACE_H
|
||||
#ifndef BITCOIN_NODE_INTERFACE_UI_H
|
||||
#define BITCOIN_NODE_INTERFACE_UI_H
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
@ -120,4 +120,4 @@ constexpr auto AbortError = InitError;
|
|||
|
||||
extern CClientUIInterface uiInterface;
|
||||
|
||||
#endif // BITCOIN_NODE_UI_INTERFACE_H
|
||||
#endif // BITCOIN_NODE_INTERFACE_UI_H
|
|
@ -22,7 +22,7 @@
|
|||
#include <node/coin.h>
|
||||
#include <node/context.h>
|
||||
#include <node/transaction.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <policy/fees.h>
|
||||
#include <policy/policy.h>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include <noui.h>
|
||||
|
||||
#include <logging.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <util/translation.h>
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include <interfaces/handler.h>
|
||||
#include <interfaces/init.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <noui.h>
|
||||
#include <qt/bitcoingui.h>
|
||||
#include <qt/clientmodel.h>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <chainparams.h>
|
||||
#include <interfaces/handler.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <util/system.h>
|
||||
#include <util/translation.h>
|
||||
#include <validation.h>
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include <chainparams.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <key_io.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <policy/policy.h>
|
||||
#include <util/system.h>
|
||||
#include <wallet/wallet.h>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <chainparams.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <key_io.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <policy/fees.h>
|
||||
#include <txmempool.h>
|
||||
#include <validation.h>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#include <qt/transactiontablemodel.h>
|
||||
#include <qt/walletmodel.h>
|
||||
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
|
||||
#include <chrono>
|
||||
#include <optional>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <qt/walletframe.h>
|
||||
|
||||
#include <fs.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <psbt.h>
|
||||
#include <qt/guiutil.h>
|
||||
#include <qt/overviewpage.h>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <interfaces/handler.h>
|
||||
#include <interfaces/node.h>
|
||||
#include <key_io.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <psbt.h>
|
||||
#include <util/system.h> // for GetBoolArg
|
||||
#include <util/translation.h>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <qt/walletmodel.h>
|
||||
|
||||
#include <interfaces/node.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <util/strencodings.h>
|
||||
|
||||
#include <QAction>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#endif
|
||||
|
||||
#include <logging.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <util/tokenpipe.h>
|
||||
#include <warnings.h>
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <timedata.h>
|
||||
|
||||
#include <netaddress.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <sync.h>
|
||||
#include <tinyformat.h>
|
||||
#include <util/system.h>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include <logging.h>
|
||||
#include <logging/timer.h>
|
||||
#include <node/blockstorage.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <node/utxo_snapshot.h>
|
||||
#include <policy/policy.h>
|
||||
#include <policy/rbf.h>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <interfaces/wallet.h>
|
||||
#include <net.h>
|
||||
#include <node/context.h>
|
||||
#include <node/ui_interface.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <outputtype.h>
|
||||
#include <univalue.h>
|
||||
#include <util/check.h>
|
||||
|
|
Loading…
Add table
Reference in a new issue