summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/qml/pages/AppConfigDialog.qml2
-rw-r--r--app/translations/pebble-es.ts2
-rw-r--r--app/translations/pebble.ts2
-rw-r--r--rpm/pebble.spec2
4 files changed, 5 insertions, 3 deletions
diff --git a/app/qml/pages/AppConfigDialog.qml b/app/qml/pages/AppConfigDialog.qml
index 304bced..1562985 100644
--- a/app/qml/pages/AppConfigDialog.qml
+++ b/app/qml/pages/AppConfigDialog.qml
@@ -21,6 +21,8 @@ Dialog {
VerticalScrollDecorator { flickable: webview }
+ overridePageStackNavigation: true
+
onNavigationRequested: {
console.log("appconfig navigation requested to " + request.url);
var url = request.url.toString();
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 18b1ec2..0316ecb 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -22,7 +22,7 @@
<context>
<name>AppConfigDialog</name>
<message>
- <location filename="../qml/pages/AppConfigDialog.qml" line="74"/>
+ <location filename="../qml/pages/AppConfigDialog.qml" line="75"/>
<source>No configuration settings available</source>
<translation>No hay opciones disponibles para configurar</translation>
</message>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index 222645c..7a78d9d 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -22,7 +22,7 @@
<context>
<name>AppConfigDialog</name>
<message>
- <location filename="../qml/pages/AppConfigDialog.qml" line="74"/>
+ <location filename="../qml/pages/AppConfigDialog.qml" line="75"/>
<source>No configuration settings available</source>
<translation type="unfinished"></translation>
</message>
diff --git a/rpm/pebble.spec b/rpm/pebble.spec
index 9fb9575..02cbe6c 100644
--- a/rpm/pebble.spec
+++ b/rpm/pebble.spec
@@ -13,7 +13,7 @@ Name: pebble
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: Support for Pebble watch in SailfishOS
-Version: 0.12.1b
+Version: 0.12.1c
Release: 1
Group: Qt/Qt
License: GPL3