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

Change-Id: I1779d4d77ecfeadb6449e7fa99c9b9d5004d060f

1 files changed, 10 insertions, 0 deletions

diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index aeca32268..dd3756254 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
@@ -104,8 +104,18 @@ struct ParameterInfo
     {
         return name < otherName;
     }
+
+    bool operator<(const ParameterInfo &other) const
+    {
+        return name < other.name;
+    }
 };
 
+inline bool operator<(const QString &otherName, const ParameterInfo &pi)
+{
+    return otherName < pi.name;
+}
+
 typedef QVarLengthArray<ParameterInfo, 16> ParameterInfoList;
 
 Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList,