diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-19 12:04:39 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-19 12:04:39 +0200 |
| commit | a226143eeda6771efc4f0df6955351336735cb60 (patch) | |
| tree | a279f87d74f5929e36fe6a3aa5e4f4d843b32458 /src/gui/kernel/qwidget.h | |
| parent | c02ad51733d0a2885ddb39cb7e3b09355ab97213 (diff) | |
| parent | ffbce9839f8be5c2f21cc66b617dbeb0a47af269 (diff) | |
Merge remote branch 'qt/master' into lighthouse-master
Diffstat (limited to 'src/gui/kernel/qwidget.h')
| -rw-r--r-- | src/gui/kernel/qwidget.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index c750465d90..5b579b9063 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -913,13 +913,6 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QWidget::RenderFlags) -#if defined Q_CC_MSVC && _MSC_VER < 1300 -template <> inline QWidget *qobject_cast_helper<QWidget*>(QObject *o, QWidget *) -{ - if (!o || !o->isWidgetType()) return 0; - return (QWidget*)(o); -} -#else template <> inline QWidget *qobject_cast<QWidget*>(QObject *o) { if (!o || !o->isWidgetType()) return 0; @@ -930,7 +923,6 @@ template <> inline const QWidget *qobject_cast<const QWidget*>(const QObject *o) if (!o || !o->isWidgetType()) return 0; return static_cast<const QWidget*>(o); } -#endif inline QWidget *QWidget::childAt(int ax, int ay) const { return childAt(QPoint(ax, ay)); } |