diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-03 11:13:50 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-02-03 11:13:50 (GMT) |
| commit | 5c6b614992095750b1e0ebc943507b8c864d856e (patch) | |
| tree | 0e2bad50be9b586b0d0909fe57f698fb1a92f640 /tools/designer/src/plugins/activeqt/qdesigneraxwidget.h | |
| parent | f4784025082b84a02e51dcde89bf32ad77cb4ccd (diff) | |
| parent | 1965885fe96eb50add6c0c9fc85a12497a6052bc (diff) | |
| download | Qt-5c6b614992095750b1e0ebc943507b8c864d856e.zip Qt-5c6b614992095750b1e0ebc943507b8c864d856e.tar.gz Qt-5c6b614992095750b1e0ebc943507b8c864d856e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tools/designer/src/plugins/activeqt/qdesigneraxwidget.h')
| -rw-r--r-- | tools/designer/src/plugins/activeqt/qdesigneraxwidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h index 1308fe2..50132a6 100644 --- a/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h +++ b/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h @@ -105,7 +105,7 @@ private: class QDesignerAxPluginWidget : public QDesignerAxWidget { - // No Q_OBJECT here! - meta functionality is overriden + // No Q_OBJECT here! - meta functionality is overridden public: explicit QDesignerAxPluginWidget(QWidget *parent); virtual ~QDesignerAxPluginWidget(); |