diff options
author | Janne Hamalainen <janne.a.hamalainen@nokia.com> | 2011-03-10 08:09:08 (GMT) |
---|---|---|
committer | Janne Hamalainen <janne.a.hamalainen@nokia.com> | 2011-03-10 08:09:08 (GMT) |
commit | d65cb0bbb17d21cce2823ace521dea9e53fe4988 (patch) | |
tree | bc1aac024a6587402c311d903f98327fde331495 /config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff | |
parent | 8c25fc8fd3e54a30a03a2a8517e597e4cd26bf0d (diff) | |
download | Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.zip Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.tar.gz Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.tar.bz2 |
Added Harmattan specific debian files to master branch.
Debian packaging files added to Master branch. One
translation file was removed as it was a left over from
an old commit. Reference to it was removed from rules file.
Similar commit is done for Harmattan as well. Task: BACKEND-564
Reviewed-by: Adrian Constantin
Diffstat (limited to 'config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff')
-rw-r--r-- | config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff b/config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff new file mode 100644 index 0000000..61dfbf9 --- /dev/null +++ b/config.profiles/harmattan/patches/pinch_gesture_sent_twice.diff @@ -0,0 +1,56 @@ +Index: qt-maemo-qtp/src/gui/kernel/qstandardgestures.cpp +=================================================================== +--- qt-maemo-qtp.orig/src/gui/kernel/qstandardgestures.cpp ++++ qt-maemo-qtp/src/gui/kernel/qstandardgestures.cpp +@@ -66,6 +66,9 @@ + #else + static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); + #endif ++ } else if (target) { ++ return 0; // this assumes the target is a QGraphicsObject, so we return ++ // NULL to indicate that the recognizer doesn't support graphicsobject + } + return new QPanGesture; + } +@@ -157,7 +160,11 @@ + { + if (target && target->isWidgetType()) { + static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); ++ } else if (target) { ++ return 0; // this assumes the target is a QGraphicsObject, so we return ++ // NULL to indicate that the recognizer doesn't support graphicsobject + } ++ + return new QPinchGesture; + } + +@@ -286,6 +293,9 @@ + { + if (target && target->isWidgetType()) { + static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); ++ } else if (target) { ++ return 0; // this assumes the target is a QGraphicsObject, so we return ++ // NULL to indicate that the recognizer doesn't support graphicsobject + } + return new QSwipeGesture; + } +@@ -424,6 +434,9 @@ + { + if (target && target->isWidgetType()) { + static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); ++ } else if (target) { ++ return 0; // this assumes the target is a QGraphicsObject, so we return ++ // NULL to indicate that the recognizer doesn't support graphicsobject + } + return new QTapGesture; + } +@@ -495,6 +508,9 @@ + { + if (target && target->isWidgetType()) { + static_cast<QWidget *>(target)->setAttribute(Qt::WA_AcceptTouchEvents); ++ } else if (target) { ++ return 0; // this assumes the target is a QGraphicsObject, so we return ++ // NULL to indicate that the recognizer doesn't support graphicsobject + } + return new QTapAndHoldGesture; + } |