diff options
Diffstat (limited to 'src/virtualkeyboard/styles')
-rw-r--r-- | src/virtualkeyboard/styles/styles.pro | 4 | ||||
-rw-r--r-- | src/virtualkeyboard/styles/styles_plugin.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/virtualkeyboard/styles/styles.pro b/src/virtualkeyboard/styles/styles.pro index b9e3f13f..2ef8e586 100644 --- a/src/virtualkeyboard/styles/styles.pro +++ b/src/virtualkeyboard/styles/styles.pro @@ -8,15 +8,13 @@ android-no-sdk { INSTALL_PATH = $$[QT_INSTALL_QML]/QtQuick/Enterprise/VirtualKeyboard/Styles } QT += qml quick -CONFIG += qt plugin +CONFIG += plugin target.path = $$INSTALL_PATH INSTALLS += target qtquickcompiler { TARGETPATH = QtQuick/Enterprise/VirtualKeyboard/Styles - # without the next line it fails to compile - QTRD-3291 - CONFIG += qtquickcompiler DEFINES += COMPILING_QML DEFINES += STYLES_IMPORT_PATH=\\\"qrc:/\\\" } else { diff --git a/src/virtualkeyboard/styles/styles_plugin.cpp b/src/virtualkeyboard/styles/styles_plugin.cpp index cedfc639..0dc2d629 100644 --- a/src/virtualkeyboard/styles/styles_plugin.cpp +++ b/src/virtualkeyboard/styles/styles_plugin.cpp @@ -29,7 +29,7 @@ void StylesPlugin::registerTypes(const char *uri) { #ifdef COMPILING_QML - Q_INIT_RESOURCE(styles_qtquickcompiler); + Q_INIT_RESOURCE(styles); #endif const QString path(STYLES_IMPORT_PATH); qmlRegisterType(QUrl(path + "KeyboardStyle.qml"), uri, 1, 0, "KeyboardStyle"); |