Skip to content

Commit ecb617f

Browse files
committed
build: Bump Qt to 5.15.5 in depends
1 parent 6745e36 commit ecb617f

File tree

7 files changed

+12
-47
lines changed

7 files changed

+12
-47
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ task:
109109
VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
110110
CCACHE_DIR: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
111111
WRAPPED_CL: 'C:\Users\ContainerAdministrator\AppData\Local\Temp\cirrus-ci-build\ci\test\wrapped-cl.bat'
112-
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
113-
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
114-
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
112+
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip'
113+
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.5.zip'
114+
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.5'
115115
QTBASEDIR: 'C:\Qt_static'
116116
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
117117
QT_CONFIGURE_COMMAND: '..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml'

build_msvc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Qt
3030
---------------------
3131
To build Bitcoin Core with the GUI, a static build of Qt is required.
3232

33-
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.3.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
33+
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.5.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.5/single/qt-everywhere-opensource-src-5.15.5.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
3434

3535
2. Open "x64 Native Tools Command Prompt for VS 2022", and input the following commands:
3636
```cmd

depends/packages/qt.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=qt
2-
$(package)_version=5.15.3
2+
$(package)_version=5.15.5
33
$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
44
$(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
6+
$(package)_sha256_hash=0c42c799aa7c89e479a07c451bf5a301e291266ba789e81afc18f95049524edc
77
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
88
$(package)_qt_libs=corelib network widgets gui plugins testlib
99
$(package)_linguist_tools = lrelease lupdate lconvert
@@ -17,17 +17,16 @@ $(package)_patches += fix_montery_include.patch
1717
$(package)_patches += fix_android_jni_static.patch
1818
$(package)_patches += dont_hardcode_pwd.patch
1919
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
20-
$(package)_patches += fix_limits_header.patch
2120
$(package)_patches += use_android_ndk23.patch
2221
$(package)_patches += rcc_hardcode_timestamp.patch
2322
$(package)_patches += duplicate_lcqpafonts.patch
2423
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
2524

2625
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
27-
$(package)_qttranslations_sha256_hash=5d7869f670a135ad0986e266813b9dd5bbae2b09577338f9cdf8904d4af52db0
26+
$(package)_qttranslations_sha256_hash=c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e
2827

2928
$(package)_qttools_file_name=qttools-$($(package)_suffix)
30-
$(package)_qttools_sha256_hash=463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d
29+
$(package)_qttools_sha256_hash=6d0778b71b2742cb527561791d1d3d255366163d54a10f78c683a398f09ffc6c
3130

3231
$(package)_extra_sources = $($(package)_qttranslations_file_name)
3332
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -248,7 +247,6 @@ define $(package)_preprocess_cmds
248247
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
249248
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
250249
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
251-
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
252250
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
253251
patch -p1 -i $($(package)_patch_dir)/use_android_ndk23.patch && \
254252
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \

depends/patches/qt/dont_hardcode_x86_64.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul
7373
index 92a9112bca6..d888731ec8d 100644
7474
--- old/qtbase/mkspecs/features/mac/default_post.prf
7575
+++ new/qtbase/mkspecs/features/mac/default_post.prf
76-
@@ -90,6 +90,11 @@ app_extension_api_only {
76+
@@ -95,6 +95,11 @@ app_extension_api_only {
7777
QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
7878
}
7979

@@ -85,7 +85,7 @@ index 92a9112bca6..d888731ec8d 100644
8585
macx-xcode {
8686
qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
8787
!isEmpty(QMAKE_PKGINFO_TYPEINFO): \
88-
@@ -145,9 +150,6 @@ macx-xcode {
88+
@@ -150,9 +155,6 @@ macx-xcode {
8989
simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
9090
VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
9191

depends/patches/qt/fix_android_jni_static.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
22
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
3-
@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
3+
@@ -943,6 +943,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
44
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
55
return -1;
66
}

depends/patches/qt/fix_limits_header.patch

Lines changed: 0 additions & 33 deletions
This file was deleted.

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
3030
| [Fontconfig](../depends/packages/fontconfig.mk) | [link](https://www.freedesktop.org/wiki/Software/fontconfig/) | [2.12.6](https://github.com/bitcoin/bitcoin/pull/23495) | 2.6 | Yes |
3131
| [FreeType](../depends/packages/freetype.mk) | [link](https://freetype.org) | [2.11.0](https://github.com/bitcoin/bitcoin/commit/01544dd78ccc0b0474571da854e27adef97137fb) | 2.3.0 | Yes |
3232
| [qrencode](../depends/packages/qrencode.mk) | [link](https://fukuchi.org/works/qrencode/) | [3.4.4](https://github.com/bitcoin/bitcoin/pull/6373) | | No |
33-
| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.3](https://github.com/bitcoin/bitcoin/pull/24668) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
33+
| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.5](https://github.com/bitcoin/bitcoin/pull/25719) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
3434

3535
### Networking
3636
| Dependency | Releases | Version used | Minimum required | Runtime |

0 commit comments

Comments
 (0)