port Qt::escape to Qt 5 toHtmlEscaped

qcad · Feb 19, 2018 · c7189cb · c7189cb
1 parent 13ec6eb
commit c7189cb
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/scripting/ecmaapi/RScriptHandlerEcma.cpp b/src/scripting/ecmaapi/RScriptHandlerEcma.cpp
@@ -1501,6 +1501,11 @@ QScriptValue RScriptHandlerEcma::ecmaQtEscape(QScriptContext* context,
         QScriptEngine* engine) {
     if (context->argumentCount() == 1) {
         QString cppResult = Qt::escape(context->argument(0).toString());
+#if QT_VERSION >= 0x050000
+        cppResult = context->argument(0).toString().toHtmlEscaped();
+#else
+        cppResult = Qt::escape(context->argument(0).toString());
+#endif
         return qScriptValueFromValue(engine, cppResult);
     } else {
         return throwError(