diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-11-06 12:18:45 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-06 15:49:09 +0000 |
| commit | c07f53b02545e88614cf6a519d46abb6e89aee0d (patch) | |
| tree | f1b0b6b922dde52b1ed9879d0e85b72d27da0be1 | |
| parent | 34d66f3836051dca35a854577fe04b45af3630f2 (diff) | |
| download | qtenginio-c07f53b02545e88614cf6a519d46abb6e89aee0d.tar.gz | |
Fix debug-and-release build
Enginio is part of the Qt release and there is no need to do magic hacks
to install the qmldir file.
This was supposed to help running examples separately, but we assume
that the lib is shipped with Qt proper.
The problem was that the qmldir file would be simultaneously copied into
the same location twice which will fail on Windows.
Change-Id: I57dc18af361f4bdfc00c8c4a12bbe1f0986eb34f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| -rw-r--r-- | src/enginio_plugin/enginio_plugin.pro | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro index 728313f..e359ef3 100644 --- a/src/enginio_plugin/enginio_plugin.pro +++ b/src/enginio_plugin/enginio_plugin.pro @@ -9,7 +9,8 @@ QT = qml enginio enginio-private core-private QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf OTHER_FILES += \ doc/qtenginioqml.qdocconf \ - doc/enginio_plugin.qdoc + doc/enginio_plugin.qdoc \ + qmldir include(../src.pri) @@ -34,14 +35,4 @@ HEADERS += \ CONFIG += no_cxx_module load(qml_plugin) -QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir - -copy2build.input = QMLDIRFILE -copy2build.output = ../../qml/$${TARGET.module_name}/qmldir -!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link -force_independent: QMAKE_EXTRA_COMPILERS += copy2build - DEFINES += "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\"" |