diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-01-20 15:58:10 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-01-27 10:30:31 +0000 |
| commit | 30d0e1770c3d917d5bdae5e8766e401b4f1b4c2b (patch) | |
| tree | 8208e4139218442c15cb3bccc13a659d15caa78a /src/testlib/qtestcase.h | |
| parent | d03ba0e895a3719ce527f3d7ee9262fb26065332 (diff) | |
Use std::enable_if instead of QEnableIf
Change-Id: Ideca8283141484cb6da47c50333f5c96e416f082
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 058c0b3295..66f2b7c3c2 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -240,14 +240,14 @@ namespace QTest namespace Internal { template<typename T> // Output registered enums - inline typename QtPrivate::QEnableIf<QtPrivate::IsQEnumHelper<T>::Value, char*>::Type toString(T e) + inline typename std::enable_if<QtPrivate::IsQEnumHelper<T>::Value, char*>::type toString(T e) { QMetaEnum me = QMetaEnum::fromType<T>(); return qstrdup(me.valueToKey(int(e))); // int cast is necessary to support enum classes } template <typename T> // Fallback - inline typename QtPrivate::QEnableIf<!QtPrivate::IsQEnumHelper<T>::Value, char*>::Type toString(const T &) + inline typename std::enable_if<!QtPrivate::IsQEnumHelper<T>::Value, char*>::type toString(const T &) { return Q_NULLPTR; } |