diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-08-04 12:27:02 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-08-05 07:51:51 +0000 |
commit | edb1c204c3bc9ad01ccf7a8abb0e8a02fd89ed72 (patch) | |
tree | 0531a08e8a6df7af2a49b794852eb3023e82634f /src/qml/jsruntime/qv4qobjectwrapper.cpp | |
parent | 48deab9b69afc8d613e2b22dacd138be7c8c51a8 (diff) |
QML: Change the property data flags into a bit field
This will make it easier in follow-up patches to add or remove flags. It
also shrinks the flags, because each type doesn't need its own bit (as
those are mutually exclusive).
Change-Id: I5ba6de5f330eb20c82aa16b4467ed6c952725979
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4qobjectwrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index ce0c7bc04a..074d3bf866 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -1344,7 +1344,7 @@ static const QQmlPropertyData * RelatedMethod(const QQmlObjectOrGadget &object, QByteArray methodName = method.name(); for (int ii = current->overrideIndex - 1; ii >= methodOffset; --ii) { if (methodName == mo->method(ii).name()) { - dummy.setFlags(dummy.getFlags() | QQmlPropertyData::IsOverload); + dummy.setOverload(true); dummy.overrideIndexIsProperty = 0; dummy.overrideIndex = ii; return &dummy; @@ -1865,7 +1865,7 @@ void QObjectMethod::callInternal(CallData *callData, Scope &scope) const const int methodOffset = mo->methodOffset(); for (int ii = d()->index - 1; ii >= methodOffset; --ii) { if (methodName == mo->method(ii).name()) { - method.setFlags(method.getFlags() | QQmlPropertyData::IsOverload); + method.setOverload(true); method.overrideIndexIsProperty = 0; method.overrideIndex = ii; break; |