diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 09:22:19 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-06 09:22:52 +0200 |
| commit | f3bb027f6f533fde7a931b64d70f3aebc3b5f846 (patch) | |
| tree | d2900e994a329e41634c61d919bfe95ab20eac2f | |
| parent | ff44060f5e52e863df24576a574f10e66061a299 (diff) | |
| parent | f99c4fd705b6a145b7b9a19ab62f7b6da98b75be (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
* origin/5.14:
f99c4fd charts: remove mention about arrow keys navigation
b6ec7cb Doc: Bump version to 5.14.2
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: Ifbb05eff22840272c7535a37e6f2bef8e5e69f2a
| -rw-r--r-- | basicsuite/enterprise-charts/main.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index 02b4f8b..3b43447 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -120,7 +120,7 @@ Rectangle { Text { color: "white" anchors.centerIn: parent - text: "You can navigate between views using swipe or arrow keys" + text: "You can navigate between views using swipe" font.family: appFont } |