diff options
| author | fanquake <fanquake@gmail.com> | 2023-12-11 11:25:08 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-12-11 11:27:23 +0000 |
| commit | ba5f16e4a1b2b1b187174b44883edb6d7378927b (patch) | |
| tree | e1162b5cf0812a8cf1bcb7b2e3b0fe2d7faa7795 | |
| parent | 36fabb01b16c70902c085187b0a6978c70c691c0 (diff) | |
| parent | 1a5dae630df1eef9eac51557b2f1c5dba0924953 (diff) | |
| download | bitcoin-ba5f16e4a1b2b1b187174b44883edb6d7378927b.tar.xz | |
Merge bitcoin/bitcoin#29044: msvc: Define the same `QT_...` macros as in Autotools builds
1a5dae630df1eef9eac51557b2f1c5dba0924953 msvc: Define the same `QT_...` macros as in Autotools builds (Hennadii Stepanov)
Pull request description:
There are no reasons to have such a diversion.
Also it fixes https://github.com/bitcoin/bitcoin/pull/28960#issuecomment-1847971114.
ACKs for top commit:
sipsorcery:
tACK 1a5dae630df1eef9eac51557b2f1c5dba0924953.
TheCharlatan:
ACK 1a5dae630df1eef9eac51557b2f1c5dba0924953
Tree-SHA512: 75be5eabb8fec974b8d77a023c72323015a3d95fbc13b7fd85e5f25c250ae67850ddf0bcaef143828d75fe35a49e7c9b1966976b74f3ce7d14465174e6585ceb
| -rw-r--r-- | build_msvc/common.qt.init.vcxproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build_msvc/common.qt.init.vcxproj b/build_msvc/common.qt.init.vcxproj index cc8063e545..dabbec707f 100644 --- a/build_msvc/common.qt.init.vcxproj +++ b/build_msvc/common.qt.init.vcxproj @@ -13,4 +13,10 @@ <QtDebugLibraries>$(QtPluginsLibraryDir)\platforms\qwindowsd.lib;$(QtPluginsLibraryDir)\platforms\qminimald.lib;$(QtPluginsLibraryDir)\styles\qwindowsvistastyled.lib;$(QtLibraryDir)\*d.lib;Wtsapi32.lib;crypt32.lib;userenv.lib;netapi32.lib;imm32.lib;Dwmapi.lib;version.lib;winmm.lib;UxTheme.lib</QtDebugLibraries> </PropertyGroup> + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>QT_NO_KEYWORDS;QT_USE_QSTRINGBUILDER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemDefinitionGroup> + </Project> |