diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-10-20 10:35:56 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-23 09:49:36 +0200 |
| commit | 41751755881f88cea4bc534b650605bb944cde18 (patch) | |
| tree | 732d75885e400fbd366f7d437fe0fbfb50b771af /tests | |
| parent | f2df8033f0ab1f27cf2310e32c4c13631bbaca63 (diff) | |
Rename the QMetaType::MovableType flag to RelocatableType
Keep this in sync with the changes we have done in QTypeInfo.
Change-Id: Iaacb0f3cc5c46d3486084a1f6eca480a233d5e1a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index f9c7636435..a074ca5a51 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -1125,7 +1125,7 @@ void tst_QMetaType::flags() QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsConstruction), isComplex); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::NeedsDestruction), isComplex); - QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::MovableType), isMovable); + QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::RelocatableType), isMovable); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::PointerToQObject), isPointerToQObject); QCOMPARE(bool(QMetaType::typeFlags(type) & QMetaType::IsEnumeration), isEnum); } @@ -1144,7 +1144,7 @@ void tst_QMetaType::flagsStaticLess() int flags = QMetaType(type).flags(); QCOMPARE(bool(flags & QMetaType::NeedsConstruction), isComplex); QCOMPARE(bool(flags & QMetaType::NeedsDestruction), isComplex); - QCOMPARE(bool(flags & QMetaType::MovableType), isMovable); + QCOMPARE(bool(flags & QMetaType::RelocatableType), isMovable); } void tst_QMetaType::flagsBinaryCompatibility6_0_data() diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp index be34fa7639..dc91b8792b 100644 --- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp +++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp @@ -338,7 +338,7 @@ void tst_QGuiMetaType::flags() QCOMPARE(bool(QMetaType(type).flags() & QMetaType::NeedsConstruction), isComplex); QCOMPARE(bool(QMetaType(type).flags() & QMetaType::NeedsDestruction), isComplex); - QCOMPARE(bool(QMetaType(type).flags() & QMetaType::MovableType), isRelocatable); + QCOMPARE(bool(QMetaType(type).flags() & QMetaType::RelocatableType), isRelocatable); } |