Skip to content

Commit 2063b01

Browse files
CryptoCentricCryptoCentric
authored
Merge pull request dashpay#27 from absolute-community/V12.2.5PR14.1QT5.7
V12.2.5 PR14.1 QT5.7
2 parents fc9b7b9 + 7a137d7 commit 2063b01

File tree

10 files changed

+87
-59
lines changed

10 files changed

+87
-59
lines changed

‎build-aux/m4/bitcoin_qt.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
dnl Copyright (c) 2013-2016 The Bitcoin Core developers
2+
dnl Distributed under the MIT software license, see the accompanying
3+
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.
14
dnl Helper for cases where a qt dependency is not met.
25
dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
36
AC_DEFUN([BITCOIN_QT_FAIL],[
@@ -484,8 +487,8 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
484487
])
485488
486489
BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
487-
BITCOIN_QT_CHECK(AC_CHECK_LIB([png] ,[main],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
488-
BITCOIN_QT_CHECK(AC_CHECK_LIB([jpeg] ,[main],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
490+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
491+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
489492
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
490493
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
491494
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXCore not found)))

‎depends/config.site.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ LDFLAGS="-L$depends_prefix/lib $LDFLAGS"
6666
CC="@CC@"
6767
CXX="@CXX@"
6868
OBJC="${CC}"
69-
OBJCXX="${CXX}"
7069
CCACHE=$depends_prefix/native/bin/ccache
7170
PYTHONPATH=$depends_prefix/native/lib/python/dist-packages:$PYTHONPATH
7271

‎depends/packages/packages.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
packages:=boost openssl libevent
2-
darwin_packages:=zeromq
3-
linux_packages:=zeromq
4-
native_packages := native_ccache native_comparisontool
1+
packages:=boost openssl libevent zeromq
2+
native_packages := native_ccache
53

64
qt_native_packages = native_protobuf
7-
qt_packages = qrencode protobuf
5+
qt_packages = qrencode protobuf zlib
86

97
qt_x86_64_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
108
qt_i686_linux_packages:=$(qt_x86_64_linux_packages)

‎depends/packages/qt.mk

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
PACKAGE=qt
2-
$(package)_version=5.6.1
3-
$(package)_download_path=http://download.qt.io/official_releases/qt/5.6/$($(package)_version)/submodules
2+
$(package)_version=5.7.1
3+
$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules
44
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
7-
$(package)_dependencies=openssl
6+
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
7+
$(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
1111
$(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=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
14+
$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
1515

1616
$(package)_qttools_file_name=qttools-$($(package)_suffix)
17-
$(package)_qttools_sha256_hash=e0f845de28c31230dfa428f0190ccb3b91d1fc02481b1f064698ae4ef8376aa1
17+
$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
1818

1919
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2020
$(package)_extra_sources += $($(package)_qttools_file_name)
2121

2222
define $(package)_set_vars
2323
$(package)_config_opts_release = -release
24-
$(package)_config_opts_debug = -debug
24+
$(package)_config_opts_debug = -debug
2525
$(package)_config_opts += -bindir $(build_prefix)/bin
26-
$(package)_config_opts += -c++11
26+
$(package)_config_opts += -c++std c++11
2727
$(package)_config_opts += -confirm-license
2828
$(package)_config_opts += -dbus-runtime
2929
$(package)_config_opts += -hostprefix $(build_prefix)
@@ -45,7 +45,6 @@ $(package)_config_opts += -no-linuxfb
4545
$(package)_config_opts += -no-libudev
4646
$(package)_config_opts += -no-mitshm
4747
$(package)_config_opts += -no-mtdev
48-
$(package)_config_opts += -no-nis
4948
$(package)_config_opts += -no-pulseaudio
5049
$(package)_config_opts += -no-openvg
5150
$(package)_config_opts += -no-reduce-relocations
@@ -73,11 +72,13 @@ $(package)_config_opts += -prefix $(host_prefix)
7372
$(package)_config_opts += -qt-libpng
7473
$(package)_config_opts += -qt-libjpeg
7574
$(package)_config_opts += -qt-pcre
76-
$(package)_config_opts += -qt-zlib
75+
$(package)_config_opts += -system-zlib
7776
$(package)_config_opts += -reduce-exports
7877
$(package)_config_opts += -static
7978
$(package)_config_opts += -silent
8079
$(package)_config_opts += -v
80+
$(package)_config_opts += -no-feature-printer
81+
$(package)_config_opts += -no-feature-printdialog
8182

8283
ifneq ($(build_os),darwin)
8384
$(package)_config_opts_darwin = -xplatform macx-clang-linux
@@ -123,6 +124,7 @@ endef
123124

124125
define $(package)_preprocess_cmds
125126
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
127+
sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
126128
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
127129
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
128130
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
@@ -136,19 +138,21 @@ define $(package)_preprocess_cmds
136138
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
137139
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
138140
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
139-
echo "QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
140-
echo "QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
141-
echo "QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
142-
sed -i.old "s|QMAKE_CFLAGS = |QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
143-
sed -i.old "s|QMAKE_LFLAGS = |QMAKE_LFLAGS = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
144-
sed -i.old "s|QMAKE_CXXFLAGS = |QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
141+
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
142+
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
143+
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
144+
sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
145+
sed -i.old "s|QMAKE_LFLAGS = |!host_build: QMAKE_LFLAGS = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
146+
sed -i.old "s|QMAKE_CXXFLAGS = |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
145147
endef
146148

147149
define $(package)_config_cmds
148150
export PKG_CONFIG_SYSROOT_DIR=/ && \
149151
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
150152
export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \
151153
./configure $($(package)_config_opts) && \
154+
echo "host_build: QT_CONFIG ~= s/system-zlib/zlib" >> mkspecs/qconfig.pri && \
155+
echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
152156
$(MAKE) sub-src-clean && \
153157
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
154158
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. &&\

‎depends/packages/zlib.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package=zlib
2+
$(package)_version=1.2.11
3+
$(package)_download_path=http://www.zlib.net
4+
$(package)_file_name=$(package)-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
6+
7+
define $(package)_set_vars
8+
$(package)_build_opts= CC="$($(package)_cc)"
9+
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
10+
$(package)_build_opts+=AR="$($(package)_ar)"
11+
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
12+
endef
13+
14+
define $(package)_config_cmds
15+
./configure --static --prefix=$(host_prefix)
16+
endef
17+
18+
define $(package)_build_cmds
19+
$(MAKE) $($(package)_build_opts) libz.a
20+
endef
21+
22+
define $(package)_stage_cmds
23+
$(MAKE) DESTDIR=$($(package)_staging_dir) install $($(package)_build_opts)
24+
endef
25+

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:06:42.705930685 +0000
2-
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17 02:08:41.281926351 +0000
3-
@@ -74,8 +74,6 @@
1+
--- old/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
2+
+++ new/qtbase/src/plugins/platforms/xcb/xcb_qpa_lib.pro 2015-03-17
3+
@@ -76,8 +76,6 @@
44

55

66
DEFINES += $$QMAKE_DEFINES_XCB
@@ -12,18 +12,18 @@
1212
CONFIG += qpa/genericunixfontdatabase
1313

1414

15-
@@ -87,7 +85,8 @@
15+
@@ -89,7 +87,8 @@
1616
contains(QT_CONFIG, xcb-qt) {
1717
DEFINES += XCB_USE_RENDER
1818
XCB_DIR = ../../../3rdparty/xcb
1919
- INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude
2020
+ QMAKE_CFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
2121
+ QMAKE_CXXFLAGS += -I$$XCB_DIR/include -I$$XCB_DIR/sysinclude $$QMAKE_CFLAGS_XCB
22-
LIBS += -lxcb -L$$OUT_PWD/xcb-static -lxcb-static
22+
LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix()
2323
} else {
2424
LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama
25-
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:07:04.641929383 +0000
26-
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro 2015-03-17 02:10:15.485922059 +0000
25+
--- old/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
26+
+++ new/qtbase/src/plugins/platforms/xcb/xcb-static/xcb-static.pro
2727
@@ -9,7 +9,8 @@
2828

2929

@@ -37,8 +37,8 @@
3737

3838
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB
3939
QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
40-
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:02:59.530038830 -0400
41-
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro 2015-07-24 16:01:22.106037459 -0400
40+
--- old/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
41+
+++ new/qtbase/src/plugins/platforms/xcb/xcb-plugin.pro
4242
@@ -6,6 +6,13 @@
4343
qxcbmain.cpp
4444
OTHER_FILES += xcb.json README

‎depends/patches/qt/fix_qt_pkgconfig.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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 @@
1+
--- old/qtbase/mkspecs/features/qt_module.prf
2+
+++ new/qtbase/mkspecs/features/qt_module.prf
3+
@@ -245,7 +245,7 @@
44
load(qt_targets)
55

66
# this builds on top of qt_common

‎depends/patches/qt/mac-qmake.conf

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
MAKEFILE_GENERATOR = UNIX
22
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname
3-
DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG
43
QMAKE_INCREMENTAL_STYLE = sublib
54
include(../common/macx.conf)
65
include(../common/gcc-base-mac.conf)
@@ -11,14 +10,14 @@ QMAKE_XCODE_VERSION=4.3
1110
QMAKE_XCODE_DEVELOPER_PATH=/Developer
1211
QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION}
1312
QMAKE_MAC_SDK=macosx
14-
QMAKE_MAC_SDK.macosx.path = $${MAC_SDK_PATH}
13+
QMAKE_MAC_SDK.macosx.Path = $${MAC_SDK_PATH}
1514
QMAKE_MAC_SDK.macosx.platform_name = macosx
16-
QMAKE_MAC_SDK.macosx.version = $${MAC_SDK_VERSION}
17-
QMAKE_MAC_SDK.macosx.platform_path = /phony
18-
QMAKE_CFLAGS += -target $${MAC_TARGET}
19-
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
20-
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
21-
QMAKE_LFLAGS += -target $${MAC_TARGET} -mlinker-version=$${MAC_LD64_VERSION}
15+
QMAKE_MAC_SDK.macosx.SDKVersion = $${MAC_SDK_VERSION}
16+
QMAKE_MAC_SDK.macosx.PlatformPath = /phony
17+
!host_build: QMAKE_CFLAGS += -target $${MAC_TARGET}
18+
!host_build: QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
19+
!host_build: QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
20+
!host_build: QMAKE_LFLAGS += -target $${MAC_TARGET} -mlinker-version=$${MAC_LD64_VERSION}
2221
QMAKE_AR = $${CROSS_COMPILE}ar cq
2322
QMAKE_RANLIB=$${CROSS_COMPILE}ranlib
2423
QMAKE_LIBTOOL=$${CROSS_COMPILE}libtool

‎depends/patches/qt/mingw-uuidof.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:40:20.956781548 -0400
2-
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp 2015-06-20 17:29:32.052772416 -0400
3-
@@ -69,7 +69,7 @@
1+
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
2+
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.cpp
3+
@@ -77,7 +77,7 @@
44
#include <stdlib.h>
55
#include <stdio.h>
66
#include <windowsx.h>
@@ -9,25 +9,25 @@
99
# include <comdef.h>
1010
#endif
1111

12-
@@ -762,7 +762,7 @@
13-
HWND_MESSAGE, NULL, (HINSTANCE)GetModuleHandle(0), NULL);
12+
@@ -814,7 +814,7 @@
13+
HWND_MESSAGE, NULL, static_cast<HINSTANCE>(GetModuleHandle(0)), NULL);
1414
}
1515

1616
-#ifndef Q_OS_WINCE
1717
+#if !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
1818
// Re-engineered from the inline function _com_error::ErrorMessage().
1919
// We cannot use it directly since it uses swprintf_s(), which is not
2020
// present in the MSVCRT.DLL found on Windows XP (QTBUG-35617).
21-
@@ -781,7 +781,7 @@
22-
return QStringLiteral("IDispatch error #") + QString::number(wCode);
23-
return QStringLiteral("Unknown error 0x0") + QString::number(comError.Error(), 16);
21+
@@ -833,7 +833,7 @@
22+
return QString::asprintf("IDispatch error #%u", uint(wCode));
23+
return QString::asprintf("Unknown error 0x0%x", uint(comError.Error()));
2424
}
2525
-#endif // !Q_OS_WINCE
2626
+#endif // !defined(Q_OS_WINCE) && (!defined(USE___UUIDOF) || (defined(USE___UUIDOF) && USE___UUIDOF == 1))
2727

2828
/*!
2929
\brief Common COM error strings.
30-
@@ -846,12 +846,12 @@
30+
@@ -901,12 +901,12 @@
3131
default:
3232
break;
3333
}

‎depends/patches/qt/pidlist_absolute.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
2-
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h 2015-06-29 22:04:40.000000000 +0200
3-
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h 2015-11-01 12:55:59.751234846 +0100
4-
@@ -124,10 +124,18 @@
2+
--- old/qtbase/src/plugins/platforms/windows/qwindowscontext.h
3+
+++ new/qtbase/src/plugins/platforms/windows/qwindowscontext.h
4+
@@ -136,10 +136,18 @@
55
inline void init();
66

77
typedef HRESULT (WINAPI *SHCreateItemFromParsingName)(PCWSTR, IBindCtx *, const GUID&, void **);
@@ -21,9 +21,9 @@ diff -dur old/qtbase/src/plugins/platforms/windows/qwindowscontext.h new/qtbase/
2121
SHCreateItemFromParsingName sHCreateItemFromParsingName;
2222
SHGetKnownFolderIDList sHGetKnownFolderIDList;
2323
diff -dur old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
24-
--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp 2015-06-29 22:04:40.000000000 +0200
25-
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp 2015-11-01 13:41:09.503149772 +0100
26-
@@ -1008,7 +1008,11 @@
24+
--- old/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
25+
+++ new/qtbase/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
26+
@@ -1016,7 +1016,11 @@
2727
qWarning() << __FUNCTION__ << ": Invalid CLSID: " << url.path();
2828
return Q_NULLPTR;
2929
}

0 commit comments

Comments
 (0)