From 45f69e8478a43cf606e52063ee37fbbb42132146 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Thu, 17 Feb 2022 15:41:11 +0200 Subject: plugins/cerence: Move Q_DECLARE_PUBLIC to the public section This is now required to use QObjectPrivate::connect. Pick-to: 6.2 6.3 Change-Id: I0d649ab9ac2106f2e1cf63be7e06f33acaa8203f Reviewed-by: Jarkko Koivikko --- src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp | 3 ++- src/plugins/cerence/xt9/plugin/xt9awinputmethodprivate_p.h | 1 + src/plugins/cerence/xt9/plugin/xt9inputmethodprivate_p.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp b/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp index d9cbdf11..13640d38 100644 --- a/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp +++ b/src/plugins/cerence/cerence-hwr/plugin/t9writeinputmethod.cpp @@ -126,8 +126,9 @@ class T9WriteInputMethodPrivate : public QVirtualKeyboardAbstractInputMethodPriv , public Xt9RequestCallback #endif { - Q_DECLARE_PUBLIC(T9WriteInputMethod) public: + Q_DECLARE_PUBLIC(T9WriteInputMethod) + T9WriteInputMethodPrivate(T9WriteInputMethod *q_ptr) : QVirtualKeyboardAbstractInputMethodPrivate(), q_ptr(q_ptr), diff --git a/src/plugins/cerence/xt9/plugin/xt9awinputmethodprivate_p.h b/src/plugins/cerence/xt9/plugin/xt9awinputmethodprivate_p.h index 20faca8a..aaf2ae4f 100644 --- a/src/plugins/cerence/xt9/plugin/xt9awinputmethodprivate_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9awinputmethodprivate_p.h @@ -42,6 +42,7 @@ namespace QtVirtualKeyboard { class Xt9AwInputMethodPrivate : public Xt9InputMethodPrivate { +public: Q_DECLARE_PUBLIC(Xt9AwInputMethod) protected: diff --git a/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate_p.h b/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate_p.h index 145f79c9..5192a6a2 100644 --- a/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate_p.h +++ b/src/plugins/cerence/xt9/plugin/xt9inputmethodprivate_p.h @@ -45,8 +45,9 @@ class Xt9InputMethod; class Xt9InputMethodPrivate : public QVirtualKeyboardAbstractInputMethodPrivate, public Xt9RequestCallback { - Q_DECLARE_PUBLIC(Xt9InputMethod) public: + Q_DECLARE_PUBLIC(Xt9InputMethod) + Xt9InputMethodPrivate(Xt9InputMethod *q_ptr, Xt9Ime *xt9Ime, const QString &aDlmFileName); inline Xt9Ime *xt9Ime() const; -- cgit v1.2.3