diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 02:29:11 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-16 02:29:11 (GMT) |
| commit | 8f16f6638bf07adb6c782cb173d323402cfa1c81 (patch) | |
| tree | 54d4f44f5e44310d878fe4c4614b95433617b0fd /tools/qmlviewer/qmlviewer.h | |
| parent | 7f55f59687d2f21c51b1f124a4eeff62c6b374dd (diff) | |
| parent | 24b0ad11174118e327a778bbdf16fa64a5eb640c (diff) | |
| download | Qt-8f16f6638bf07adb6c782cb173d323402cfa1c81.zip Qt-8f16f6638bf07adb6c782cb173d323402cfa1c81.tar.gz Qt-8f16f6638bf07adb6c782cb173d323402cfa1c81.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
src/declarative/fx/fx.pri
Diffstat (limited to 'tools/qmlviewer/qmlviewer.h')
| -rw-r--r-- | tools/qmlviewer/qmlviewer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h index 365d6b2..4714bdc 100644 --- a/tools/qmlviewer/qmlviewer.h +++ b/tools/qmlviewer/qmlviewer.h @@ -61,7 +61,6 @@ public slots: protected: virtual void keyPressEvent(QKeyEvent *); virtual void timerEvent(QTimerEvent *); - virtual bool event(QEvent *event); void createMenu(QMenuBar *menu, QMenu *flatmenu); |