Merge branch 'dev' into qt_migration
This commit is contained in:
commit
167d3caa5d
47 changed files with 1061 additions and 876 deletions
|
|
@ -27,12 +27,11 @@ PageBase {
|
|||
}
|
||||
|
||||
|
||||
Flickable {
|
||||
FlickableType {
|
||||
clip: true
|
||||
width: parent.width
|
||||
anchors.top: caption.bottom
|
||||
anchors.bottom: root.bottom
|
||||
contentHeight: col.height
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
|
||||
Column {
|
||||
id: col
|
||||
|
|
@ -54,7 +53,6 @@ PageBase {
|
|||
|
||||
|
||||
ShareConnectionContent {
|
||||
x: 10
|
||||
text: qsTr("Share for Amnezia")
|
||||
height: 40
|
||||
width: tb_c.width - 10
|
||||
|
|
@ -63,7 +61,6 @@ PageBase {
|
|||
|
||||
ListView {
|
||||
id: tb_c
|
||||
x: 10
|
||||
width: parent.width - 10
|
||||
height: tb_c.contentItem.height
|
||||
currentIndex: -1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue