Merge branch 'master' into wp8

2014-11-24 22:31:20 +01:00
parent f03fb82e25 b8da46ac18
commit 65973eea1c
67 changed files with 2720 additions and 425 deletions
@@ -113,6 +113,20 @@ signals:
 private slots:

 private:
+    int lastPosx(){
+#if QT_VERSION >= 0x050100
+        return m_lastPos.x()*devicePixelRatio();
+#else
+        return m_lastPos.x();
+#endif
+    }
+    int lastPosy(){
+#if QT_VERSION >= 0x050100
+        return m_lastPos.y()*devicePixelRatio();
+#else
+        return m_lastPos.y();
+#endif
+    }
    void timerEvent( QTimerEvent* );

 public:
@@ -125,6 +139,7 @@ private:
    int m_timerId;
    bool m_active;
    QRect m_viewPort;
+    QPoint m_lastPos;
 #ifdef QT_WIDGET
 #if (defined Q_WS_MAEMO_5) || (defined MEEGO_EDITION_HARMATTAN) || (defined Q_WS_ANDROID)
  int mMouseDownX;