diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:28:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:28:16 +0200 |
| commit | 37be54043503fa63d03de511cbfb2d767f9c7bc5 (patch) | |
| tree | 11f7ddf3585b17e865fe8232c44dc3ce9041253c | |
| parent | ae6c0fe18fff0bedced9800b11940f396b66596d (diff) | |
| parent | 83d506042d7c4475578c860d7a9ccd07299da026 (diff) | |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: If26222ac0c8122825468a5b7cf71ce95579fbad2
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/knx/ssl/qsslsocket_openssl_symbols_p.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 7e57b5b..48a283a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.12.4 diff --git a/src/knx/ssl/qsslsocket_openssl_symbols_p.h b/src/knx/ssl/qsslsocket_openssl_symbols_p.h index 5bbbff8..49a7e95 100644 --- a/src/knx/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/knx/ssl/qsslsocket_openssl_symbols_p.h @@ -253,6 +253,10 @@ QT_BEGIN_NAMESPACE # define DEFINEFUNC7(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, err, funcret) \ ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7) { funcret func(a, b, c, d, e, f, g); } +// ret func(arg1, arg2, arg3, arg4, arg6, arg7, arg8) +# define DEFINEFUNC8(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, arg8, h, err, funcret) \ + ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) { funcret func(a, b, c, d, e, f, g, h); } + // ret func(arg1, arg2, arg3, arg4, arg6, arg7, arg8, arg9) # define DEFINEFUNC9(ret, func, arg1, a, arg2, b, arg3, c, arg4, d, arg5, e, arg6, f, arg7, g, arg8, h, arg9, i, err, funcret) \ ret q_##func(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) { funcret func(a, b, c, d, e, f, g, h, i); } |