diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /tests/auto/other/compiler/tst_compiler.cpp | |
parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'tests/auto/other/compiler/tst_compiler.cpp')
-rw-r--r-- | tests/auto/other/compiler/tst_compiler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp index 55fab00156..121d731757 100644 --- a/tests/auto/other/compiler/tst_compiler.cpp +++ b/tests/auto/other/compiler/tst_compiler.cpp @@ -870,11 +870,14 @@ void tst_Compiler::cxx11_default_members() }; class DefaultMembersChild: public DefaultMembers { + DefaultMembersChild(const DefaultMembersChild &) : DefaultMembers() {} public: DefaultMembersChild():DefaultMembers() {}; + DefaultMembersChild(DefaultMembersChild &&) = default; }; DefaultMembersChild dm; - Q_UNUSED(dm); + DefaultMembersChild dm2 = std::move(dm); + Q_UNUSED(dm2); #endif } |