diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-30 08:39:47 (GMT) |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2009-06-30 08:39:47 (GMT) |
| commit | f55c5b5552cf2ca620d02ff553116ae62061f8b5 (patch) | |
| tree | aad3a3c79db2993e5b6130ffbe4123be95676f2a /src/declarative/util/qfxglobal.h | |
| parent | 7cba48bea33dcb80979975b27047d81025d054a5 (diff) | |
| parent | 5732bf283683f0444dbec740cc26c995d9464de6 (diff) | |
| download | Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.zip Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.tar.gz Qt-f55c5b5552cf2ca620d02ff553116ae62061f8b5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qfxglobal.h')
| -rw-r--r-- | src/declarative/util/qfxglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h index 6ba9409..6f2a9fb 100644 --- a/src/declarative/util/qfxglobal.h +++ b/src/declarative/util/qfxglobal.h @@ -45,12 +45,12 @@ #include <QtCore/qglobal.h> #include <QtCore/QObject> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) + #if defined(QT_OPENGL_ES_1) #define QFX_CONFIGURATION_OPENGL1 #elif defined(QT_OPENGL_ES_2) @@ -117,8 +117,8 @@ inline void QFx_setParent_noEvent(QObject *object, QObject *parent) static_cast<QFx_DerivedObject *>(object)->setParent_noEvent(parent); } - QT_END_NAMESPACE QT_END_HEADER + #endif // QFXGLOBAL_H |