Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	tests/auto/testlib/selftests/generate_expected_output.py

Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7

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
 }