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/corelib/global/qtypeinfo.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/corelib/global/qtypeinfo.h')
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 8aa5cb4fb4..53f6b3fff6 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -124,7 +124,7 @@ struct QTypeInfoQuery : public QTypeInfo<T> // if QTypeInfo<T>::isRelocatable exists, use it template <typename T> -struct QTypeInfoQuery<T, typename QtPrivate::QEnableIf<QTypeInfo<T>::isRelocatable || true>::Type> : public QTypeInfo<T> +struct QTypeInfoQuery<T, typename std::enable_if<QTypeInfo<T>::isRelocatable || true>::type> : public QTypeInfo<T> {}; /*! |