From c8914796b263f9710743abe076f5d7f6eefb36be Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Date: Sun, 16 Oct 2011 21:27:07 +0200
Subject: [PATCH] Fix some regressions in TableViewGallery
---
examples/TableViewGallery.qml | 6 +++---
src/qstyleplugin.cpp | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/TableViewGallery.qml b/examples/TableViewGallery.qml
index 820b767e3..c199d50fd 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 fe3e4b1d7..18682737b 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");
--
GitLab