diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/auto/tools/moc/template-gtgt.h | |
parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/auto/tools/moc/template-gtgt.h')
-rw-r--r-- | tests/auto/tools/moc/template-gtgt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/template-gtgt.h b/tests/auto/tools/moc/template-gtgt.h index baa8553103..2c2f56c34d 100644 --- a/tests/auto/tools/moc/template-gtgt.h +++ b/tests/auto/tools/moc/template-gtgt.h @@ -39,13 +39,13 @@ ** ****************************************************************************/ template<class TYPE, size_t COUNT> -class myTemplate : +class myTemplate : QString, QVector<TYPE, QList<COUNT>> {}; template<class TYPE, size_t COUNT> -class myTemplate2 : +class myTemplate2 : QString, QVector<TYPE, QList< (4 >> 2) >> {}; |