diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-11-01 09:48:16 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-13 08:56:39 +0000 |
| commit | 3d3ce2afe1937531f5fdc2af56697e93133e6d98 (patch) | |
| tree | 84b1b9675bf6e196c0b09008fd3636e377dac3ab /src/qml/qml/qqmllocale.cpp | |
| parent | cf8e87abaabd2f9aaf643d9563b526a662d3941d (diff) | |
Convert String methods to new calling convention
Change-Id: I6de932817fc26c7a35b004926cd3ca84e42272ad
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index f6aae67548..7acc6fe66a 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -840,10 +840,10 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine) ReturnedValue QQmlLocale::method_localeCompare(const BuiltinFunction *b, CallData *callData) { if (callData->argc() != 1 || (!callData->args[0].isString() && !callData->args[0].as<StringObject>())) - return QV4::StringPrototype::method_localeCompare(b, callData); + return QV4::StringPrototype::method_localeCompare(b, &callData->thisObject, callData->args, callData->argc()); if (!callData->thisObject.isString() && !callData->thisObject.as<StringObject>()) - return QV4::StringPrototype::method_localeCompare(b, callData); + return QV4::StringPrototype::method_localeCompare(b, &callData->thisObject, callData->args, callData->argc()); QString thisString = callData->thisObject.toQStringNoThrow(); QString thatString = callData->args[0].toQStringNoThrow(); |