diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:03:36 +0100 |
| commit | 1a4f0deeb44e2bfb107a22a714df3796ac1d0c20 (patch) | |
| tree | b1c8db2d1b742d25106225c80893e0b32f98fb15 /tests/auto/corelib/kernel/qmetatype | |
| parent | db0064b767474a89bc72ea4374f477682983c5f4 (diff) | |
| parent | 35fa30e65d26b9e4840cfa793ed8369b3475c1fd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I7d84cfed0b2a122d334b8a920e6e4f18472d2f11
Diffstat (limited to 'tests/auto/corelib/kernel/qmetatype')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index 450bd1cf3f..d57c4629cc 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -734,7 +734,7 @@ QT_FOR_EACH_STATIC_CORE_POINTER(ADD_METATYPE_TEST_ROW) QTest::newRow("QPair<P,C>") << ::qMetaTypeId<QPair<P,C> >() << false << true << false << false; QTest::newRow("QPair<P,M>") << ::qMetaTypeId<QPair<P,M> >() << true << true << false << false; QTest::newRow("QPair<P,P>") << ::qMetaTypeId<QPair<P,P> >() << true << false << false << false; - QTest::newRow("FlagsDataEnum") << ::qMetaTypeId<FlagsDataEnum>() << true << true << false << true; + QTest::newRow("FlagsDataEnum") << ::qMetaTypeId<FlagsDataEnum>() << true << false << false << true; // invalid ids. QTest::newRow("-1") << -1 << false << false << false << false; |