diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 15:09:26 +0100 |
| commit | ff466a1881435f927f5df9ce1e5eac07d5591904 (patch) | |
| tree | 760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2 /src/imports/particles/plugins.qmltypes | |
| parent | e04822f3c2a6b69b7d75e2039256aa2433c59dd2 (diff) | |
| parent | 4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c
Diffstat (limited to 'src/imports/particles/plugins.qmltypes')
| -rw-r--r-- | src/imports/particles/plugins.qmltypes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes index 712d4fd844..b1b825dea6 100644 --- a/src/imports/particles/plugins.qmltypes +++ b/src/imports/particles/plugins.qmltypes @@ -213,6 +213,7 @@ Module { name: "QQuickDirection" prototype: "QObject" exports: ["QtQuick.Particles/NullVector 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] } Component { @@ -574,6 +575,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Particles/ParticleAffector 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true } Property { name: "groups"; type: "QStringList" } @@ -800,6 +802,7 @@ Module { name: "QQuickParticleExtruder" prototype: "QObject" exports: ["QtQuick.Particles/ParticleExtruder 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] } Component { @@ -836,6 +839,7 @@ Module { defaultProperty: "data" prototype: "QQuickItem" exports: ["QtQuick.Particles/ParticlePainter 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true } Property { name: "groups"; type: "QStringList" } |