summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android/src/androidjniinput.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 14:43:54 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-12 14:43:55 +0200
commitbe4b80af8235d5f5664f03589258eec0e43da78b (patch)
tree9a5a8dcaae5d4da3632f0be8fa1af42c751ae22e /src/plugins/platforms/android/src/androidjniinput.cpp
parent0715dc9ee32054c4a344dc7d8694cf0b8b6cbdbb (diff)
parent2d9cd8eef8652873e73d5cde6b6545eea9a17612 (diff)
Merge remote-tracking branch 'origin/release' into stable
Diffstat (limited to 'src/plugins/platforms/android/src/androidjniinput.cpp')
-rw-r--r--src/plugins/platforms/android/src/androidjniinput.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/androidjniinput.cpp b/src/plugins/platforms/android/src/androidjniinput.cpp
index da6156a330..29ccfe0125 100644
--- a/src/plugins/platforms/android/src/androidjniinput.cpp
+++ b/src/plugins/platforms/android/src/androidjniinput.cpp
@@ -163,6 +163,10 @@ namespace QtAndroidInput
static void longPress(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y)
{
+ //### TODO: add proper API for Qt 5.2
+ static bool rightMouseFromLongPress = qgetenv("QT_NECESSITAS_COMPATIBILITY_LONG_PRESS").toInt();
+ if (!rightMouseFromLongPress)
+ return;
m_ignoreMouseEvents = true;
QPoint globalPos(x,y);
QWindow *tlw = topLevelWindowAt(globalPos);