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/styles/styles_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/styles/styles_plugin.cpp')
| -rw-r--r-- | src/virtualkeyboard/styles/styles_plugin.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index 0dc2d629..d0888121 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -19,6 +19,7 @@ #include "styles_plugin.h" #include <qqml.h> +#include <QtCore/QLibraryInfo> /*! \qmlmodule QtQuick.Enterprise.VirtualKeyboard.Styles 1.2 @@ -30,8 +31,10 @@ void StylesPlugin::registerTypes(const char *uri) { #ifdef COMPILING_QML Q_INIT_RESOURCE(styles); + const QString path("qrc:///"); +#else + const QString path = "file://" + QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/QtQuick/Enterprise/VirtualKeyboard/Styles/"; #endif - const QString path(STYLES_IMPORT_PATH); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 0, "KeyboardStyle"); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 1, "KeyboardStyle"); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 2, "KeyboardStyle"); |