diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2018-08-24 11:23:47 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2018-08-30 05:12:01 +0000 |
| commit | 19b12ac9c21f4dd079e482c4ed926f51c1776e52 (patch) | |
| tree | 21096a8befe47c8492b65a58bf9642d2b019e895 /tests | |
| parent | c2165f891c1a4380fdbf3bbf7af4696dc863cb99 (diff) | |
Update QMetaObjectBuilder::MetaObjectFlag enum
Synced QMetaObjectBuilder::MetaObjectFlag with the MetaObjectFlags enum
from qmetaobject_p.h. Also added a few comments for Qt 6.
Change-Id: Ieccd5cf8d512a6bf7256b2f4db88d45662774536
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp index fdf3bb541e..5d9b5ca95c 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -29,7 +29,6 @@ #include <QtCore> #include <QtTest/QtTest> -#include <QtCore/private/qmetaobject_p.h> #include <QtCore/private/qmetaobjectbuilder_p.h> #include "tst_qmetatype.h" @@ -286,8 +285,7 @@ void tst_QMetaType::registerGadget(const char *name, const QVector<GadgetPropert { QMetaObjectBuilder gadgetBuilder; gadgetBuilder.setClassName(name); - QMetaObjectBuilder::MetaObjectFlags metaObjectflags = QMetaObjectBuilder::DynamicMetaObject; - metaObjectflags |= QMetaObjectBuilder::MetaObjectFlags(PropertyAccessInStaticMetaCall); + QMetaObjectBuilder::MetaObjectFlags metaObjectflags = QMetaObjectBuilder::DynamicMetaObject | QMetaObjectBuilder::PropertyAccessInStaticMetaCall; gadgetBuilder.setFlags(metaObjectflags); auto dynamicGadgetProperties = std::make_shared<GenericGadgetType>(); for (const auto &prop : gadgetProperties) { |