From 0b282b201cb80b32077d123aee156623783ae65f Mon Sep 17 00:00:00 2001 From: Anna Date: Fri, 7 Jun 2019 18:01:47 -0700 Subject: [PATCH 1/2] typo fix --- interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml index e824036587..0ca9d6d80c 100644 --- a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml @@ -22,7 +22,7 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.reslovedUrl(path)); + profileRoot.push(Qt.resolvedUrl(path)); } function popSource() { From fd872009fe73a97d5f36890ddbedece5032d9145 Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 10 Jun 2019 09:25:12 -0700 Subject: [PATCH 2/2] added workaround for bug in Qt StackView push method --- interface/resources/qml/hifi/tablet/Edit.qml | 3 ++- interface/resources/qml/hifi/tablet/EditTools.qml | 3 ++- interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml | 3 ++- .../resources/qml/hifi/tablet/TabletAvatarPreferences.qml | 3 ++- .../resources/qml/hifi/tablet/TabletGeneralPreferences.qml | 3 ++- .../resources/qml/hifi/tablet/TabletGraphicsPreferences.qml | 3 ++- interface/resources/qml/hifi/tablet/TabletLodPreferences.qml | 3 ++- .../resources/qml/hifi/tablet/TabletNetworkingPreferences.qml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/Edit.qml b/interface/resources/qml/hifi/tablet/Edit.qml index 099c53cda2..ca18388def 100644 --- a/interface/resources/qml/hifi/tablet/Edit.qml +++ b/interface/resources/qml/hifi/tablet/Edit.qml @@ -34,7 +34,8 @@ StackView { } function pushSource(path) { - editRoot.push(Qt.resolvedUrl("../../" + path), itemProperties, + var item = Qt.createComponent(Qt.resolvedUrl("../../" + path)); + editRoot.push(item, itemProperties, StackView.Immediate); editRoot.currentItem.sendToScript.connect(editRoot.sendToScript); } diff --git a/interface/resources/qml/hifi/tablet/EditTools.qml b/interface/resources/qml/hifi/tablet/EditTools.qml index f989038c16..976e98cd50 100644 --- a/interface/resources/qml/hifi/tablet/EditTools.qml +++ b/interface/resources/qml/hifi/tablet/EditTools.qml @@ -37,7 +37,8 @@ StackView { } function pushSource(path) { - editRoot.push(Qt.resolvedUrl("../../" + path), itemProperties, + var item = Qt.createComponent(Qt.resolvedUrl("../../" + path)); + editRoot.push(item, itemProperties, StackView.Immediate); editRoot.currentItem.sendToScript.connect(editRoot.sendToScript); } diff --git a/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml b/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml index 239c2452d4..2836c2bac6 100644 --- a/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml +++ b/interface/resources/qml/hifi/tablet/TabletAudioBuffers.qml @@ -24,7 +24,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml index 0ca9d6d80c..dbe4ab12db 100644 --- a/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml @@ -22,7 +22,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml index 4f1100f20b..254e4203ce 100644 --- a/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml @@ -22,7 +22,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml b/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml index 8d600975ed..9b9f01d031 100644 --- a/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletGraphicsPreferences.qml @@ -22,7 +22,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletLodPreferences.qml b/interface/resources/qml/hifi/tablet/TabletLodPreferences.qml index ddc116371d..0938d0a82e 100644 --- a/interface/resources/qml/hifi/tablet/TabletLodPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletLodPreferences.qml @@ -22,7 +22,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() { diff --git a/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml b/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml index bad546a39c..67d6e6c52e 100644 --- a/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml +++ b/interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml @@ -22,7 +22,8 @@ StackView { signal sendToScript(var message); function pushSource(path) { - profileRoot.push(Qt.resolvedUrl(path)); + var item = Qt.createComponent(Qt.resolvedUrl(path)); + profileRoot.push(item); } function popSource() {