Skip to content

Commit 12a541e

Browse files
laanwjlaanwj
committed
Merge #8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli) 59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli) 6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli) f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake) f25209a depends: bump OSX toolchain (Cory Fields)
2 parents 377d131 + 2759597 commit 12a541e

File tree

10 files changed

+134
-71
lines changed

10 files changed

+134
-71
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
- CCACHE_TEMPDIR=/tmp/.ccache-temp
2323
- CCACHE_COMPRESS=1
2424
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
25-
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
25+
- SDK_URL=https://bitcoin.jonasschnelli.ch/sdks
2626
- PYTHON_DEBUG=1
2727
- WINEDEBUG=fixme-all
2828
matrix:
@@ -39,7 +39,7 @@ env:
3939
# No wallet
4040
- HOST=x86_64-unknown-linux-gnu PACKAGES=" openjdk-7-jre-headless python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
4141
# Cross-Mac
42-
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
42+
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.11 GOAL="deploy"
4343

4444
before_install:
4545
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")

‎build-aux/m4/bitcoin_qt.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,10 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
342342
elif test x$TARGET_OS = xdarwin; then
343343
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
344344
fi
345+
else
346+
if ${PKG_CONFIG} --exists "Qt5Core >= 5.6" 2>/dev/null; then
347+
QT_LIBS="-lQt5PlatformSupport $QT_LIBS"
348+
fi
345349
fi
346350
])
347351
else

‎contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ remotes:
3131
- "url": "https://github.com/bitcoin/bitcoin.git"
3232
"dir": "bitcoin"
3333
files:
34-
- "MacOSX10.9.sdk.tar.gz"
34+
- "MacOSX10.11.sdk.tar.gz"
3535
script: |
3636
WRAP_DIR=$HOME/wrapped
3737
HOSTS="x86_64-apple-darwin11"
@@ -87,7 +87,7 @@ script: |
8787
BASEPREFIX=`pwd`/depends
8888
8989
mkdir -p ${BASEPREFIX}/SDKs
90-
tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.9.sdk.tar.gz
90+
tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
9191
9292
# Build dependencies for each host
9393
for i in $HOSTS; do

‎depends/hosts/darwin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OSX_MIN_VERSION=10.7
2-
OSX_SDK_VERSION=10.9
2+
OSX_SDK_VERSION=10.11
33
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
4-
LD64_VERSION=241.9
4+
LD64_VERSION=253.9
55
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
66
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++
77

‎depends/packages/native_cctools.mk

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package=native_cctools
2-
$(package)_version=ee31ae567931c426136c94aad457c7b51d844beb
2+
$(package)_version=807d6fd1be5d2224872e381870c0a75387fe05e6
33
$(package)_download_path=https://github.com/theuni/cctools-port/archive
44
$(package)_file_name=$($(package)_version).tar.gz
5-
$(package)_sha256_hash=ef107e6ab1b3994cb22e14f4f5c59ea0c0b5a988e6b21d42ed9616b018bbcbf9
5+
$(package)_sha256_hash=a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
66
$(package)_build_subdir=cctools
7-
$(package)_clang_version=3.3
7+
$(package)_clang_version=3.7.1
88
$(package)_clang_download_path=http://llvm.org/releases/$($(package)_clang_version)
9-
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-amd64-Ubuntu-12.04.2.tar.gz
10-
$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-amd64-Ubuntu-12.04.2.tar.gz
11-
$(package)_clang_sha256_hash=60d8f69f032d62ef61bf527857ebb933741ec3352d4d328c5516aa520662dab7
9+
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
10+
$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
11+
$(package)_clang_sha256_hash=99b28a6b48e793705228a390471991386daa33a9717cd9ca007fcdde69608fd9
1212
$(package)_extra_sources=$($(package)_clang_file_name)
1313

1414
define $(package)_fetch_cmds
@@ -23,14 +23,15 @@ define $(package)_extract_cmds
2323
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2424
mkdir -p toolchain/bin toolchain/lib/clang/3.5/include && \
2525
tar --strip-components=1 -C toolchain -xf $($(package)_source_dir)/$($(package)_clang_file_name) && \
26+
rm -f toolchain/lib/libc++abi.so* && \
2627
echo "#!/bin/sh" > toolchain/bin/$(host)-dsymutil && \
2728
echo "exit 0" >> toolchain/bin/$(host)-dsymutil && \
2829
chmod +x toolchain/bin/$(host)-dsymutil && \
2930
tar --strip-components=1 -xf $($(package)_source)
3031
endef
3132

3233
define $(package)_set_vars
33-
$(package)_config_opts=--target=$(host) --disable-libuuid
34+
$(package)_config_opts=--target=$(host) --disable-lto-support
3435
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
3536
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
3637
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
@@ -53,10 +54,11 @@ define $(package)_stage_cmds
5354
cd $($(package)_extract_dir)/toolchain && \
5455
mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_clang_version)/include && \
5556
mkdir -p $($(package)_staging_prefix_dir)/bin $($(package)_staging_prefix_dir)/include && \
56-
cp -P bin/clang bin/clang++ $($(package)_staging_prefix_dir)/bin/ &&\
57+
cp bin/clang $($(package)_staging_prefix_dir)/bin/ &&\
58+
cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin/ &&\
5759
cp lib/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \
5860
cp -rf lib/clang/$($(package)_clang_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_clang_version)/include/ && \
59-
cp bin/$(host)-dsymutil $($(package)_staging_prefix_dir)/bin && \
61+
cp bin/llvm-dsymutil $($(package)_staging_prefix_dir)/bin/$(host)-dsymutil && \
6062
if `test -d include/c++/`; then cp -rf include/c++/ $($(package)_staging_prefix_dir)/include/; fi && \
6163
if `test -d lib/c++/`; then cp -rf lib/c++/ $($(package)_staging_prefix_dir)/lib/; fi
6264
endef

‎depends/packages/openssl.mk

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,42 @@ $(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fce
66

77
define $(package)_set_vars
88
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
9-
$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl no-zlib no-shared no-dso
10-
$(package)_config_opts+=no-krb5 no-camellia no-capieng no-cast no-cms no-dtls1 no-gost no-gmp no-heartbeats no-idea no-jpake no-md2
11-
$(package)_config_opts+=no-mdc2 no-rc5 no-rdrand no-rfc3779 no-rsax no-sctp no-seed no-sha0 no-static_engine no-whirlpool no-rc2 no-rc4 no-ssl2 no-ssl3
9+
$(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
10+
$(package)_config_opts+=no-camellia
11+
$(package)_config_opts+=no-capieng
12+
$(package)_config_opts+=no-cast
13+
$(package)_config_opts+=no-comp
14+
$(package)_config_opts+=no-dso
15+
$(package)_config_opts+=no-dtls1
16+
$(package)_config_opts+=no-ec_nistp_64_gcc_128
17+
$(package)_config_opts+=no-gost
18+
$(package)_config_opts+=no-gmp
19+
$(package)_config_opts+=no-heartbeats
20+
$(package)_config_opts+=no-idea
21+
$(package)_config_opts+=no-jpake
22+
$(package)_config_opts+=no-krb5
23+
$(package)_config_opts+=no-libunbound
24+
$(package)_config_opts+=no-md2
25+
$(package)_config_opts+=no-mdc2
26+
$(package)_config_opts+=no-rc4
27+
$(package)_config_opts+=no-rc5
28+
$(package)_config_opts+=no-rdrand
29+
$(package)_config_opts+=no-rfc3779
30+
$(package)_config_opts+=no-rsax
31+
$(package)_config_opts+=no-sctp
32+
$(package)_config_opts+=no-seed
33+
$(package)_config_opts+=no-sha0
34+
$(package)_config_opts+=no-shared
35+
$(package)_config_opts+=no-ssl-trace
36+
$(package)_config_opts+=no-ssl2
37+
$(package)_config_opts+=no-ssl3
38+
$(package)_config_opts+=no-static_engine
39+
$(package)_config_opts+=no-store
40+
$(package)_config_opts+=no-unit-test
41+
$(package)_config_opts+=no-weak-ssl-ciphers
42+
$(package)_config_opts+=no-whirlpool
43+
$(package)_config_opts+=no-zlib
44+
$(package)_config_opts+=no-zlib-dynamic
1245
$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
1346
$(package)_config_opts_linux=-fPIC -Wa,--noexecstack
1447
$(package)_config_opts_x86_64_linux=linux-x86_64

‎depends/packages/qt.mk

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,56 @@
11
PACKAGE=qt
2-
$(package)_version=5.5.0
3-
$(package)_download_path=http://download.qt.io/official_releases/qt/5.5/$($(package)_version)/submodules
2+
$(package)_version=5.6.1
3+
$(package)_download_path=http://download.qt.io/official_releases/qt/5.6/$($(package)_version)/submodules
44
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=7e82b1318f88e56a2a9376e069aa608d4fd96b48cb0e1b880ae658b0a1af0561
6+
$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
77
$(package)_dependencies=openssl
8-
$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
8+
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
11-
$(package)_patches=mac-qmake.conf fix-xcb-include-order.patch mingw-uuidof.patch pidlist_absolute.patch
11+
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
1212

1313
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
14-
$(package)_qttranslations_sha256_hash=c4bd6db6e426965c6f8824c54e81f68bbd61e2bae1bcadc328c6e81c45902a0d
14+
$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
15+
1516

1617
$(package)_qttools_file_name=qttools-$($(package)_suffix)
17-
$(package)_qttools_sha256_hash=d9e06bd19ecc86afba5e95d45a906d1bc1ad579aa70001e36143c1aaf695bdd6
18+
$(package)_qttools_sha256_hash=e0f845de28c31230dfa428f0190ccb3b91d1fc02481b1f064698ae4ef8376aa1
1819

1920
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2021
$(package)_extra_sources += $($(package)_qttools_file_name)
2122

2223
define $(package)_set_vars
2324
$(package)_config_opts_release = -release
2425
$(package)_config_opts_debug = -debug
25-
$(package)_config_opts += -opensource -confirm-license
26+
$(package)_config_opts += -bindir $(build_prefix)/bin
27+
$(package)_config_opts += -c++11
28+
$(package)_config_opts += -confirm-license
29+
$(package)_config_opts += -dbus-runtime
30+
$(package)_config_opts += -hostprefix $(build_prefix)
31+
$(package)_config_opts += -no-alsa
2632
$(package)_config_opts += -no-audio-backend
33+
$(package)_config_opts += -no-cups
34+
$(package)_config_opts += -no-egl
35+
$(package)_config_opts += -no-eglfs
36+
$(package)_config_opts += -no-feature-style-windowsmobile
37+
$(package)_config_opts += -no-feature-style-windowsce
38+
$(package)_config_opts += -no-freetype
39+
$(package)_config_opts += -no-gif
2740
$(package)_config_opts += -no-glib
41+
$(package)_config_opts += -no-gstreamer
2842
$(package)_config_opts += -no-icu
29-
$(package)_config_opts += -no-cups
3043
$(package)_config_opts += -no-iconv
31-
$(package)_config_opts += -no-gif
32-
$(package)_config_opts += -no-freetype
44+
$(package)_config_opts += -no-kms
45+
$(package)_config_opts += -no-linuxfb
46+
$(package)_config_opts += -no-libudev
47+
$(package)_config_opts += -no-mitshm
48+
$(package)_config_opts += -no-mtdev
3349
$(package)_config_opts += -no-nis
34-
$(package)_config_opts += -pch
50+
$(package)_config_opts += -no-pulseaudio
51+
$(package)_config_opts += -no-openvg
52+
$(package)_config_opts += -no-reduce-relocations
3553
$(package)_config_opts += -no-qml-debug
36-
$(package)_config_opts += -nomake examples
37-
$(package)_config_opts += -nomake tests
38-
$(package)_config_opts += -no-feature-style-windowsmobile
39-
$(package)_config_opts += -no-feature-style-windowsce
4054
$(package)_config_opts += -no-sql-db2
4155
$(package)_config_opts += -no-sql-ibase
4256
$(package)_config_opts += -no-sql-oci
@@ -46,36 +60,25 @@ $(package)_config_opts += -no-sql-odbc
4660
$(package)_config_opts += -no-sql-psql
4761
$(package)_config_opts += -no-sql-sqlite
4862
$(package)_config_opts += -no-sql-sqlite2
49-
$(package)_config_opts += -prefix $(host_prefix)
50-
$(package)_config_opts += -hostprefix $(build_prefix)
51-
$(package)_config_opts += -bindir $(build_prefix)/bin
52-
$(package)_config_opts += -c++11
63+
$(package)_config_opts += -no-use-gold-linker
64+
$(package)_config_opts += -no-xinput2
65+
$(package)_config_opts += -no-xrender
66+
$(package)_config_opts += -nomake examples
67+
$(package)_config_opts += -nomake tests
68+
$(package)_config_opts += -opensource
5369
$(package)_config_opts += -openssl-linked
54-
$(package)_config_opts += -v
55-
$(package)_config_opts += -static
56-
$(package)_config_opts += -silent
70+
$(package)_config_opts += -optimized-qmake
71+
$(package)_config_opts += -pch
5772
$(package)_config_opts += -pkg-config
73+
$(package)_config_opts += -prefix $(host_prefix)
5874
$(package)_config_opts += -qt-libpng
5975
$(package)_config_opts += -qt-libjpeg
60-
$(package)_config_opts += -qt-zlib
6176
$(package)_config_opts += -qt-pcre
62-
$(package)_config_opts += -no-pulseaudio
63-
$(package)_config_opts += -no-openvg
64-
$(package)_config_opts += -no-xrender
65-
$(package)_config_opts += -no-alsa
66-
$(package)_config_opts += -no-mtdev
67-
$(package)_config_opts += -no-gstreamer
68-
$(package)_config_opts += -no-mitshm
69-
$(package)_config_opts += -no-kms
70-
$(package)_config_opts += -no-reduce-relocations
71-
$(package)_config_opts += -no-egl
72-
$(package)_config_opts += -no-eglfs
73-
$(package)_config_opts += -no-linuxfb
74-
$(package)_config_opts += -no-xinput2
75-
$(package)_config_opts += -no-libudev
76-
$(package)_config_opts += -no-use-gold-linker
77+
$(package)_config_opts += -qt-zlib
7778
$(package)_config_opts += -reduce-exports
78-
$(package)_config_opts += -optimized-qmake
79+
$(package)_config_opts += -static
80+
$(package)_config_opts += -silent
81+
$(package)_config_opts += -v
7982

8083
ifneq ($(build_os),darwin)
8184
$(package)_config_opts_darwin = -xplatform macx-clang-linux
@@ -119,19 +122,22 @@ define $(package)_extract_cmds
119122
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
120123
endef
121124

125+
122126
define $(package)_preprocess_cmds
123127
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
124128
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
125129
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
126130
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
131+
sed -i.old 's/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0)/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft)/' qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm && \
127132
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
128133
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
129134
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
130135
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
131136
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
132-
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
133137
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
134138
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
139+
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
140+
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
135141
echo "QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
136142
echo "QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
137143
echo "QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \

‎depends/patches/qt/fix-xcb-include-order.patch

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
22
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
3-
@@ -94,8 +94,6 @@
4-
3+
@@ -74,8 +74,6 @@
4+
55
DEFINES += $$QMAKE_DEFINES_XCB
66
LIBS += $$QMAKE_LIBS_XCB
77
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
88
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
9-
9+
1010
CONFIG += qpa/genericunixfontdatabase
11-
12-
@@ -104,7 +102,8 @@
11+
12+
@@ -87,7 +85,8 @@
1313
contains(QT_CONFIG, xcb-qt) {
1414
DEFINES += XCB_USE_RENDER
1515
XCB_DIR = ../../../3rdparty/xcb
@@ -18,28 +18,32 @@
1818
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
1919
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
2020
} else {
21-
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms
21+
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
2222
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000
2323
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000
24-
@@ -8,7 +8,8 @@
25-
24+
@@ -9,7 +9,8 @@
25+
2626
XCB_DIR = ../../../../3rdparty/xcb
27-
27+
2828
-INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude
2929
+QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
3030
+QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/include/xcb -I$$XCB_DIR/sysinclude
31-
31+
3232
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
3333
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
3434
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400
3535
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400
36-
@@ -11,3 +11,9 @@
36+
@@ -6,6 +6,13 @@
3737
qxcbmain.cpp
3838
OTHER_FILES += xcb.json README
39-
39+
4040
+contains(QT_CONFIG, xcb-qt) {
4141
+ DEFINES += XCB_USE_RENDER
4242
+ XCB_DIR = ../../../3rdparty/xcb
4343
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
4444
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
4545
+}
46+
+
47+
PLUGIN_TYPE = platforms
48+
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin
49+
!equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -

‎depends/patches/qt/fix_qt_pkgconfig.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- old/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
2+
+++ new/qtbase/mkspecs/features/qt_module.prf 2016-03-17 02:06:42.705930685 +0000
3+
@@ -244,7 +244,7 @@
4+
load(qt_targets)
5+
6+
# this builds on top of qt_common
7+
-!internal_module:!lib_bundle:if(unix|mingw) {
8+
+unix|mingw {
9+
CONFIG += create_pc
10+
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
11+
host_build: \

‎src/qt/bitcoin.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,9 @@ int main(int argc, char *argv[])
533533
// Generate high-dpi pixmaps
534534
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
535535
#endif
536+
#if QT_VERSION >= 0x050600
537+
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
538+
#endif
536539
#ifdef Q_OS_MAC
537540
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
538541
#endif

0 commit comments

Comments
 (0)