diff --git a/src/corelib/kernel/qjniobject.h b/src/corelib/kernel/qjniobject.h index 9231e2d431b..e3168488fc7 100644 --- a/src/corelib/kernel/qjniobject.h +++ b/src/corelib/kernel/qjniobject.h @@ -825,6 +825,21 @@ template struct Traits> { static constexpr auto signature() { return Traits::signature(); } static constexpr auto className() { return Traits::className(); } }; + +template<> +struct Traits +{ + static constexpr auto className() + { + return CTString("java/lang/Object"); + } + + static constexpr auto signature() + { + return CTString("Ljava/lang/Object;"); + } +}; + } // This cannot be included earlier as QJniArray is a QJniObject subclass, but it diff --git a/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp b/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp index db0700ef2fb..7a4e89c6e42 100644 --- a/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp +++ b/tests/auto/corelib/kernel/qjnitypes/tst_qjnitypes.cpp @@ -35,15 +35,6 @@ struct QtJniTypes::Traits } }; -template<> -struct QtJniTypes::Traits -{ - static constexpr auto signature() - { - return QtJniTypes::CTString("Ljava/lang/Object;"); - } -}; - struct QtCustomJniObject : QJniObject {}; template<>