diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-12 01:00:38 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-12-12 13:08:25 +0100 |
| commit | 39643ef86e8bc48b8b6cf83ac0ebae7411029030 (patch) | |
| tree | 79277e468160ebc04a65a85c9668dabefbf3ce33 /src/3rdparty | |
| parent | 489d6c28dda51c187c85017e30c1e018420e26ac (diff) | |
| parent | e3446c8225acbaa6a613d6c62e8e2fc58e2b70b0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
Change-Id: Ic1dace832ad4b29023d24808b8617b5dcc915eb5
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index fdb7de51ce..602dbc1b43 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -84,7 +84,8 @@ private: #endif -#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique) +#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique)\ +&& !defined(__cpp_lib_make_unique) namespace std { template<typename T, class ...Args> |