diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-13 00:39:52 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-22 09:23:48 +0000 |
| commit | a125b2c4c744b8f5b9136170db66840eeaf1f278 (patch) | |
| tree | f606e79e2c2def45c6368d939cf1b525d6efe534 /src | |
| parent | 56384a854aeaa5d3275c158c80a07082949468da (diff) | |
QVersionNumber: compile with -Wzero-as-null-pointer-constant
(backport of qtbase/f43885f8d14e045e5ec47857d62a140d99d16cfa)
Change-Id: I9735c04d90353372cf9b32828ed839f80c31a88a
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qversionnumber.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index ebf1844f38..6a2718ca28 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -273,7 +273,7 @@ public: Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber commonPrefix(const QVersionNumber &v1, const QVersionNumber &v2) Q_REQUIRED_RESULT; Q_CORE_EXPORT QString toString() const Q_REQUIRED_RESULT; - Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(const QString &string, int *suffixIndex = 0) Q_REQUIRED_RESULT; + Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber fromString(const QString &string, int *suffixIndex = Q_NULLPTR) Q_REQUIRED_RESULT; private: #ifndef QT_NO_DATASTREAM |