From 8b2d7ad3e0b8ca0475414a03afc92de1a60f24cf Mon Sep 17 00:00:00 2001
From: Samuel Nevala <samuel.nevala@digia.com>
Date: Fri, 24 Oct 2014 15:08:05 +0300
Subject: [PATCH] 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>
---
src/controls/Private/EditMenu.qml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/controls/Private/EditMenu.qml b/src/controls/Private/EditMenu.qml
index 0fc9582c1..70b6b9b24 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")
}
--
GitLab