diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-24 10:11:51 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-24 14:22:02 +0200 |
| commit | 809e12d3b21e620f731096f474bc9f1ba1372a96 (patch) | |
| tree | 46b60fd187624579c7de9139ff5f287b470c1e2f /src/virtualkeyboard/plugin.cpp | |
| parent | 4f39ed7eea795283037705a415da57192631e94c (diff) | |
Remove workarounds for compiled QML
* Don't do CONFIG += qt. It is not necessary at all and has the effect that
qt.prf gets loaded early, the QT and QT_PRIVATE variables are processed
and only afterwards qtquickcompiler.prf is loaded - at which point it is too
late to do QT_PRIVATE += the-frameworks-that-the-compiler-output-needs.
The extra CONFIG += qtquickcompiler taped over the actual issue, which is
CONFIG += qt.
* There is no need anymore to #ifdef the QT_INIT_RESOURCE calls with special
_qtquickcompiler suffix versions. However one QT_INIT_RESOURCE still needs to
remain #ifdef'ed because the .qrc file is added to RESOURCES only conditionally
in the .pro file.
Change-Id: Ia44dea9d73bc3d8422893ad069dd47e6c3d90657
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/plugin.cpp')
| -rw-r--r-- | src/virtualkeyboard/plugin.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index 9798ca3c..eca1f5a2 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -51,13 +51,10 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, { Q_UNUSED(paramList); #ifdef COMPILING_QML - Q_INIT_RESOURCE(content_qtquickcompiler); - Q_INIT_RESOURCE(default_style_qtquickcompiler); - Q_INIT_RESOURCE(retro_style_qtquickcompiler); -#else + Q_INIT_RESOURCE(content); +#endif Q_INIT_RESOURCE(default_style); Q_INIT_RESOURCE(retro_style); -#endif const QString path(QT_VIRTUALKEYBOARD_IMPORT_PATH); qmlRegisterSingletonType<DeclarativeInputContext>("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputContext", createInputContextModule); qmlRegisterUncreatableType<DeclarativeInputEngine>("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputEngine", "Cannot create input method engine"); |