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

Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206

2 files changed, 13 insertions, 2 deletions

diff --git a/sources/shiboken2/tests/libsample/sample.cpp b/sources/shiboken2/tests/libsample/sample.cpp
index fa1e1fda3..850674bd9 100644
--- a/sources/shiboken2/tests/libsample/sample.cpp
+++ b/sources/shiboken2/tests/libsample/sample.cpp
@@ -28,12 +28,20 @@
 
 #include "sample.h"
 
-sample::sample::sample(int value) : m_value(value)
+namespace sample
+{
+
+sample::sample(int value) : m_value(value)
 {
 }
 
-int sample::sample::value() const
+int sample::value() const
 {
     return m_value;
 }
 
+bool operator==(const sample&s1, const sample&s2)
+{
+    return s1.value() == s2.value();
+}
+} // namespace sample
diff --git a/sources/shiboken2/tests/libsample/sample.h b/sources/shiboken2/tests/libsample/sample.h
index 46e3d0d1a..68b54e067 100644
--- a/sources/shiboken2/tests/libsample/sample.h
+++ b/sources/shiboken2/tests/libsample/sample.h
@@ -43,6 +43,9 @@ namespace sample
     private:
         int m_value;
     };
+
+    // shiboken must not generate richcompare for namespace sample
+    LIBSAMPLE_API bool operator==(const sample&s1, const sample&s2);
 }
 
 #endif