diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-03 09:49:28 +0200 |
| commit | a2171c2d82b810e7f596f371a7d1d3cc6989a9dd (patch) | |
| tree | ec43bcfea024aafa51bc0c698c37b9a0762a047e /src/plugins/qmldesigner/componentsplugin | |
| parent | 364c95476e3a74898bf4d0884670765bb7b9f592 (diff) | |
| parent | 6999e3c33907c0b4b09902f18dee0407c6d6293e (diff) | |
| download | qt-creator-a2171c2d82b810e7f596f371a7d1d3cc6989a9dd.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
Diffstat (limited to 'src/plugins/qmldesigner/componentsplugin')
| -rw-r--r-- | src/plugins/qmldesigner/componentsplugin/components.metainfo | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo index 3c32d94766..2e775a4acb 100644 --- a/src/plugins/qmldesigner/componentsplugin/components.metainfo +++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo @@ -256,8 +256,7 @@ MetaInfo { version: "1.0" requiredImport: "QtQuick.Controls" - Property { name: "width"; type: "int"; value: 360; } - Property { name: "height"; type: "int"; value: 50; } + } } @@ -288,9 +287,6 @@ MetaInfo { libraryIcon: ":/desktopplugin/images/toolbar.png" version: "1.0" requiredImport: "QtQuick.Controls" - - Property { name: "width"; type: "int"; value: 360; } - Property { name: "height"; type: "int"; value: 50; } } } |