diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2016-12-05 13:18:57 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2017-02-07 19:40:37 +0000 |
| commit | cdc5f303016eb44406bca5463e9183ca9f0da54c (patch) | |
| tree | 86de7f6a58ef182b3d2a5fc2a9c749a36f975909 /src/testlib | |
| parent | 1b6895b96b94f7004649e96e95a6573c573a91ab (diff) | |
QTest::addColumn: Use nullptr instead of 0
Fixes -Wzero-as-null-pointer-constant warning in user code
Change-Id: I59492633d14947e90e91efa7c4fcd14c33fa413e
(cherry picked from commit 6ff4d8c61afc2ede16d60195dc30ea6538e2d5c9)
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 6547570bff..a099aaa3d1 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -304,7 +304,7 @@ namespace QTest Q_TESTLIB_EXPORT void addColumnInternal(int id, const char *name); template <typename T> - inline void addColumn(const char *name, T * = 0) + inline void addColumn(const char *name, T * = Q_NULLPTR) { typedef QtPrivate::is_same<T, const char*> QIsSameTConstChar; Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format."); |