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.h | |
| parent | 61887379b0c823953b61120532055fcbd881aadd (diff) | |
| download | qtdeclarative-9dc9424d1873b1bc3b5ed056d4dda7f6c76e15ae.tar.gz | |
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.h')
| -rw-r--r-- | src/qml/util/qqmlpropertymap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index 01048f3662..8c5ecce48e 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -80,15 +80,13 @@ protected: template<class DerivedType> QQmlPropertyMap(DerivedType *derived, QObject *parentObj) - : QObject(*allocatePrivate(), parentObj) + : QQmlPropertyMap(&DerivedType::staticMetaObject, parentObj) { Q_UNUSED(derived) - init(&DerivedType::staticMetaObject); } private: - void init(const QMetaObject *staticMetaObject); - static QObjectPrivate *allocatePrivate(); + QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *parent); Q_DECLARE_PRIVATE(QQmlPropertyMap) Q_DISABLE_COPY(QQmlPropertyMap) |