diff options
| author | Michał Urbańczyk <mwu-tow@gazeta.pl> | 2013-11-13 21:53:52 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-21 07:41:56 +0100 |
| commit | 6533a736a7dd899280069b5d1855cfa13767341b (patch) | |
| tree | 8e145a227fc7a27e65d9d52d5257a005c10dd153 /src | |
| parent | 13b456c6c17ac8ca9c755042ece4461c4786b263 (diff) | |
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 <loaden@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qobject_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 <typename ArgList, bool Declared = TypesAreDeclaredMetaType<ArgList>::Value > struct ConnectionTypes { static const int *types() { return 0; } }; + template <> struct ConnectionTypes<List<>, true> + { static const int *types() { return 0; } }; template <typename... Args> struct ConnectionTypes<List<Args...>, true> { static const int *types() { static const int t[sizeof...(Args) + 1] = { (QtPrivate::QMetaTypeIdHelper<Args>::qt_metatype_id())..., 0 }; return t; } }; #endif |