diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-04 16:54:12 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-04 16:54:12 (GMT) |
| commit | bed10148f651cca2a7376a637267a31ef7c87064 (patch) | |
| tree | 0432691bb282ed8649e35c80d83a1406945df7b3 /src/corelib/kernel/qobject.h | |
| parent | a5c29dbf012324ac2de2f0aecd7a57b37a499ce9 (diff) | |
| download | Qt-bed10148f651cca2a7376a637267a31ef7c87064.zip Qt-bed10148f651cca2a7376a637267a31ef7c87064.tar.gz Qt-bed10148f651cca2a7376a637267a31ef7c87064.tar.bz2 | |
Made qobject.h "syncqt compliant".
The previous patch to this file made syncqt confused (maybe because
of the brackets), and caused it to not generate the QObject header file.
This made of course a lot of stuff not compile. With this patch syncqt
behaves.
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 68475e5..1a178e2 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -91,11 +91,11 @@ template<typename T> inline QList<T> qFindChildren(const QObject *, const QRegEx # endif #endif +class #if defined(__INTEL_COMPILER) && defined(Q_OS_WIN) -class Q_CORE_EXPORT QObjectData { -#else -class QObjectData { +Q_CORE_EXPORT #endif +QObjectData { public: virtual ~QObjectData() = 0; QObject *q_ptr; |