diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-02 10:00:20 +0200 |
| commit | 0fb641c90e64054a28a39e3f48d96f953399805a (patch) | |
| tree | 504f097db01334a87316f8e825f1db0cba6bfba1 /src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml | |
| parent | f4520bafaccb0832266f8d88f254e910ed7a23f4 (diff) | |
| parent | 4b2cc015f867941a7ae35a38d81ec9daa5616711 (diff) | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
Diffstat (limited to 'src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml')
| -rw-r--r-- | src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml b/src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml index b3e8c93d2d..013bfa6983 100644 --- a/src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml +++ b/src/plugins/qmldesigner/qtquickplugin/source/listviewv2.qml @@ -52,6 +52,7 @@ ListView { } delegate: Item { + width: 80 height: 40 x: 5 Row { |