diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-06-29 14:27:27 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-07-01 13:45:07 +0000 |
commit | 9cebbe19b393810592655438fcc64674083306b4 (patch) | |
tree | 273a56889b1445a9f75975171a386c24b22827b6 /src/core/aspects/qabstractaspect.h | |
parent | dc51c6e005d285c71923f0a346ac8d0fa9837184 (diff) |
QAspectFactory: use QLatin1String instead of QString
Otherwise we may encounter crashes when an app only links a subset of the Qt3D
sub modules when the plugins may be linking against other other modules.
Change-Id: I9e5e9457d933266806def86f9f91cc26db99ecc1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.h')
-rw-r--r-- | src/core/aspects/qabstractaspect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/aspects/qabstractaspect.h b/src/core/aspects/qabstractaspect.h index c1ba14173..a7292e5c6 100644 --- a/src/core/aspects/qabstractaspect.h +++ b/src/core/aspects/qabstractaspect.h @@ -107,7 +107,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE \ namespace Qt3DCore { \ typedef QAbstractAspect *(*AspectCreateFunction)(QObject *); \ - QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QString &, const QMetaObject *, AspectCreateFunction); \ + QT3DCORESHARED_EXPORT void qt3d_QAspectFactory_addDefaultFactory(const QLatin1String &, const QMetaObject *, AspectCreateFunction); \ } \ QT_END_NAMESPACE \ namespace { \ @@ -120,7 +120,7 @@ QT_END_NAMESPACE void qt3d_ ## AspectType ## _registerFunction() \ { \ using namespace AspectNamespace; \ - qt3d_QAspectFactory_addDefaultFactory(QStringLiteral(name), &AspectType::staticMetaObject, qt3d_ ## AspectType ## _createFunction); \ + qt3d_QAspectFactory_addDefaultFactory(QLatin1String(name), &AspectType::staticMetaObject, qt3d_ ## AspectType ## _createFunction); \ } \ \ Q_CONSTRUCTOR_FUNCTION(qt3d_ ## AspectType ## _registerFunction) \ |