diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-08-05 10:12:12 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-11-08 15:31:17 +0000 |
| commit | ed7f77071dcca996a8c8147fd66344090666e60c (patch) | |
| tree | 0f36d33272e9edf80f30f15d1fb4cc7026534267 /src/testlib | |
| parent | b5fa247102c610d8ed4c1d88a7f1ea685b96c91f (diff) | |
Replace custom type traits with std one's
Remove most type traits from qtypetraits.h, but keep the custom
implementation of is_signed/is_unsigned. This gets rid of
BSD-3 licensed code from Google in a public header (hugh!).
The custom implementations for is_signed/is_unsigned are kept
because the implementations in gcc's standard headers do not
work as we expect for enums - both is_signed and is_unsigned
always returns false there - see also
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59027
[ChangeLog][QtCore][General] Qt now relies on type traits from
the C++ standard library.
Change-Id: I3f2188b46949f04ca4482a6ac9afd3482103f0e1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 045431fcaf..c3ccfc3f8c 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -46,7 +46,6 @@ #include <QtCore/qnamespace.h> #include <QtCore/qmetatype.h> #include <QtCore/qmetaobject.h> -#include <QtCore/qtypetraits.h> #include <QtCore/qsharedpointer.h> #include <QtCore/qtemporarydir.h> @@ -312,7 +311,7 @@ namespace QTest template <typename T> inline void addColumn(const char *name, T * = 0) { - typedef QtPrivate::is_same<T, const char*> QIsSameTConstChar; + typedef std::is_same<T, const char*> QIsSameTConstChar; Q_STATIC_ASSERT_X(!QIsSameTConstChar::value, "const char* is not allowed as a test data format."); addColumnInternal(qMetaTypeId<T>(), name); } |