From f617b82712b21c38a80feb8020bdeaf8bf409a3c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 5 Nov 2014 13:46:40 +0200 Subject: 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 Reviewed-by: Gatis Paeglis --- src/virtualkeyboard/plugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/virtualkeyboard/plugin.cpp') 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("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputContext", createInputContextModule); qmlRegisterUncreatableType("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "InputEngine", "Cannot create input method engine"); qmlRegisterUncreatableType("QtQuick.Enterprise.VirtualKeyboard", 1, 0, "ShiftHandler", "Cannot create shift handler"); -- cgit v1.2.3