diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-23 16:11:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-24 14:00:39 +0200 |
| commit | 8ae479a8eac7b9ffeeba24e9e459e3e02ca20587 (patch) | |
| tree | d6fdf18ddd2456835c598f40399348d247af6c97 /tests/auto/shared/imports.pri | |
| parent | 1337e0d0827e86591e67a6dbaaeb3bd3f9ed733b (diff) | |
| parent | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4runtime_p.h
src/qml/qml/qqmldelayedcallqueue.cpp
src/qml/qml/qqmlvaluetypewrapper.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/v8/qv8engine_p.h
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I3f0608c7beb88088cbbef4d0db59920f56deaea9
Diffstat (limited to 'tests/auto/shared/imports.pri')
| -rw-r--r-- | tests/auto/shared/imports.pri | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/shared/imports.pri b/tests/auto/shared/imports.pri index 20e9bcb371..9cbf286386 100644 --- a/tests/auto/shared/imports.pri +++ b/tests/auto/shared/imports.pri @@ -1,7 +1,4 @@ -copyimportfiles.input = IMPORT_FILES -copyimportfiles.output = $$DESTDIR/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} -copyimportfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copyimportfiles.CONFIG += no_link_no_clean -copyimportfiles.variable_out = PRE_TARGETDEPS -QMAKE_EXTRA_COMPILERS += copyimportfiles +importfiles.files = $$IMPORT_FILES +importfiles.path = $$DESTDIR +COPIES += importfiles |