diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-11-05 13:46:40 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-12-04 08:32:40 +0200 |
| commit | f617b82712b21c38a80feb8020bdeaf8bf409a3c (patch) | |
| tree | 7ffcb1ef9f949628ff7787ac4335b85f35f2748a /src/virtualkeyboard/plugin.cpp | |
| parent | 706971597b5d13bfcc5f999aaca4f8f54d7d20f7 (diff) | |
Register QML files using runtime path
QT_INSTALL_QML prefix points to sysroot when cross compiling, so those
paths cannot be used for the QML registration. Instead use the path
available from QLibraryInfo at runtime.
Change-Id: I6556478558a3dda61e432aeef5f13667b9da626d
Task-number: QTRD-3400
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/plugin.cpp')
| -rw-r--r-- | src/virtualkeyboard/plugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index eca1f5a2..f4e00a0e 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -52,10 +52,12 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, Q_UNUSED(paramList); #ifdef COMPILING_QML Q_INIT_RESOURCE(content); + const QString path("qrc:///content/"); +#else + const QString path = "file://" + QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/QtQuick/Enterprise/VirtualKeyboard/"; #endif Q_INIT_RESOURCE(default_style); Q_INIT_RESOURCE(retro_style); - 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"); qmlRegisterUncreatableType<DeclarativeShiftHandler>("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "ShiftHandler", "Cannot create shift handler"); |