Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtQuickControls
Commits
c8914796
Commit
c8914796
authored
13 years ago
by
Jens Bache-Wiig
Browse files
Options
Download
Patches
Plain Diff
Fix some regressions in TableViewGallery
parent
1777280f
6.2
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
dev
old/5.1
old/5.2
old/qt4
wip/calendar
wip/qt5-nativetext
wip/tizen
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/TableViewGallery.qml
+3
-3
examples/TableViewGallery.qml
src/qstyleplugin.cpp
+1
-0
src/qstyleplugin.cpp
with
4 additions
and
3 deletions
examples/TableViewGallery.qml
+
3
−
3
View file @
c8914796
...
...
@@ -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
.
current
Index
)
{
switch
(
delegateChooser
.
selected
Index
)
{
case
0
:
return
delegate1
case
1
:
...
...
This diff is collapsed.
Click to expand it.
src/qstyleplugin.cpp
+
1
−
0
View file @
c8914796
...
...
@@ -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"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets