QT/TaoQuick
1
0
Fork 0
mirror of https://github.com/jaredtao/TaoQuick.git synced 2025-01-17 20:12:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/drawShape

Browse Source 
# Conflicts:
#	examples/TaoQuickShow/Contents.qrc
This commit is contained in:
kongdehui1 2022-03-29 22:20:29 +08:00
commit 0e0d440855
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/TaoQuickShow/Contents.qrc
View File

@ -51,7 +51,7 @@
<file>Contents/General/Tables.qml</file>
<file>Trans/language_zh.json</file>
<file>Contents/Effect/EditJoggle.qml</file>
<file>Contents/General/RoundRects.qml</file>
<file>Contents/General/RoundRects.qml</file>
<file>Contents/General/Shapes.qml</file>
<file>Contents/ShapeGallery/ShapeRectrangle.qml</file>
<file>Contents/ShapeGallery/ShapeCircle.qml</file>

8
examples/TaoQuickShow/Qml/Pane/ContentModel.qml
View File

@ -59,7 +59,13 @@ ListModel {
group: "General"
groupOpen: true
}
ListElement {
name: "RoundRect"
source: "General/RoundRects.qml"
visible: true
group: "General"
groupOpen: true
}
ListElement {
name: "Others"
source: "General/Miscs.qml"