merge from upstream

This commit is contained in:
Seth Alves 2017-02-10 12:09:00 -08:00
commit e851ece343

View file

@ -23,6 +23,7 @@ StackView {
editRoot.pop();
}
Component {
id: editBasePage
TabView {
@ -30,10 +31,12 @@ StackView {
anchors.fill: parent
Tab {
title: "Entity List"
active: true
enabled: true
property string originalUrl: ""
WebView {
id: entityListToolWebView
url: "../../../../../scripts/system/html/entityList.html"
@ -44,6 +47,7 @@ StackView {
}
Tab {
title: "Entity Properties"
active: true
enabled: true
property string originalUrl: ""
@ -58,6 +62,7 @@ StackView {
}
Tab {
title: "Grid"
active: true
enabled: true
property string originalUrl: ""