diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:26 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-30 03:06:26 +0100 |
commit | 5571928b379f71ccfa78e961755d24b4fdff1ab9 (patch) | |
tree | f5261f50d15cd8125a8a4b38e705f9597c376b34 /tests/auto/qscriptvalue/tst_qscriptvalue.cpp | |
parent | 0145e2e4ad12988a3d2789e245289848dc448dbe (diff) | |
parent | ee32a6b5a0ba187606b9ad3cdfcf73cbbc1ce02f (diff) | |
download | qtscript-5571928b379f71ccfa78e961755d24b4fdff1ab9.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I877de1443eb671738a5f4ece19ac49feb4c062f5
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.cpp')
-rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 0875fe6..a297198 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -2202,7 +2202,7 @@ void tst_QScriptValue::getSetProperty() // change flags object.setProperty("flagProperty", str); - QCOMPARE(object.propertyFlags("flagProperty"), static_cast<QScriptValue::PropertyFlags>(0)); + QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::PropertyFlags{}); object.setProperty("flagProperty", str, QScriptValue::ReadOnly); QCOMPARE(object.propertyFlags("flagProperty"), QScriptValue::ReadOnly); |