diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2016-06-13 13:36:38 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2016-06-15 06:31:35 +0000 |
| commit | e85e7f4b81b285efa5875a3ebf239d2f7f4523d7 (patch) | |
| tree | f983a91b705df8309deb659c8743248d660b4db6 /src/corelib/kernel | |
| parent | 3e2bde35786f503c9031c34454b741a02426bb9a (diff) | |
Fixed developer build for MinGW
0 must not be used as a null pointer constant
Change-Id: I082d0e99c105fb02980b9cf390e7f6e4c9ad0869
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.h | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index eb357cefe5..27a4c1bdcb 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -105,7 +105,8 @@ public: void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj); bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); #if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED bool filterEvent(void *message) { return filterNativeEvent("", message, 0); } + QT_DEPRECATED bool filterEvent(void *message) + { return filterNativeEvent("", message, Q_NULLPTR); } #endif Q_SIGNALS: diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 1a282d3261..d467ea9d68 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -181,7 +181,7 @@ private: // signature() has been renamed to methodSignature() in Qt 5. // Warning, that function returns a QByteArray; check the life time if // you convert to char*. - char *signature(struct renamedInQt5_warning_checkTheLifeTime * = 0) Q_DECL_EQ_DELETE; + char *signature(struct renamedInQt5_warning_checkTheLifeTime * = Q_NULLPTR) Q_DECL_EQ_DELETE; #endif static QMetaMethod fromSignalImpl(const QMetaObject *, void **); |