forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated RPCs for Bitcoin PRs bitcoin#19100 and bitcoin#19250.
- Loading branch information
Showing
130 changed files
with
3,429 additions
and
3,561 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,23 @@ | ||
--- old/qtbase/mkspecs/features/qt_module.prf | ||
+++ new/qtbase/mkspecs/features/qt_module.prf | ||
@@ -245,7 +245,7 @@ | ||
@@ -264,7 +264,7 @@ | ||
load(qt_targets) | ||
|
||
# this builds on top of qt_common | ||
-!internal_module:!lib_bundle:if(unix|mingw) { | ||
+unix|mingw { | ||
+if(unix|mingw):!if(darwin:debug_and_release:CONFIG(debug, debug|release)) { | ||
CONFIG += create_pc | ||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig | ||
host_build: \ | ||
@@ -274,9 +274,9 @@ | ||
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] | ||
QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME | ||
QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") | ||
- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) | ||
+ QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)$$qtPlatformTargetSuffix() | ||
for(i, MODULE_DEPENDS): \ | ||
- QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0)) | ||
+ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$section(QT.$${i}.VERSION, ., 0, 0))$$qtPlatformTargetSuffix() | ||
isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ | ||
QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module | ||
pclib_replace.match = $$lib_replace.match |
Oops, something went wrong.