diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-03 11:57:09 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-03 11:57:09 (GMT) |
| commit | ead9159c8bfa94004d29c9a0c4b4c93ecce0951e (patch) | |
| tree | 5b588e4379c8525cb937cdbc0b050fc44761fbae /tools/designer/src/plugins/activeqt/qdesigneraxwidget.h | |
| parent | 5f11d2125b9cc37768fb8174870ced5934cdacf2 (diff) | |
| parent | 3838762e4b572017efc42e9f7dbfc43d262807cf (diff) | |
| download | Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.zip Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.tar.gz Qt-ead9159c8bfa94004d29c9a0c4b4c93ecce0951e.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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(); |