diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-10 14:43:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 20:01:39 +0200 |
| commit | 9cc7c809875024df0cf6bcef049b4ee11044b812 (patch) | |
| tree | fc3ea91de44458eee698d0cd9503464680df62a9 /tools | |
| parent | f4f6597e28a8a01ba0cbc4f346f481928d48fdec (diff) | |
fix build with qt in namespace
Change-Id: Id6277973e42597d446dfe8f4ce935611a7351c29
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qt3d/qglinfo/aboutdialog.h | 2 | ||||
| -rw-r--r-- | tools/qt3d/qglinfo/fpswidget.h | 2 | ||||
| -rw-r--r-- | tools/qt3d/qglinfo/qglinfowindow.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/tools/qt3d/qglinfo/aboutdialog.h b/tools/qt3d/qglinfo/aboutdialog.h index 0a7977b55..b1ba5a871 100644 --- a/tools/qt3d/qglinfo/aboutdialog.h +++ b/tools/qt3d/qglinfo/aboutdialog.h @@ -44,9 +44,11 @@ #include <QDialog> +QT_BEGIN_NAMESPACE namespace Ui { class AboutDialog; } +QT_END_NAMESPACE class AboutDialog : public QDialog { Q_OBJECT diff --git a/tools/qt3d/qglinfo/fpswidget.h b/tools/qt3d/qglinfo/fpswidget.h index 8b0703e93..eb22906ee 100644 --- a/tools/qt3d/qglinfo/fpswidget.h +++ b/tools/qt3d/qglinfo/fpswidget.h @@ -49,8 +49,10 @@ #include <QtOpenGL/QGLShaderProgram> #endif +QT_BEGIN_NAMESPACE class QTime; class QTimer; +QT_END_NAMESPACE class FPSWidget : public QGLWidget { diff --git a/tools/qt3d/qglinfo/qglinfowindow.h b/tools/qt3d/qglinfo/qglinfowindow.h index a602ded68..3eca2d1b6 100644 --- a/tools/qt3d/qglinfo/qglinfowindow.h +++ b/tools/qt3d/qglinfo/qglinfowindow.h @@ -44,9 +44,11 @@ #include <QMainWindow> +QT_BEGIN_NAMESPACE namespace Ui { class QGLInfoWindow; } +QT_END_NAMESPACE class QGLInfo; class FPSWidget; |