diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2016-11-03 17:05:01 +0000 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2016-11-04 11:30:56 +0000 |
| commit | 30cd2978eee14f75bbc85442fdbea4c9905fadbd (patch) | |
| tree | 960da55ffab7e278a319e03e0f15915b30506e34 /src | |
| parent | 29f2779337af6461886e4a20ea2ba53f0318bf85 (diff) | |
Use std::is_same instead of Qt's implementation
In preparation for the removal of Qt's own type traits.
Change-Id: Ie97b6a62b2e3f5e5c59b5175ef05cf8c342746db
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/jsruntime/qv4object_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h index d5195adaf0..161c7746da 100644 --- a/src/qml/jsruntime/qv4object_p.h +++ b/src/qml/jsruntime/qv4object_p.h @@ -58,7 +58,7 @@ #include "qv4value_p.h" #include "qv4internalclass_p.h" -#include <QtCore/qtypetraits.h> +#include <type_traits> QT_BEGIN_NAMESPACE @@ -147,7 +147,7 @@ struct ObjectVTable #define DEFINE_OBJECT_VTABLE_BASE(classname) \ const QV4::ObjectVTable classname::static_vtbl = \ { \ - DEFINE_MANAGED_VTABLE_INT(classname, (QT_PREPEND_NAMESPACE(QtPrivate)::is_same<classname::SuperClass, Object>::value) ? Q_NULLPTR : &classname::SuperClass::static_vtbl.vTable), \ + DEFINE_MANAGED_VTABLE_INT(classname, (std::is_same<classname::SuperClass, Object>::value) ? Q_NULLPTR : &classname::SuperClass::static_vtbl.vTable), \ call, \ construct, \ get, \ |