diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-02-01 08:08:22 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-02-01 08:08:22 (GMT) |
| commit | 4a83af372b965b6dbe25f6a08e14aee09bb9355e (patch) | |
| tree | b0d7fc6eee76b65ee7e836b871f7b28e1ad2bc5c /tools/designer/src/plugins/activeqt/qdesigneraxwidget.h | |
| parent | 465a63d00c2294641539af820435a9a4315f0251 (diff) | |
| parent | 37f1aec1a4e71a7102e8cd2e2908c8d3be7e29f5 (diff) | |
| download | Qt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.zip Qt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.tar.gz Qt-4a83af372b965b6dbe25f6a08e14aee09bb9355e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 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(); |