diff options
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
-rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 7354c3f0d0..fe107f1425 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -42,6 +42,10 @@ #ifndef QOBJECTDEFS_H #define QOBJECTDEFS_H +#if defined(__OBJC__) && !defined(__cplusplus) +# warning "File built in Objective-C mode (.m), but using Qt requires Objective-C++ (.mm)" +#endif + #include <QtCore/qnamespace.h> #include <QtCore/qobjectdefs_impl.h> @@ -447,7 +451,7 @@ struct Q_CORE_EXPORT QMetaObject const uint *data; typedef void (*StaticMetacallFunction)(QObject *, QMetaObject::Call, int, void **); StaticMetacallFunction static_metacall; - const QMetaObject **relatedMetaObjects; + const QMetaObject * const *relatedMetaObjects; void *extradata; //reserved for future use } d; }; |