diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-23 23:55:07 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-27 13:02:27 +0000 |
| commit | 9513bd4b5fc2adc1d7d3ab070040543b989d9ed3 (patch) | |
| tree | 2b2fe61d85e7ed374a0fd9bbe5ed87919773c6db | |
| parent | 0e5eef38117cd72ffa2e8f9467191dede7b2622d (diff) | |
t9write: Fix resource initialization
GCC cannot resolve Q_INIT_RESOURCE(qmake_t9write_db) during linking,
because it was inside QtVirtualKeyboard namespace. This change moves
it to plugin initialization, out of the namespace.
Change-Id: I24aa7b13623c905da70182b2b079bae7ce38ba50
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | src/plugins/t9write/plugin/t9writeinputmethod.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/t9write/plugin/t9writeplugin.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp index 4b1f6fba..5da72eea 100644 --- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp +++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp @@ -141,7 +141,6 @@ public: , unipenTrace() #endif { - Q_INIT_RESOURCE(qmake_t9write_db); } static void *decumaMalloc(size_t size, void *pPrivate) diff --git a/src/plugins/t9write/plugin/t9writeplugin.cpp b/src/plugins/t9write/plugin/t9writeplugin.cpp index 474f52cd..3e3ba42f 100644 --- a/src/plugins/t9write/plugin/t9writeplugin.cpp +++ b/src/plugins/t9write/plugin/t9writeplugin.cpp @@ -37,6 +37,7 @@ using namespace QtVirtualKeyboard; void T9WritePlugin::registerTypes(const char *uri) const { + Q_INIT_RESOURCE(qmake_t9write_db); qmlRegisterType<T9WriteInputMethod>(uri, 2, 0, "HandwritingInputMethod"); } |