diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-12 09:44:05 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-18 04:27:14 +0000 |
commit | 9dc9424d1873b1bc3b5ed056d4dda7f6c76e15ae (patch) | |
tree | e7153e679430416ed23908f304f584a6dd15375a /src/qml/util/qqmlpropertymap.cpp | |
parent | 61887379b0c823953b61120532055fcbd881aadd (diff) |
Fix linking if apps using QQmlPropertyMap when using version scripts
Avoid the use of the QObject constructor that takes a QObjectPrivate in
the inline QQmlPropertyMap constructor.
Task-number: QTBUG-46433
Change-Id: I62e3c80e28334ce5a4c3d2249abfada45a8dccb3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/qml/util/qqmlpropertymap.cpp')
-rw-r--r-- | src/qml/util/qqmlpropertymap.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index 6e6554f2c3..b54e8d901a 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -186,9 +186,8 @@ int QQmlPropertyMapMetaObject::createProperty(const char *name, const char *valu Constructs a bindable map with parent object \a parent. */ QQmlPropertyMap::QQmlPropertyMap(QObject *parent) -: QObject(*allocatePrivate(), parent) +: QQmlPropertyMap(&staticMetaObject, parent) { - init(metaObject()); } /*! @@ -339,18 +338,13 @@ QVariant QQmlPropertyMap::updateValue(const QString &key, const QVariant &input) } /*! \internal */ -void QQmlPropertyMap::init(const QMetaObject *staticMetaObject) +QQmlPropertyMap::QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *parent) + : QObject(*(new QQmlPropertyMapPrivate), parent) { Q_D(QQmlPropertyMap); d->mo = new QQmlPropertyMapMetaObject(this, d, staticMetaObject); } -/*! \internal */ -QObjectPrivate *QQmlPropertyMap::allocatePrivate() -{ - return new QQmlPropertyMapPrivate; -} - /*! \fn void QQmlPropertyMap::valueChanged(const QString &key, const QVariant &value) This signal is emitted whenever one of the values in the map is changed. \a key |