diff options
author | Kai Köhne <kai.koehne@qt.io> | 2021-06-21 14:38:40 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2021-06-21 17:00:13 +0200 |
commit | 207f18477482fd3fb799a1b4a6f0ccc4cd624d0f (patch) | |
tree | b2a3de31e88d0ae12d41d19fa79bce6b5c5da153 | |
parent | e7282d572322dbe2eb9124a8924788fc218d5c5c (diff) |
Encapsulate raw string with QLatin1String
Fixes
C4996: 'QString::QString': Use fromUtf8, QStringLiteral, or QLatin1String
Pick-to: 5.15 6.2
Change-Id: I1642bcae6ad88ceb0487e227e635fa35f6a0520f
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
-rw-r--r-- | src/remoteobjectsqml/qremoteobjectsqml_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/remoteobjectsqml/qremoteobjectsqml_p.h b/src/remoteobjectsqml/qremoteobjectsqml_p.h index 46c22d0..d56a430 100644 --- a/src/remoteobjectsqml/qremoteobjectsqml_p.h +++ b/src/remoteobjectsqml/qremoteobjectsqml_p.h @@ -92,9 +92,9 @@ public: Q_INVOKABLE QJSValue watch(const QRemoteObjectPendingCall &reply, int timeout = 30000) { if (m_accessiblePromise.isUndefined()) - m_accessiblePromise = qmlEngine(this)->evaluate( + m_accessiblePromise = qmlEngine(this)->evaluate(QLatin1String( "(function() { var obj = {}; obj.promise = new Promise(function(resolve, " - "reject) { obj.resolve = resolve; obj.reject = reject; }); return obj; })"); + "reject) { obj.resolve = resolve; obj.reject = reject; }); return obj; })")); QRemoteObjectPendingCallWatcher *watcher = new QRemoteObjectPendingCallWatcher(reply); @@ -114,7 +114,7 @@ public: } QJSValue v(QLatin1String("timeout")); - i.value().promise.property("reject").call(QJSValueList() << v); + i.value().promise.property(QLatin1String("reject")).call(QJSValueList() << v); delete i.key(); delete i.value().timer; @@ -130,7 +130,7 @@ public: return; } QJSValue v = qmlEngine(this)->toScriptValue(self->returnValue()); - i.value().promise.property("resolve").call(QJSValueList() << v); + i.value().promise.property(QLatin1String("resolve")).call(QJSValueList() << v); delete i.key(); delete i.value().timer; @@ -138,7 +138,7 @@ public: }); response.timer->start(timeout); - return promise.property("promise"); + return promise.property(QLatin1String("promise")); } private: |