diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
| commit | d39ec85b7e5d8702c2888cdad4ccdae72531c199 (patch) | |
| tree | f38aa46e3c0d9c6432d9175d1511f1ac0d4de940 /tools/qmlviewer | |
| parent | 43163cec2bcf9012944b445b393f6f8a6e895138 (diff) | |
| parent | deca6c1c9885554e4e51ebd6dafdd78a424904e4 (diff) | |
| download | Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.zip Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.gz Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qmlviewer')
| -rw-r--r-- | tools/qmlviewer/qfxtester.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlviewer/qfxtester.cpp b/tools/qmlviewer/qfxtester.cpp index dfa628d..802a927 100644 --- a/tools/qmlviewer/qfxtester.cpp +++ b/tools/qmlviewer/qfxtester.cpp @@ -52,10 +52,10 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, VisualTest, QmlGraphicsVisualTest); -QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, Frame, QmlGraphicsVisualTestFrame); -QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, Mouse, QmlGraphicsVisualTestMouse); -QML_DEFINE_TYPE(Qt.VisualTest, 4, 6, (QT_VERSION&0x00ff00)>>8, Key, QmlGraphicsVisualTestKey); +QML_DEFINE_TYPE(Qt.VisualTest, 4,6, VisualTest, QmlGraphicsVisualTest); +QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Frame, QmlGraphicsVisualTestFrame); +QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Mouse, QmlGraphicsVisualTestMouse); +QML_DEFINE_TYPE(Qt.VisualTest, 4,6, Key, QmlGraphicsVisualTestKey); QmlGraphicsTester::QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions opts, QmlView *parent) |