summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2017-01-20 14:48:42 +0000
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2017-01-31 08:24:03 +0000
commit1b488d8b49c55c6f91eb4217e39a7f94f3be4231 (patch)
tree2de4cc9d6a454d0841f3ce52ca1918d891ba265a /src/corelib/global
parentd258d6962a5b575839e207d71df4863f8d5218f6 (diff)
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>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qflags.h2
-rw-r--r--src/corelib/global/qglobal.h1
2 files changed, 0 insertions, 3 deletions
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