diff options
| author | Simon Hausmann <[email protected]> | 2018-10-18 09:29:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2018-10-23 17:23:13 +0000 |
| commit | 8a2c182d5941a1d00ac9f7414d1508b7f959d6f3 (patch) | |
| tree | 415f85f4d2fd483901cfd9d1d2b71537ae952639 /src/qml/jsruntime/qv4promiseobject_p.h | |
| parent | ff11568f37999c62e7683b1c21861be63f14567c (diff) | |
Fix erroneous enum conflict warnings
Permit enums from sub-classes to overwrite enums from super-classes, but
keep warnings about clashes within a class, provided that the values
differ. The last condition relates to the declaration of enums and a
subsequent declaration of Q_FLAGS, which appear to have the same keys
and values in the meta-object system.
Task-number: QTBUG-71184
Change-Id: I2a00dc90e3714fc4c6fe8add5a6268b88bb9e745
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Rainer Keller <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4promiseobject_p.h')
0 files changed, 0 insertions, 0 deletions