summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qobjectdefs_impl.h
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2015-11-07 12:32:42 +0100
committerOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>2015-11-16 19:07:56 +0000
commit1e30be700a2602db2d439df2b70fc6b4727ac3fa (patch)
treedf9b9a50371ad17e0365caed1f2f056cc4887984 /src/corelib/kernel/qobjectdefs_impl.h
parent26eb4b35898f8578e3f7259afe9c76307c46b79b (diff)
qobject.h: remove hack that simulated decltype
In order to know the type of the arguments of a functor with compilers not having decltype, it was simulated with an intermediary function. Now that decltype is mandatory, we can remove this hack Change-Id: I7eb283943abeeb4ef1c62358da89b0ede70b3ef5 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs_impl.h')
-rw-r--r--src/corelib/kernel/qobjectdefs_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h
index d5574a4dd1..dc445a426d 100644
--- a/src/corelib/kernel/qobjectdefs_impl.h
+++ b/src/corelib/kernel/qobjectdefs_impl.h
@@ -593,7 +593,7 @@ namespace QtPrivate {
};
#endif
-#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_VARIADIC_TEMPLATES)
+#if defined(Q_COMPILER_VARIADIC_TEMPLATES)
/*
Find the maximum number of arguments a functor object can take and be still compatible with
the arguments from the signal.