mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 14:38:29 +01:00
Merge bitcoin/bitcoin#25338: scripted-diff: Avoid incompatibility with CMake AUTOUIC feature
018d70b587scripted-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 ACK018d70b587ryanofsky: Code review ACK018d70b587furszy: Code review ACK018d70b5Tree-SHA512: 4fc83f2e5a82c8ab15c3c3d68f48b9863c47b96c0a66b6276b9b4dfc6063abffd73a16382acfe116553487b3ac697dbde2d9ada1b92010c5d8f8c6aa06f56428
This commit is contained in:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user