diff --git a/examples/TableViewGallery.qml b/examples/TableViewGallery.qml
index 820b767e35a099ab08c5154a967bf0e2eb3eb5f8..c199d50fd55df6e8120264f1d2fe7d90d84bbebd 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 fe3e4b1d7814039275893ba88e500fb1de9e2560..18682737b8e64d3f0148530f1954162f9d71878b 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");