summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Nevala <samuel.nevala@digia.com>2014-10-24 15:08:05 +0300
committerSamuel Nevala <samuel.nevala@digia.com>2014-10-24 14:26:00 +0200
commit8b2d7ad3e0b8ca0475414a03afc92de1a60f24cf (patch)
tree7d269bb6a7614e30e3ecc6fde9d3d6ca2961dd59
parent1e17bac228046ae922e9cc0531212884297634b1 (diff)
downloadqtquickcontrols-8b2d7ad3e0b8ca0475414a03afc92de1a60f24cf.tar.gz
EditMenu shown for TextArea/Field on active focus gain.
Don't load EditMenu at all on Android. Task-number: QTBUG-42094 Change-Id: I94f10c4bbfc83ed30d166ef56863dfc956d1fb8e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/Private/EditMenu.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/controls/Private/EditMenu.qml b/src/controls/Private/EditMenu.qml
index 0fc9582c..70b6b9b2 100644
--- a/src/controls/Private/EditMenu.qml
+++ b/src/controls/Private/EditMenu.qml
@@ -70,5 +70,6 @@ Loader {
return menuInstance;
}
- source: Qt.resolvedUrl("EditMenu_" + (Qt.platform.os === "ios" ? "ios" : "base") + ".qml")
+ source: Qt.resolvedUrl(Qt.platform.os === "ios" ? "EditMenu_ios.qml"
+ : Qt.platform.os === "android" ? "" : "EditMenu_base.qml")
}