From 809e12d3b21e620f731096f474bc9f1ba1372a96 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 24 Nov 2014 10:11:51 +0100 Subject: 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 --- src/virtualkeyboard/styles/styles.pro | 4 +--- src/virtualkeyboard/styles/styles_plugin.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/virtualkeyboard/styles') 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"); -- cgit v1.2.3