diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index be95416759..c8aab34b87 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -108,19 +108,19 @@ struct ReduceResultType; template struct ReduceResultType { - typedef U ResultType; + using ResultType = U; }; template struct ReduceResultType { - typedef C ResultType; + using ResultType = C; }; template struct ReduceResultType> { - typedef U ResultType; + using ResultType = U; }; template @@ -133,13 +133,13 @@ struct ReduceResultType template struct ReduceResultType { - typedef U ResultType; + using ResultType = U; }; template struct ReduceResultType { - typedef C ResultType; + using ResultType = C; }; #endif diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index 44a93360d8..f7e9e03e21 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -44,10 +44,10 @@ #ifndef QT_NO_CONCURRENT #include -#include - #include +#include + QT_BEGIN_NAMESPACE #ifndef Q_QDOC