diff options
| author | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2011-10-16 21:27:07 +0200 |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2011-10-16 21:27:07 +0200 |
| commit | c8914796b263f9710743abe076f5d7f6eefb36be (patch) | |
| tree | 53348da2cf5e10cd4980baa183798accb0d64a74 | |
| parent | 1777280fe31f86839089d3e3218061a4f28d93b4 (diff) | |
| download | qtquickcontrols-c8914796b263f9710743abe076f5d7f6eefb36be.tar.gz | |
Fix some regressions in TableViewGallery
| -rw-r--r-- | examples/TableViewGallery.qml | 6 | ||||
| -rw-r--r-- | src/qstyleplugin.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/TableViewGallery.qml b/examples/TableViewGallery.qml index 820b767e..c199d50f 100644 --- a/examples/TableViewGallery.qml +++ b/examples/TableViewGallery.qml @@ -117,7 +117,7 @@ Rectangle { title: "DirModel" TableView { -// model: FileSystemModel{} + model: FileSystemModel{} anchors.fill: parent anchors.margins: 12 @@ -285,7 +285,7 @@ Rectangle { anchors.margins: 4 property string modelText: itemValue property string editorText: item ? item.text : itemValue - onEditorTextChanged: model.setProperty(rowIndex, itemProperty, editorText) + onEditorTextChanged: model.setProperty(rowIndex, role, editorText) sourceComponent: itemSelected ? editor : null Component {id: editor ; TextInput{ color: itemForeground ; text: modelText} } } @@ -348,7 +348,7 @@ Rectangle { } itemDelegate: { - switch(delegateChooser.currentIndex) { + switch(delegateChooser.selectedIndex) { case 0: return delegate1 case 1: diff --git a/src/qstyleplugin.cpp b/src/qstyleplugin.cpp index fe3e4b1d..18682737 100644 --- a/src/qstyleplugin.cpp +++ b/src/qstyleplugin.cpp @@ -93,6 +93,7 @@ void StylePlugin::registerTypes(const char *uri) qmlRegisterType<QtMenuItem>(uri, 0, 1, "MenuItem"); qmlRegisterType<QtMenuSeparator>(uri, 0, 1, "Separator"); + qmlRegisterType<QFileSystemModel>(uri, 0, 1, "FileSystemModel"); qmlRegisterType<QtSplitterBase>("QtDesktopPrivate", 0, 1, "Splitter"); qmlRegisterType<QWindowItem>("QtQuick", 0, 1, "Window"); |