From 6533a736a7dd899280069b5d1855cfa13767341b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Urba=C5=84czyk?= Date: Wed, 13 Nov 2013 21:53:52 +0800 Subject: Fix compilation with MSVC2013 & C++11 support See Variadic templates issue: https://connect.microsoft.com/VisualStudio/feedback/details/801828/c2143-error-when-compiling-c-code-with-variadic-templates Task-number: QTBUG-34705 Change-Id: I733f1451f6d1e9b958c3a76998810fcff3fe779b Reviewed-by: Yuchen Deng Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira Reviewed-by: Olivier Goffart --- src/corelib/kernel/qobject_impl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index 1bbd548be6..d2996e6e4d 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -99,6 +99,8 @@ namespace QtPrivate { template ::Value > struct ConnectionTypes { static const int *types() { return 0; } }; + template <> struct ConnectionTypes, true> + { static const int *types() { return 0; } }; template struct ConnectionTypes, true> { static const int *types() { static const int t[sizeof...(Args) + 1] = { (QtPrivate::QMetaTypeIdHelper::qt_metatype_id())..., 0 }; return t; } }; #endif -- cgit v1.2.3