diff options
| author | Ian Chen <ian.1.chen@nokia.com> | 2012-07-18 15:07:23 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 08:04:11 +0200 |
| commit | f48c08eff10ba7a6663b01774bde95e8ced05e0f (patch) | |
| tree | 1add5269a6205fa88fe2513f93bbca505ab49ba0 /tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h | |
| parent | 88687d73501a962029b8f855cb7fb195195d00e6 (diff) | |
| download | qtlocation-f48c08eff10ba7a6663b01774bde95e8ced05e0f.tar.gz | |
Rename QQuickCanvas to QQuickWindow, in line with qtdeclarative
similarly, "canvas" -> "window"
Change-Id: I71745fad36f3dcb100d0eaf7bba0806465a761ee
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h')
| -rw-r--r-- | tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h index be73edb9..3fec4873 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPINCHGENERATOR_H #include <QtQuick/QQuickItem> -#include <QtQuick/QQuickCanvas> +#include <QtQuick/QQuickWindow> #include <QtGui/QMouseEvent> #include <QtGui/QTouchEvent> #include <QtGui/QKeyEvent> @@ -132,7 +132,7 @@ private: private: QQuickItem* target_; GeneratorState state_; - QQuickCanvas* canvas_; + QQuickWindow* window_; QList<Swipe*> swipes_; Swipe* activeSwipe_; QElapsedTimer swipeTimer_; |