diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-08 10:31:26 -0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-15 07:28:49 +0100 |
| commit | 0c4f6c6ea9415bcc5fde3e34bf909f43a9c6483c (patch) | |
| tree | f26d7d1835a9c659463b58b6736cb3f7a58af386 | |
| parent | c174d101bddb63758ae604840e2852759089d57c (diff) | |
| -rw-r--r-- | src/concurrent/qtconcurrentrun.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index 0c173d267c..3ac09fc98f 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -98,7 +98,7 @@ QFuture<T> run(T (*functionPointer)(Param1, Param2, Param3, Param4, Param5), con return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3, Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, arg2, arg3, arg4, arg5))->start(); } -#ifdef Q_COMPILER_DECLTYPE +#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION) template <typename Functor> auto run(Functor functor) -> typename QtPrivate::QEnableIf<!QtPrivate::HasResultType<Functor>::Value, QFuture<decltype(functor())> >::Type |