From 1b488d8b49c55c6f91eb4217e39a7f94f3be4231 Mon Sep 17 00:00:00 2001
From: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Date: Fri, 20 Jan 2017 14:48:42 +0000
Subject: Streamline #include <type_traits>

It's included by qglobal.h, so we get it for free in other headers.

Change-Id: I90072156e313271a5354a39cbf78a83a6885c431
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qflags.h           | 2 --
 src/corelib/global/qglobal.h          | 1 -
 src/corelib/kernel/qobjectdefs_impl.h | 2 --
 src/testlib/qtestcase.h               | 1 -
 4 files changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index 89a0ae9083..93dbedc930 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -46,8 +46,6 @@
 #include <initializer_list>
 #endif
 
-#include <type_traits>
-
 QT_BEGIN_NAMESPACE
 
 class QFlag
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index e6d4848491..9ac29acd16 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -44,7 +44,6 @@
 #ifdef __cplusplus
 #  include <type_traits>
 #  include <cstddef>
-#  include <type_traits>
 #  include <utility>
 #endif
 
diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h
index 1768e8ccc6..bd08ca1763 100644
--- a/src/corelib/kernel/qobjectdefs_impl.h
+++ b/src/corelib/kernel/qobjectdefs_impl.h
@@ -50,8 +50,6 @@
 #pragma qt_sync_stop_processing
 #endif
 
-#include <type_traits>
-
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index 26d8ff2766..a7e825396a 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -51,7 +51,6 @@
 
 #include <string.h>
 
-#include <type_traits>
 #ifndef QT_NO_EXCEPTIONS
 #  include <exception>
 #endif // QT_NO_EXCEPTIONS
-- 
cgit v1.2.3