diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-01-19 17:20:05 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-01-22 11:07:55 +0200 |
commit | c690e5274622e597ce8637ecfc7348443dca2baf (patch) | |
tree | f7aa892921c4fd53e3e93812583b03d5c61a6f30 /src/virtualkeyboard/styles/styles.pro | |
parent | 0e0d7fbdbcd64386f4cd39c65d2d05f4f9705331 (diff) |
Always use resources for QML files
Always compile all QML files into resources files, instead of generating
resource files when using Quick Compiler. Saves some ifdefs in the code,
since the file uris are the same in both cases. Also we are no longer
dependent on the runtime path from QLibraryInfo::Qml2ImportsPath. It had
problem in the prebuild QNX binaries, since the binaries had different
prefix than what was used in the device.
Change-Id: I19ee347244f56e4846831d4871f6667bce78d3a6
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Diffstat (limited to 'src/virtualkeyboard/styles/styles.pro')
-rw-r--r-- | src/virtualkeyboard/styles/styles.pro | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/virtualkeyboard/styles/styles.pro b/src/virtualkeyboard/styles/styles.pro index 48e45d07..0f2fb269 100644 --- a/src/virtualkeyboard/styles/styles.pro +++ b/src/virtualkeyboard/styles/styles.pro @@ -7,37 +7,20 @@ CONFIG += plugin target.path = $$INSTALL_PATH INSTALLS += target -qtquickcompiler { - TARGETPATH = QtQuick/Enterprise/VirtualKeyboard/Styles - DEFINES += COMPILING_QML -} - SOURCES += \ styles_plugin.cpp HEADERS += \ styles_plugin.h -QML_FILES += \ - qmldir \ - KeyboardStyle.qml \ - KeyPanel.qml \ - KeyIcon.qml \ - SelectionListItem.qml - -qtquickcompiler { - # generate qrc file, this should work out-of-box with later releases of qtquickcompiler - include(../generateresource.prf) - RESOURCES += $$generate_resource(styles.qrc, $$QML_FILES) -} - OTHER_FILES += \ - plugins.qmltypes + *.qml -qtquickcompiler { - other.files = $$OTHER_FILES qmldir -} else { - other.files = $$OTHER_FILES $$QML_FILES -} +other.files = \ + plugins.qmltypes \ + qmldir other.path = $$INSTALL_PATH INSTALLS += other + +RESOURCES += \ + styles.qrc |